Changes in uspace/srv/net/inetsrv/inetsrv.c [b7fd2a0:ac415d50] in mainline

File:

• uspace/srv/net/inetsrv/inetsrv.c (modified) (15 diffs)

uspace/srv/net/inetsrv/inetsrv.c

@@ -38 +38 @@
 #include <async.h>
 #include <errno.h>
-#include <str_error.h>
 #include <fibril_synch.h>
 #include <io/log.h>
@@ -84 +83 @@
 static void inet_default_conn(ipc_callid_t, ipc_call_t *, void *);
 
-static errno_t inet_init(void)
+static int inet_init(void)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_init()");
         
         port_id_t port;
-        errno_t rc = async_create_port(INTERFACE_INET,
+        int rc = async_create_port(INTERFACE_INET,
             inet_default_conn, NULL, &port);
         if (rc != EOK)
@@ -106 +105 @@
         rc = loc_server_register(NAME);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server (%d).", rc);
                 return EEXIST;
         }
@@ -113 +112 @@
         rc = loc_service_register(SERVICE_NAME_INET, &sid);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
                 return EEXIST;
         }
@@ -135 +134 @@
 }
 
-static errno_t inet_find_dir(inet_addr_t *src, inet_addr_t *dest, uint8_t tos,
+static int inet_find_dir(inet_addr_t *src, inet_addr_t *dest, uint8_t tos,
     inet_dir_t *dir)
 {
@@ -165 +164 @@
 }
 
-errno_t inet_route_packet(inet_dgram_t *dgram, uint8_t proto, uint8_t ttl,
+int inet_route_packet(inet_dgram_t *dgram, uint8_t proto, uint8_t ttl,
     int df)
 {
         inet_dir_t dir;
         inet_link_t *ilink;
-        errno_t rc;
+        int rc;
 
         if (dgram->iplink != 0) {
@@ -201 +200 @@
 }
 
-static errno_t inet_send(inet_client_t *client, inet_dgram_t *dgram,
+static int inet_send(inet_client_t *client, inet_dgram_t *dgram,
     uint8_t proto, uint8_t ttl, int df)
 {
@@ -207 +206 @@
 }
 
-errno_t inet_get_srcaddr(inet_addr_t *remote, uint8_t tos, inet_addr_t *local)
+int inet_get_srcaddr(inet_addr_t *remote, uint8_t tos, inet_addr_t *local)
 {
         inet_dir_t dir;
-        errno_t rc;
+        int rc;
 
         rc = inet_find_dir(NULL, remote, tos, &dir);
@@ -252 +251 @@
         
         inet_addr_t remote;
-        errno_t rc = async_data_write_finalize(callid, &remote, size);
+        int rc = async_data_write_finalize(callid, &remote, size);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -314 +313 @@
         }
         
-        errno_t rc = async_data_write_finalize(callid, &dgram.src, size);
+        int rc = async_data_write_finalize(callid, &dgram.src, size);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -445 +444 @@
 }
 
-errno_t inet_ev_recv(inet_client_t *client, inet_dgram_t *dgram)
+int inet_ev_recv(inet_client_t *client, inet_dgram_t *dgram)
 {
         async_exch_t *exch = async_exchange_begin(client->sess);
@@ -457 +456 @@
             dgram->iplink, &answer);
 
-        errno_t rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));
+        int rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -480 +479 @@
         }
 
-        errno_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
 
-        return retval;
-}
-
-errno_t inet_recv_dgram_local(inet_dgram_t *dgram, uint8_t proto)
+        return (int) retval;
+}
+
+int inet_recv_dgram_local(inet_dgram_t *dgram, uint8_t proto)
 {
         inet_client_t *client;
@@ -509 +508 @@
 }
 
-errno_t inet_recv_packet(inet_packet_t *packet)
+int inet_recv_packet(inet_packet_t *packet)
 {
         inet_addrobj_t *addr;
@@ -543 +542 @@
 int main(int argc, char *argv[])
 {
-        errno_t rc;
+        int rc;
 
         printf(NAME ": HelenOS Internet Protocol service\n");