Changes in uspace/srv/net/inetsrv/reass.c [fc6abbe:feeac0d] in mainline

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