Changeset 048cd69 in mainline for uspace/srv/net/inetsrv/inet_link.c

Timestamp:

2015-06-07T15:41:04Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

204ba47

Parents:

4d11204 (diff), c3f7d37 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge network transport layer API rewrite.

File:

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

uspace/srv/net/inetsrv/inet_link.c

@@ -73 +73 @@
 {
         memcpy(ip_addr, link_local_node_ip, 16);
-        
+
         ip_addr[8] = mac_addr[0] ^ 0x02;
         ip_addr[9] = mac_addr[1];
@@ -85 +85 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_recv()");
-        
+
         int rc;
         inet_packet_t packet;
-        
+        inet_link_t *ilink;
+
+        ilink = (inet_link_t *)iplink_get_userptr(iplink);
+
         switch (ver) {
         case ip_v4:
-                rc = inet_pdu_decode(sdu->data, sdu->size, &packet);
+                rc = inet_pdu_decode(sdu->data, sdu->size, ilink->svc_id,
+                    &packet);
                 break;
         case ip_v6:
-                rc = inet_pdu_decode6(sdu->data, sdu->size, &packet);
+                rc = inet_pdu_decode6(sdu->data, sdu->size, ilink->svc_id,
+                    &packet);
                 break;
         default:
@@ -100 +105 @@
                 return EINVAL;
         }
-        
+
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "failed decoding PDU");
                 return rc;
         }
-        
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "inet_iplink_recv: link_id=%zu", packet.link_id);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "call inet_recv_packet()");
         rc = inet_recv_packet(&packet);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "call inet_recv_packet -> %d", rc);
         free(packet.data);
-        
+
         return rc;
 }
@@ -177 +183 @@
         }
 
-        rc = iplink_open(ilink->sess, &inet_iplink_ev_ops, &ilink->iplink);
+        rc = iplink_open(ilink->sess, &inet_iplink_ev_ops, ilink, &ilink->iplink);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed opening IP link '%s'",