Changeset 6896409c in mainline for uspace/srv/net/tl/tcp/tqueue.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/tqueue.c (modified) (5 diffs)

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

@@ -152 +152 @@
         size_t data_size;
         tcp_control_t ctrl;
+        bool send_fin;
 
         tcp_segment_t *seg;
 
-        log_msg(LVL_DEBUG, "tcp_tqueue_new_data()");
+        log_msg(LVL_DEBUG, "%s: tcp_tqueue_new_data()", conn->name);
 
         /* Number of free sequence numbers in send window */
@@ -162 +163 @@
 
         xfer_seqlen = min(snd_buf_seqlen, avail_wnd);
-        log_msg(LVL_DEBUG, "snd_buf_seqlen = %zu, SND.WND = %zu, "
-            "xfer_seqlen = %zu", snd_buf_seqlen, conn->snd_wnd,
+        log_msg(LVL_DEBUG, "%s: snd_buf_seqlen = %zu, SND.WND = %zu, "
+            "xfer_seqlen = %zu", conn->name, snd_buf_seqlen, conn->snd_wnd,
             xfer_seqlen);
 
@@ -171 +172 @@
         /* XXX Do not always send immediately */
 
-        data_size = xfer_seqlen - (conn->snd_buf_fin ? 1 : 0);
-        if (conn->snd_buf_fin && data_size + 1 == xfer_seqlen) {
+        send_fin = conn->snd_buf_fin && xfer_seqlen == snd_buf_seqlen;
+        data_size = xfer_seqlen - (send_fin ? 1 : 0);
+
+        if (send_fin) {
+                log_msg(LVL_DEBUG, "%s: Sending out FIN.", conn->name);
                 /* We are sending out FIN */
                 ctrl = CTL_FIN;
@@ -190 +194 @@
             conn->snd_buf_used - data_size);
         conn->snd_buf_used -= data_size;
-        conn->snd_buf_fin = false;
+
+        if (send_fin)
+                conn->snd_buf_fin = false;
 
         tcp_tqueue_seg(conn, seg);
@@ -261 +267 @@
         log_msg(LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
             seg->seq, seg->wnd);
+
+        tcp_segment_dump(seg);
 /*
         tcp_pdu_prepare(conn, seg, &data, &len);