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

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/srv/net/inetsrv/reass.c (modified) (4 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);
@@ -289 +286 @@
         size_t fragoff_limit;
         inet_dgram_t dgram;
+        uint8_t proto;
         reass_frag_t *frag;
-        uint8_t proto;
 
         /*
@@ -297 +294 @@
          */
         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;
+                }
         }
 
@@ -330 +327 @@
         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;
         }