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

Timestamp:

2013-07-06T21:57:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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) (2 diffs)

uspace/srv/net/inetsrv/inet_std.h

@@ -40 +40 @@
 #include <sys/types.h>
 
-/** Internet Datagram header (fixed part) */
+/** IPv4 Datagram header (fixed part) */
 typedef struct {
         /** Version, Internet Header Length */
@@ -90 +90 @@
 };
 
+/** IPv6 Datagram header (fixed part) */
+typedef struct {
+        /** Version, Traffic class first 4 bits */
+        uint8_t ver_tc;
+        /** Traffic class (the rest), Flow label */
+        uint8_t tc_fl[3];
+        /* Payload length */
+        uint16_t payload_len;
+        /** Next header */
+        uint8_t next;
+        /** Hop limit */
+        uint8_t hop_limit;
+        /** Source address */
+        uint8_t src_addr[16];
+        /** Destination address */
+        uint8_t dest_addr[16];
+} ip6_header_t;
+
+/** IPv6 Datagram Fragment extension header */
+typedef struct {
+        /** Next header */
+        uint8_t next;
+        /** Reserved */
+        uint8_t reserved;
+        /** Fragment Offset, Flags */
+        uint16_t foff_flags;
+        /** Identification */
+        uint32_t id;
+} ip6_header_fragment_t;
+
 /** Fragment offset is expressed in units of 8 bytes */
 #define FRAG_OFFS_UNIT 8