Changeset dd0c8a0 in mainline for uspace/srv/net/tcp/std.h

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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/tcp/std.h (modified) (3 diffs)

uspace/srv/net/tcp/std.h

@@ -39 +39 @@
 
 #include <sys/types.h>
+#include <inet/addr.h>
+
+#define IP_PROTO_TCP  6
 
 /** TCP Header (fixed part) */
@@ -72 +75 @@
 };
 
-/** TCP pseudo header */
+/** TCP over IPv4 checksum pseudo header */
 typedef struct {
         /** Source address */
-        uint32_t src_addr;
+        uint32_t src;
         /** Destination address */
-        uint32_t dest_addr;
+        uint32_t dest;
         /** Zero */
         uint8_t zero;
@@ -85 +88 @@
         uint16_t tcp_length;
 } tcp_phdr_t;
+
+/** TCP over IPv6 checksum pseudo header */
+typedef struct {
+        /** Source address */
+        addr128_t src;
+        /** Destination address */
+        addr128_t dest;
+        /** TCP length */
+        uint32_t tcp_length;
+        /** Zeroes */
+        uint8_t zeroes[3];
+        /** Next header */
+        uint8_t next;
+} tcp_phdr6_t;
 
 /** Option kind */