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

File:

• uspace/srv/net/inetsrv/reass.c (modified) (6 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);
@@ -136 +139 @@
                     dgram_link);
 
-                if ((inet_addr_compare(&f1->packet.src, &packet->src)) &&
-                    (inet_addr_compare(&f1->packet.dest, &packet->dest)) &&
-                    (f1->packet.proto == packet->proto) &&
-                    (f1->packet.ident == packet->ident)) {
+                if (f1->packet.src.ipv4 == packet->src.ipv4 &&
+                    f1->packet.dest.ipv4 == packet->dest.ipv4 &&
+                    f1->packet.proto == packet->proto &&
+                    f1->packet.ident == packet->ident) {
                         /* Match */
                         return rdg;
@@ -161 +164 @@
                 return NULL;
 
-        list_append(&rdg->map_link, &reass_dgram_map);
+        link_initialize(&rdg->map_link);
         list_initialize(&rdg->frags);
 
@@ -286 +289 @@
         size_t fragoff_limit;
         inet_dgram_t dgram;
+        reass_frag_t *frag;
         uint8_t proto;
-        reass_frag_t *frag;
 
         /*
@@ -294 +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;
-                }
         }
 
@@ -327 +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;
         }