Changeset 4f64a523 in mainline for uspace/srv/ethip

Timestamp:

2012-02-12T19:36:32Z (14 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.

Location:

uspace/srv/ethip

Files:

• ethip.c (modified) (6 diffs)
• ethip_nic.c (modified) (5 diffs)

uspace/srv/ethip/ethip.c

@@ -52 +52 @@
 #define NAME "eth"
 
-static int ethip_open(iplink_conn_t *conn);
-static int ethip_close(iplink_conn_t *conn);
-static int ethip_send(iplink_conn_t *conn, iplink_srv_sdu_t *sdu);
-static int ethip_get_mtu(iplink_conn_t *conn, size_t *mtu);
+static int ethip_open(iplink_srv_t *srv);
+static int ethip_close(iplink_srv_t *srv);
+static int ethip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu);
+static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu);
 
 static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -95 +95 @@
         log_msg(LVL_DEBUG, "ethip_iplink_init()");
 
+        iplink_srv_init(&nic->iplink);
         nic->iplink.ops = &ethip_iplink_ops;
         nic->iplink.arg = nic;
@@ -148 +149 @@
 }
 
-static int ethip_open(iplink_conn_t *conn)
+static int ethip_open(iplink_srv_t *srv)
 {
         log_msg(LVL_DEBUG, "ethip_open()");
@@ -154 +155 @@
 }
 
-static int ethip_close(iplink_conn_t *conn)
-{
-        log_msg(LVL_DEBUG, "ethip_open()");
-        return EOK;
-}
-
-static int ethip_send(iplink_conn_t *conn, iplink_srv_sdu_t *sdu)
-{
-        ethip_nic_t *nic = (ethip_nic_t *)conn->srv->arg;
+static int ethip_close(iplink_srv_t *srv)
+{
+        log_msg(LVL_DEBUG, "ethip_close()");
+        return EOK;
+}
+
+static int ethip_send(iplink_srv_t *srv, iplink_srv_sdu_t *sdu)
+{
+        ethip_nic_t *nic = (ethip_nic_t *)srv->arg;
         eth_frame_t frame;
         void *data;
@@ -188 +189 @@
 int ethip_received(iplink_srv_t *srv, void *data, size_t size)
 {
+        log_msg(LVL_DEBUG, "ethip_received(): srv=%p", srv);
+        ethip_nic_t *nic = (ethip_nic_t *)srv->arg;
         eth_frame_t frame;
         iplink_srv_sdu_t sdu;
         int rc;
 
+        log_msg(LVL_DEBUG, "ethip_received()");
+
+        log_msg(LVL_DEBUG, " - eth_pdu_decode");
         rc = eth_pdu_decode(data, size, &frame);
-        if (rc != EOK)
-                return rc;
-
+        if (rc != EOK) {
+                log_msg(LVL_DEBUG, " - eth_pdu_decode failed");
+                return rc;
+        }
+
+        log_msg(LVL_DEBUG, " - construct SDU");
+        sdu.lsrc.ipv4 = (192 << 24) | (168 << 16) | (0 << 8) | 1;
+        sdu.ldest.ipv4 = (192 << 24) | (168 << 16) | (0 << 8) | 4;
         sdu.data = frame.data;
         sdu.size = frame.size;
-        (void) sdu;
-        //rc = iplink_ev_recv(conn, &sdu);
+        log_msg(LVL_DEBUG, " - call iplink_ev_recv");
+        rc = iplink_ev_recv(&nic->iplink, &sdu);
 
         free(frame.data);
@@ -205 +216 @@
 }
 
-static int ethip_get_mtu(iplink_conn_t *conn, size_t *mtu)
+static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu)
 {
         log_msg(LVL_DEBUG, "ethip_get_mtu()");

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()");