Changeset 313824a in mainline for uspace/srv/net/inetsrv/inet_link.c

Timestamp:

2013-07-16T17:05:30Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1f97352

Parents:

fc4bf2a

Message:

all fragments of a packet need to have the same identifier (thx Antonin Steinhauser)

File:

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

uspace/srv/net/inetsrv/inet_link.c

@@ -52 +52 @@
 static bool first_link6 = true;
 
+static FIBRIL_MUTEX_INITIALIZE(ip_ident_lock);
+static uint16_t ip_ident = 0;
+
 static int inet_link_open(service_id_t);
 static int inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, uint16_t);
@@ -366 +369 @@
         packet.proto = proto;
         packet.ttl = ttl;
+        
+        /* Allocate identifier */
+        fibril_mutex_lock(&ip_ident_lock);
+        packet.ident = ++ip_ident;
+        fibril_mutex_unlock(&ip_ident_lock);
+        
         packet.df = df;
         packet.data = dgram->data;
         packet.size = dgram->size;
         
+        int rc;
         size_t offs = 0;
-        int rc;
         
         do {
@@ -421 +430 @@
         packet.proto = proto;
         packet.ttl = ttl;
+        
+        /* Allocate identifier */
+        fibril_mutex_lock(&ip_ident_lock);
+        packet.ident = ++ip_ident;
+        fibril_mutex_unlock(&ip_ident_lock);
+        
         packet.df = df;
         packet.data = dgram->data;