Changeset 4f64a523 in mainline for uspace/srv/ethip/ethip_nic.c

Timestamp:

2012-02-12T19:36:32Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

df15e5f

Parents:

1493811

Message:

Need to limit iplink to a single client connection.

File:

• uspace/srv/ethip/ethip_nic.c (modified) (5 diffs)

uspace/srv/ethip/ethip_nic.c

@@ -158 +158 @@
         }
 
-        rc = nic_set_state(nic->sess, NIC_STATE_ACTIVE);
-        if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed activating NIC '%s'.",
-                    nic->svc_name);
-                goto error;
-        }
-
         log_msg(LVL_DEBUG, "Opened NIC '%s'", nic->svc_name);
         list_append(&nic->nic_list, &ethip_nic_list);
@@ -172 +165 @@
         if (rc != EOK)
                 goto error;
+
+        rc = nic_set_state(nic->sess, NIC_STATE_ACTIVE);
+        if (rc != EOK) {
+                log_msg(LVL_ERROR, "Failed activating NIC '%s'.",
+                    nic->svc_name);
+                goto error;
+        }
 
         log_msg(LVL_DEBUG, "Initialized IP link service.");
@@ -205 +205 @@
         size_t size;
 
-        log_msg(LVL_DEBUG, "ethip_nic_received()");
+        log_msg(LVL_DEBUG, "ethip_nic_received() nic=%p", nic);
 
         rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
@@ -213 +213 @@
         }
 
+        log_msg(LVL_DEBUG, "call ethip_received");
         rc = ethip_received(&nic->iplink, data, size);
+        log_msg(LVL_DEBUG, "free data");
         free(data);
 
@@ -228 +230 @@
 static void ethip_nic_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        ethip_nic_t *nic;
+        ethip_nic_t *nic = (ethip_nic_t *)arg;
 
         log_msg(LVL_DEBUG, "ethnip_nic_cb_conn()");