Changeset bdae198 in mainline for uspace/srv/net/inetsrv/inet_std.h

Timestamp:

2013-08-04T12:01:10Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea509069

Parents:

b08879c2 (diff), d856110 (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/inet_std.h (modified) (4 diffs)

uspace/srv/net/inetsrv/inet_std.h

@@ -40 +40 @@
 #include <sys/types.h>
 
+#define IP6_NEXT_FRAGMENT  44
+
 /** IPv4 Datagram header (fixed part) */
 typedef struct {
@@ -48 +50 @@
         /** Total Length */
         uint16_t tot_len;
-        /** Identification */
+        /** Identifier */
         uint16_t id;
         /** Flags, Fragment Offset */
@@ -90 +92 @@
 };
 
+/** Bits in ip6_header_fragment_t.offsmf */
+enum flags_offsmt_bits {
+        /** More fragments */
+        OF_FLAG_M = 0,
+        /** Fragment offset, highest bit */
+        OF_FRAGOFF_h = 15,
+        /** Fragment offset, lowest bit */
+        OF_FRAGOFF_l = 3
+};
+
 /** IPv6 Datagram header (fixed part) */
 typedef struct {
@@ -114 +126 @@
         /** Reserved */
         uint8_t reserved;
-        /** Fragment Offset, Flags */
-        uint16_t foff_flags;
-        /** Identification */
+        /** Fragmentation offset, reserved and M flag */
+        uint16_t offsmf;
+        /** Identifier */
         uint32_t id;
 } ip6_header_fragment_t;