Changeset 8c7a054 in mainline for uspace/srv/net/tl/tcp/tqueue.c

Timestamp:

2011-10-21T15:25:43Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

32aea9f4

Parents:

d9ce049

Message:

FIN processing (WIP).

File:

• uspace/srv/net/tl/tcp/tqueue.c (modified) (3 diffs)

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

@@ -92 +92 @@
 {
         size_t avail_wnd;
+        size_t xfer_seqlen;
+        size_t snd_buf_seqlen;
         size_t data_size;
+        tcp_control_t ctrl;
+
         tcp_segment_t *seg;
 
@@ -99 +103 @@
         /* Number of free sequence numbers in send window */
         avail_wnd = (conn->snd_una + conn->snd_wnd) - conn->snd_nxt;
+        snd_buf_seqlen = conn->snd_buf_used + (conn->snd_buf_fin ? 1 : 0);
 
-        data_size = min(conn->snd_buf_used, avail_wnd);
-        log_msg(LVL_DEBUG, "conn->snd_buf_used = %zu, SND.WND = %zu, "
-            "data_size = %zu", conn->snd_buf_used, conn->snd_wnd, data_size);
+        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,
+            xfer_seqlen);
 
-        if (data_size == 0)
+        if (xfer_seqlen == 0)
                 return;
 
         /* XXX Do not always send immediately */
 
-        seg = tcp_segment_make_data(0, conn->snd_buf, data_size);
+        data_size = xfer_seqlen - (conn->snd_buf_fin ? 1 : 0);
+        if (conn->snd_buf_fin && data_size + 1 == xfer_seqlen) {
+                /* We are sending out FIN */
+                ctrl = CTL_FIN;
+        } else {
+                ctrl = 0;
+        }
+
+        seg = tcp_segment_make_data(ctrl, conn->snd_buf, data_size);
         if (seg == NULL) {
                 log_msg(LVL_ERROR, "Memory allocation failure.");
@@ -119 +133 @@
             conn->snd_buf_used - data_size);
         conn->snd_buf_used -= data_size;
+        conn->snd_buf_fin = false;
 
         tcp_tqueue_seg(conn, seg);