Changeset 3819ce5 in mainline for uspace/srv/net/tl/tcp/segment.c

Timestamp:

2011-12-25T10:05:28Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ecf823a

Parents:

1440eae (diff), 7e1b130 (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 with mainline

File:

• uspace/srv/net/tl/tcp/segment.c (modified) (1 diff)

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

@@ -119 +119 @@
                 return NULL;
 
-        rseg->ctrl = CTL_RST;
-        rseg->seq = seg->ack;
+        if ((seg->ctrl & CTL_ACK) == 0) {
+                rseg->ctrl = CTL_RST | CTL_ACK;
+                rseg->seq = 0;
+                rseg->ack = seg->seq + seg->len;
+        } else {
+                rseg->ctrl = CTL_RST;
+                rseg->seq = seg->ack;
+        }
 
         return rseg;