Changeset bc38578 in mainline

Timestamp:

2012-02-06T16:12:58Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ceba4bed

Parents:

06295a9

Message:

Identify incoming IP link connections.

Location:

uspace/srv/ethip

Files:

• ethip.c (modified) (2 diffs)
• ethip.h (modified) (1 diff)
• ethip_nic.c (modified) (2 diffs)
• ethip_nic.h (modified) (1 diff)

uspace/srv/ethip/ethip.c

@@ -106 +106 @@
         }
 
+        nic->iplink_sid = sid;
+
         rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
@@ -128 +130 @@
 static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        log_msg(LVL_DEBUG, "ethip_client_conn(%u)", (unsigned) IPC_GET_ARG1(*icall));
-        if (0) iplink_conn(iid, icall, NULL);
+        ethip_nic_t *nic;
+        service_id_t sid;
+
+        sid = (service_id_t)IPC_GET_ARG1(*icall);
+        log_msg(LVL_DEBUG, "ethip_client_conn(%u)", (unsigned)sid);
+        nic = ethip_nic_find_by_iplink_sid(sid);
+        if (nic == NULL) {
+                log_msg(LVL_WARN, "Uknown service ID.");
+                return;
+        }
+
+        iplink_conn(iid, icall, &nic->iplink);
 }
 

uspace/srv/ethip/ethip.h

@@ -45 +45 @@
 
         iplink_srv_t iplink;
+        service_id_t iplink_sid;
 } ethip_nic_t;
 

uspace/srv/ethip/ethip_nic.c

@@ -35 +35 @@
  */
 
+#include <adt/list.h>
 #include <async.h>
 #include <bool.h>
@@ -256 +257 @@
 }
 
+ethip_nic_t *ethip_nic_find_by_iplink_sid(service_id_t iplink_sid)
+{
+        log_msg(LVL_DEBUG, "ethip_nic_find_by_iplink_sid(%u)",
+            (unsigned) iplink_sid);
+
+        list_foreach(ethip_nic_list, link) {
+                log_msg(LVL_DEBUG, "ethip_nic_find_by_iplink_sid - element");
+                ethip_nic_t *nic = list_get_instance(link, ethip_nic_t,
+                    nic_list);
+
+                if (nic->iplink_sid == iplink_sid) {
+                        log_msg(LVL_DEBUG, "ethip_nic_find_by_iplink_sid - found %p", nic);
+                        return nic;
+                }
+        }
+
+        log_msg(LVL_DEBUG, "ethip_nic_find_by_iplink_sid - not found");
+        return NULL;
+}
+
 /** @}
  */

uspace/srv/ethip/ethip_nic.h

@@ -38 +38 @@
 #define ETHIP_NIC_H_
 
+#include <ipc/loc.h>
+
 extern int ethip_nic_discovery_start(void);
+extern ethip_nic_t *ethip_nic_find_by_iplink_sid(service_id_t);
 
 #endif