Changes in uspace/srv/net/loopip/loopip.c [b688fd8:1d6dd2a] in mainline

File:

• uspace/srv/net/loopip/loopip.c (modified) (12 diffs)

uspace/srv/net/loopip/loopip.c

@@ -38 +38 @@
 #include <async.h>
 #include <errno.h>
+#include <str_error.h>
 #include <inet/iplink_srv.h>
 #include <inet/addr.h>
@@ -44 +45 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str.h>
 #include <task.h>
 
 #define NAME  "loopip"
 
-static int loopip_open(iplink_srv_t *srv);
-static int loopip_close(iplink_srv_t *srv);
-static int loopip_send(iplink_srv_t *srv, iplink_sdu_t *sdu);
-static int loopip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
-static int loopip_get_mtu(iplink_srv_t *srv, size_t *mtu);
-static int loopip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
-static int loopip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
-static int loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
+static errno_t loopip_open(iplink_srv_t *srv);
+static errno_t loopip_close(iplink_srv_t *srv);
+static errno_t loopip_send(iplink_srv_t *srv, iplink_sdu_t *sdu);
+static errno_t loopip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
+static errno_t loopip_get_mtu(iplink_srv_t *srv, size_t *mtu);
+static errno_t loopip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
+static errno_t loopip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
+static errno_t loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
 
 static void loopip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -81 +83 @@
 } rqueue_entry_t;
 
-static int loopip_recv_fibril(void *arg)
+static errno_t loopip_recv_fibril(void *arg)
 {
         while (true) {
@@ -98 +100 @@
 }
 
-static int loopip_init(void)
+static errno_t loopip_init(void)
 {
         async_set_fallback_port_handler(loopip_client_conn, NULL);
         
-        int rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server.");
@@ -152 +154 @@
 }
 
-static int loopip_open(iplink_srv_t *srv)
+static errno_t loopip_open(iplink_srv_t *srv)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_open()");
@@ -158 +160 @@
 }
 
-static int loopip_close(iplink_srv_t *srv)
+static errno_t loopip_close(iplink_srv_t *srv)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_close()");
@@ -164 +166 @@
 }
 
-static int loopip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
+static errno_t loopip_send(iplink_srv_t *srv, iplink_sdu_t *sdu)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_send()");
@@ -193 +195 @@
 }
 
-static int loopip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
+static errno_t loopip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip6_send()");
@@ -222 +224 @@
 }
 
-static int loopip_get_mtu(iplink_srv_t *srv, size_t *mtu)
+static errno_t loopip_get_mtu(iplink_srv_t *srv, size_t *mtu)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_get_mtu()");
@@ -229 +231 @@
 }
 
-static int loopip_get_mac48(iplink_srv_t *src, addr48_t *mac)
+static errno_t loopip_get_mac48(iplink_srv_t *src, addr48_t *mac)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_get_mac48()");
@@ -235 +237 @@
 }
 
-static int loopip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
-{
-        return EOK;
-}
-
-static int loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
+static errno_t loopip_addr_add(iplink_srv_t *srv, inet_addr_t *addr)
+{
+        return EOK;
+}
+
+static errno_t loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr)
 {
         return EOK;
@@ -249 +251 @@
         printf("%s: HelenOS loopback IP link provider\n", NAME);
         
-        int rc = log_init(NAME);
-        if (rc != EOK) {
-                printf("%s: Failed to initialize logging.\n", NAME);
+        errno_t rc = log_init(NAME);
+        if (rc != EOK) {
+                printf("%s: Failed to initialize logging: %s.\n", NAME, str_error(rc));
                 return rc;
         }
         
         rc = loopip_init();
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                printf("%s: Failed to initialize loopip: %s.\n", NAME, str_error(rc));
+                return rc;
+        }
         
         printf("%s: Accepting connections.\n", NAME);