Changes in uspace/srv/net/inetsrv/inetsrv.c [f9b2cb4c:8d48c7e] in mainline

File:

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

uspace/srv/net/inetsrv/inetsrv.c

@@ -77 +77 @@
 };
 
+static void inet_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+
 static FIBRIL_MUTEX_INITIALIZE(client_list_lock);
 static LIST_INITIALIZE(client_list);
 
-static void inet_default_conn(ipc_callid_t, ipc_call_t *, void *);
-
 static int inet_init(void)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_init()");
         
-        port_id_t port;
-        int rc = async_create_port(INTERFACE_INET,
-            inet_default_conn, NULL, &port);
-        if (rc != EOK)
-                return rc;
-        
-        rc = async_create_port(INTERFACE_INETCFG,
-            inet_cfg_conn, NULL, &port);
-        if (rc != EOK)
-                return rc;
-        
-        rc = async_create_port(INTERFACE_INETPING,
-            inetping_conn, NULL, &port);
-        if (rc != EOK)
-                return rc;
-        
-        rc = loc_server_register(NAME);
+        async_set_client_connection(inet_client_conn);
+        
+        int rc = loc_server_register(NAME);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server (%d).", rc);
@@ -109 +95 @@
         
         service_id_t sid;
-        rc = loc_service_register(SERVICE_NAME_INET, &sid);
+        rc = loc_service_register_with_iface(SERVICE_NAME_INET, &sid,
+            INET_PORT_DEFAULT);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
+                return EEXIST;
+        }
+        
+        rc = loc_service_register_with_iface(SERVICE_NAME_INETCFG, &sid,
+            INET_PORT_CFG);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
+                return EEXIST;
+        }
+        
+        rc = loc_service_register_with_iface(SERVICE_NAME_INETPING, &sid,
+            INET_PORT_PING);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
@@ -428 +429 @@
 }
 
+static void inet_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        sysarg_t port;
+
+        port = IPC_GET_ARG1(*icall);
+
+        switch (port) {
+        case INET_PORT_DEFAULT:
+                inet_default_conn(iid, icall, arg);
+                break;
+        case INET_PORT_CFG:
+                inet_cfg_conn(iid, icall, arg);
+                break;
+        case INET_PORT_PING:
+                inetping_conn(iid, icall, arg);
+                break;
+        default:
+                async_answer_0(iid, ENOTSUP);
+                break;
+        }
+}
+
 static inet_client_t *inet_client_find(uint8_t proto)
 {