Changeset fb4d788 in mainline for uspace/srv/net/udp/udp.c

Timestamp:

2015-07-28T11:28:14Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6accc5cf

Parents:

df2bce3 (diff), 47726b5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from the mainline

File:

• uspace/srv/net/udp/udp.c (modified) (3 diffs)

uspace/srv/net/udp/udp.c

@@ -41 +41 @@
 #include <task.h>
 
+#include "assoc.h"
+#include "service.h"
 #include "udp_inet.h"
-#include "sock.h"
 
 #define NAME       "udp"
@@ -52 +53 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_init()");
 
+        rc = udp_assocs_init();
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing associations.");
+                return ENOMEM;
+        }
+
         rc = udp_inet_init();
         if (rc != EOK) {
@@ -58 +65 @@
         }
 
-        rc = udp_sock_init();
+        rc = udp_service_init();
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing socket service.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing UDP service.");
                 return ENOENT;
         }