Changes in uspace/srv/net/inetsrv/reass.c [8ef1c1e:34c1bba] 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, map_link, reass_dgram_t, rdg) {
+        list_foreach(reass_dgram_map, link) {
+                reass_dgram_t *rdg = list_get_instance(link, reass_dgram_t,
+                    map_link);
+
                 link_t *f1_link = list_first(&rdg->frags);
                 assert(f1_link != NULL);
@@ -193 +196 @@
 
         data_copy = malloc(packet->size);
-        if (data_copy == NULL) {
-                free(frag);
+        if (data_copy == NULL)
                 return ENOMEM;
-        }
-
-        memcpy(data_copy, packet->data, packet->size);
 
         frag->packet = *packet;
@@ -220 +219 @@
                         break;
 
-                link = list_next(link, &rdg->frags);
+                link = link->next;
         }
 
@@ -244 +243 @@
         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 +289 @@
         size_t fragoff_limit;
         inet_dgram_t dgram;
+        reass_frag_t *frag;
         uint8_t proto;
-        reass_frag_t *frag;
-        int rc;
 
         /*
@@ -304 +297 @@
          */
         frag = NULL;
-        list_foreach(rdg->frags, dgram_link, reass_frag_t, cfrag) {
-                if (!cfrag->packet.mf) {
-                        frag = cfrag;
+        list_foreach(rdg->frags, link) {
+                frag = list_get_instance(link, reass_frag_t, dgram_link);
+
+                if (!frag->packet.mf)
                         break;
-                }
         }
 
@@ -317 +310 @@
 
         /* 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 */
@@ -327 +320 @@
                 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;
@@ -339 +330 @@
         size_t doffs = 0;
 
-        list_foreach(rdg->frags, dgram_link, reass_frag_t, cfrag) {
+        frag = NULL;
+        list_foreach(rdg->frags, link) {
+                frag = list_get_instance(link, reass_frag_t, dgram_link);
+
                 size_t cb, ce;
 
-                cb = max(doffs, cfrag->packet.offs);
-                ce = min(dgram_size, cfrag->packet.offs + cfrag->packet.size);
+                cb = max(doffs, frag->packet.offs);
+                ce = min(dgram_size, frag->packet.offs + frag->packet.size);
 
                 if (ce > cb) {
                         memcpy(dgram.data + cb,
-                            cfrag->packet.data + cb - cfrag->packet.offs,
+                            frag->packet.data + cb - frag->packet.offs,
                             ce - cb);
                 }
 
-                if (!cfrag->packet.mf)
+                if (!frag->packet.mf)
                         break;
         }
 
-        rc = inet_recv_dgram_local(&dgram, proto);
-        free(dgram.data);
-        return rc;
+        return inet_recv_dgram_local(&dgram, proto);
 }