Changes in uspace/srv/net/inetsrv/reass.c [34c1bba:8ef1c1e] in mainline

File:

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

uspace/srv/net/inetsrv/reass.c

@@ -129 +129 @@
         assert(fibril_mutex_is_locked(&reass_dgram_map_lock));
 
-        list_foreach(reass_dgram_map, link) {
-                reass_dgram_t *rdg = list_get_instance(link, reass_dgram_t,
-                    map_link);
-
+        list_foreach(reass_dgram_map, map_link, reass_dgram_t, rdg) {
                 link_t *f1_link = list_first(&rdg->frags);
                 assert(f1_link != NULL);
@@ -196 +193 @@
 
         data_copy = malloc(packet->size);
-        if (data_copy == NULL)
+        if (data_copy == NULL) {
+                free(frag);
                 return ENOMEM;
+        }
+
+        memcpy(data_copy, packet->data, packet->size);
 
         frag->packet = *packet;
@@ -219 +220 @@
                         break;
 
-                link = link->next;
+                link = list_next(link, &rdg->frags);
         }
 
@@ -243 +244 @@
         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 */
@@ -289 +295 @@
         size_t fragoff_limit;
         inet_dgram_t dgram;
+        uint8_t proto;
         reass_frag_t *frag;
-        uint8_t proto;
+        int rc;
 
         /*
@@ -297 +304 @@
          */
         frag = NULL;
-        list_foreach(rdg->frags, link) {
-                frag = list_get_instance(link, reass_frag_t, dgram_link);
-
-                if (!frag->packet.mf)
+        list_foreach(rdg->frags, dgram_link, reass_frag_t, cfrag) {
+                if (!cfrag->packet.mf) {
+                        frag = cfrag;
                         break;
+                }
         }
 
@@ -310 +317 @@
 
         /* 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 */
@@ -320 +327 @@
                 return ENOMEM;
 
+        /* XXX What if different fragments came from different link? */
+        dgram.iplink = frag->packet.link_id;
         dgram.size = dgram_size;
         dgram.src = frag->packet.src;
@@ -330 +339 @@
         size_t doffs = 0;
 
-        frag = NULL;
-        list_foreach(rdg->frags, link) {
-                frag = list_get_instance(link, reass_frag_t, dgram_link);
-
+        list_foreach(rdg->frags, dgram_link, reass_frag_t, cfrag) {
                 size_t cb, ce;
 
-                cb = max(doffs, frag->packet.offs);
-                ce = min(dgram_size, frag->packet.offs + frag->packet.size);
+                cb = max(doffs, cfrag->packet.offs);
+                ce = min(dgram_size, cfrag->packet.offs + cfrag->packet.size);
 
                 if (ce > cb) {
                         memcpy(dgram.data + cb,
-                            frag->packet.data + cb - frag->packet.offs,
+                            cfrag->packet.data + cb - cfrag->packet.offs,
                             ce - cb);
                 }
 
-                if (!frag->packet.mf)
+                if (!cfrag->packet.mf)
                         break;
         }
 
-        return inet_recv_dgram_local(&dgram, proto);
+        rc = inet_recv_dgram_local(&dgram, proto);
+        free(dgram.data);
+        return rc;
 }