Changeset e6a78b9 in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2012-06-29T15:31:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c0 (diff), 0bbd13e (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 mainline changes.

File:

• uspace/srv/net/inetsrv/inetsrv.c (moved) (moved from uspace/srv/net/inet/inet.c ) (6 diffs)

uspace/srv/net/inetsrv/inetsrv.c

@@ -50 +50 @@
 #include "icmp.h"
 #include "icmp_std.h"
-#include "inet.h"
+#include "inetsrv.h"
 #include "inetcfg.h"
 #include "inetping.h"
@@ -57 +57 @@
 #include "sroute.h"
 
-#define NAME "inet"
+#define NAME "inetsrv"
 
 static void inet_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -66 +66 @@
 static int inet_init(void)
 {
-        service_id_t sid;
-        int rc;
-
         log_msg(LVL_DEBUG, "inet_init()");
-
+        
         async_set_client_connection(inet_client_conn);
-
-        rc = loc_server_register(NAME);
+        
+        int rc = loc_server_register(NAME);
         if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed registering server (%d).", rc);
                 return EEXIST;
         }
-
+        
+        service_id_t sid;
         rc = loc_service_register_with_iface(SERVICE_NAME_INET, &sid,
             INET_PORT_DEFAULT);
@@ -85 +83 @@
                 return EEXIST;
         }
-
+        
         rc = loc_service_register_with_iface(SERVICE_NAME_INETCFG, &sid,
             INET_PORT_CFG);
@@ -92 +90 @@
                 return EEXIST;
         }
-
+        
         rc = loc_service_register_with_iface(SERVICE_NAME_INETPING, &sid,
             INET_PORT_PING);
@@ -99 +97 @@
                 return EEXIST;
         }
-
+        
         rc = inet_link_discovery_start();
         if (rc != EOK)
                 return EEXIST;
-
+        
         return EOK;
 }