Changeset 6896409c in mainline for uspace/srv/net/tl/tcp/header.c

Timestamp:

2011-11-21T22:46:37Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1812a0d

Parents:

eea65f4

Message:

Fix off-by-one bug in BIT_V.
Fix FIN being sent too early.
Fix FIN not being sent.
Fix seg→len from decoded PDU.
Add segment dumps.

File:

• uspace/srv/net/tl/tcp/header.c (modified) (5 diffs)

uspace/srv/net/tl/tcp/header.c

@@ -35 +35 @@
  */
 
+#include <bitops.h>
 #include <byteorder.h>
 #include <errno.h>
@@ -41 +42 @@
 #include "header.h"
 #include "segment.h"
+#include "seq_no.h"
 #include "std.h"
 #include "tcp_type.h"
@@ -73 +75 @@
         ctl = 0;
 
-        if ((doff_flags & DF_URG) != 0)
+        if ((doff_flags & BIT_V(uint16_t, DF_URG)) != 0)
                 ctl |= 0 /* XXX */;
-        if ((doff_flags & DF_ACK) != 0)
+        if ((doff_flags & BIT_V(uint16_t, DF_ACK)) != 0)
                 ctl |= CTL_ACK;
-        if ((doff_flags & DF_PSH) != 0)
+        if ((doff_flags & BIT_V(uint16_t, DF_PSH)) != 0)
                 ctl |= 0 /* XXX */;
-        if ((doff_flags & DF_RST) != 0)
+        if ((doff_flags & BIT_V(uint16_t, DF_RST)) != 0)
                 ctl |= CTL_RST;
-        if ((doff_flags & DF_SYN) != 0)
+        if ((doff_flags & BIT_V(uint16_t, DF_SYN)) != 0)
                 ctl |= CTL_SYN;
-        if ((doff_flags & DF_FIN) != 0)
+        if ((doff_flags & BIT_V(uint16_t, DF_FIN)) != 0)
                 ctl |= CTL_FIN;
 
@@ -97 +99 @@
 
         if ((ctl & CTL_ACK) != 0)
-                doff_flags |= DF_ACK;
+                doff_flags |= BIT_V(uint16_t, DF_ACK);
         if ((ctl & CTL_RST) != 0)
-                doff_flags |= DF_RST;
+                doff_flags |= BIT_V(uint16_t, DF_RST);
         if ((ctl & CTL_SYN) != 0)
-                doff_flags |= DF_SYN;
+                doff_flags |= BIT_V(uint16_t, DF_SYN);
         if ((ctl & CTL_FIN) != 0)
-                doff_flags |= DF_FIN;
+                doff_flags |= BIT_V(uint16_t, DF_FIN);
 
         *rdoff_flags = doff_flags;
@@ -203 +205 @@
 
         tcp_header_decode(pdu->header, nseg);
+        nseg->len += seq_no_control_len(nseg->ctrl);
 
         hdr = (tcp_header_t *)pdu->header;