Changeset 06295a9 in mainline

Timestamp:

2012-02-06T12:43:31Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bc38578

Parents:

e2e56e67

Message:

NIC discovery in ethip. Create one IP link for each NIC.

Location:

uspace/srv/ethip

Files:

• Makefile (modified) (1 diff)
• ethip.c (modified) (4 diffs)
• ethip.h (added)
• ethip_nic.c (added)
• ethip_nic.h (added)

uspace/srv/ethip/Makefile

@@ -31 +31 @@
 
 SOURCES = \
-        ethip.c
+        ethip.c \
+        ethip_nic.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/ethip/ethip.c

@@ -41 +41 @@
 #include <loc.h>
 #include <stdio.h>
+#include <stdlib.h>
+
+#include "ethip.h"
+#include "ethip_nic.h"
 
 #define NAME "eth"
@@ -58 +62 @@
 };
 
-static iplink_srv_t test_srv;
-
 static int ethip_init(void)
 {
         int rc;
-        service_id_t sid;
-        category_id_t iplink_cat;
-
-        test_srv.ops = &ethip_iplink_ops;
-        test_srv.arg = NULL;
 
         async_set_client_connection(ethip_client_conn);
@@ -77 +74 @@
         }
 
-        rc = loc_service_register("net/eth0", &sid);
+        rc = ethip_nic_discovery_start();
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+int ethip_iplink_init(ethip_nic_t *nic)
+{
+        int rc;
+        service_id_t sid;
+        category_id_t iplink_cat;
+        static unsigned link_num = 0;
+        char *svc_name = NULL;
+
+        log_msg(LVL_DEBUG, "ethip_iplink_init()");
+
+        nic->iplink.ops = &ethip_iplink_ops;
+        nic->iplink.arg = nic;
+
+        rc = asprintf(&svc_name, "net/eth%u", ++link_num);
+        if (rc < 0) {
+                log_msg(LVL_ERROR, "Out of memory.");
+                goto error;
+        }
+
+        rc = loc_service_register(svc_name, &sid);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed registering service net/eth0.");
-                return rc;
+                log_msg(LVL_ERROR, "Failed registering service %s.", svc_name);
+                goto error;
         }
 
@@ -86 +109 @@
         if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed resolving category 'iplink'.");
-                return rc;
+                goto error;
         }
 
         rc = loc_service_add_to_cat(sid, iplink_cat);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed adding net/eth0 to category.");
-                return rc;
+                log_msg(LVL_ERROR, "Failed adding %s to category.", svc_name);
+                goto error;
         }
 
         return EOK;
+
+error:
+        if (svc_name != NULL)
+                free(svc_name);
+        return rc;
 }
 
 static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        log_msg(LVL_DEBUG, "ethip_client_conn()");
-        iplink_conn(iid, icall, &test_srv);
+        log_msg(LVL_DEBUG, "ethip_client_conn(%u)", (unsigned) IPC_GET_ARG1(*icall));
+        if (0) iplink_conn(iid, icall, NULL);
 }