Changeset cf3aee19 in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2015-06-17T23:45:24Z (9 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

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

Children:

523b17a

Parents:

fc7bf19 (diff), 2654afb (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:

Sync with mainline

File:

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

uspace/srv/net/inetsrv/inetsrv.c

@@ -469 +469 @@
 {
         async_exch_t *exch = async_exchange_begin(client->sess);
-        
+
         ipc_call_t answer;
-        aid_t req = async_send_1(exch, INET_EV_RECV, dgram->tos, &answer);
-        
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "inet_ev_recv: iplink=%zu",
+            dgram->iplink);
+
+        aid_t req = async_send_2(exch, INET_EV_RECV, dgram->tos,
+            dgram->iplink, &answer);
+
         int rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));
         if (rc != EOK) {
@@ -479 +484 @@
                 return rc;
         }
-        
+
         rc = async_data_write_start(exch, &dgram->dest, sizeof(inet_addr_t));
         if (rc != EOK) {
@@ -486 +491 @@
                 return rc;
         }
-        
+
         rc = async_data_write_start(exch, dgram->data, dgram->size);
-        
+
         async_exchange_end(exch);
-        
+
         if (rc != EOK) {
                 async_forget(req);
                 return rc;
         }
-        
+
         sysarg_t retval;
         async_wait_for(req, &retval);
-        
+
         return (int) retval;
 }
@@ -511 +516 @@
         if (proto == IP_PROTO_ICMP)
                 return icmp_recv(dgram);
-        
+
         if (proto == IP_PROTO_ICMPV6)
                 return icmpv6_recv(dgram);
@@ -540 +545 @@
                 if (packet->offs == 0 && !packet->mf) {
                         /* It is complete deliver it immediately */
+                        dgram.iplink = packet->link_id;
                         dgram.src = packet->src;
                         dgram.dest = packet->dest;