Changeset fc6abbe in mainline for uspace/srv/net/inetsrv/reass.c

Timestamp:

2014-07-17T13:36:45Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

869d936

Parents:

5c2e8d0

Message:

Fix a few bugs in IP reassembly code (thx Fan Jinfei).

File:

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

uspace/srv/net/inetsrv/reass.c

@@ -196 +196 @@
                 return ENOMEM;
 
+        memcpy(data_copy, packet->data, packet->size);
+
         frag->packet = *packet;
         frag->packet.data = data_copy;
@@ -216 +218 @@
                         break;
 
-                link = link->next;
+                link = list_next(link, &rdg->frags);
         }
 
@@ -240 +242 @@
         assert(!list_empty(&rdg->frags));
 
+        link = list_first(&rdg->frags);
+        assert(link != NULL);
+
+        frag = list_get_instance(link, reass_frag_t,
+            dgram_link);
+
         /* First fragment must be at offset zero */
-        frag = list_get_instance(list_first(&rdg->frags), reass_frag_t,
-            dgram_link);
         if (frag->packet.offs != 0)
                 return false;
 
         prev = frag;
+
         while (true) {
-                link = frag->dgram_link.next;
+                link = list_next(link, &rdg->frags);
                 if (link == NULL)
-                        return false;
+                        break;
 
                 /* Each next fragment must follow immediately or overlap */
@@ -288 +295 @@
         uint8_t proto;
         reass_frag_t *frag;
+        int rc;
 
         /*
@@ -307 +315 @@
 
         /* Upper bound for fragment offset field */
-        fragoff_limit = 1 << (FF_FRAGOFF_h - FF_FRAGOFF_l);
+        fragoff_limit = 1 << (FF_FRAGOFF_h - FF_FRAGOFF_l + 1);
 
         /* Verify that total size of datagram is within reasonable bounds */
@@ -343 +351 @@
         }
 
-        return inet_recv_dgram_local(&dgram, proto);
+        rc = inet_recv_dgram_local(&dgram, proto);
+        free(dgram.data);
+        return rc;
 }