Changeset 7f95c904 in mainline for uspace/srv/inet/pdu.c

Timestamp:

2012-04-16T07:04:19Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7fda2e0

Parents:

347768d

Message:

Prototype datagram reassembly.

File:

• uspace/srv/inet/pdu.c (modified) (3 diffs)

uspace/srv/inet/pdu.c

@@ -201 +201 @@
         uint8_t version;
         uint16_t ident;
+        uint16_t flags_foff;
+        uint16_t foff;
 
         log_msg(LVL_DEBUG, "inet_pdu_decode()");
@@ -231 +233 @@
 
         ident = uint16_t_be2host(hdr->id);
-        (void)ident;
-        /* XXX Flags */
-        /* XXX Fragment offset */
+        flags_foff = uint16_t_be2host(hdr->flags_foff);
+        foff = BIT_RANGE_EXTRACT(uint16_t, FF_FRAGOFF_h, FF_FRAGOFF_l,
+            flags_foff);
         /* XXX Checksum */
 
@@ -241 +243 @@
         packet->proto = hdr->proto;
         packet->ttl = hdr->ttl;
-        packet->df = (uint16_t_be2host(hdr->tos) & BIT_V(uint16_t, FF_FLAG_DF))
-            ? 1 : 0;
+        packet->ident = ident;
+
+        packet->df = (flags_foff & BIT_V(uint16_t, FF_FLAG_DF)) != 0;
+        packet->mf = (flags_foff & BIT_V(uint16_t, FF_FLAG_MF)) != 0;
+        packet->offs = foff * FRAG_OFFS_UNIT;
 
         /* XXX IP options */