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

Timestamp:

2011-10-04T20:40:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8c7a054

Parents:

32105348

Message:

Implement RECEIVE user call.

File:

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

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

@@ -72 +72 @@
         seg->wnd = conn->rcv_wnd;
 
+        log_msg(LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
+            seg->seq, seg->wnd);
+
         if ((seg->ctrl & CTL_ACK) != 0)
                 seg->ack = conn->rcv_nxt;
@@ -88 +91 @@
 void tcp_tqueue_new_data(tcp_conn_t *conn)
 {
+        size_t avail_wnd;
         size_t data_size;
         tcp_segment_t *seg;
@@ -93 +97 @@
         log_msg(LVL_DEBUG, "tcp_tqueue_new_data()");
 
-        data_size = min(conn->snd_buf_used, conn->snd_wnd);
+        /* Number of free sequence numbers in send window */
+        avail_wnd = (conn->snd_una + conn->snd_wnd) - conn->snd_nxt;
+
+        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);
@@ -116 +123 @@
 }
 
-/** Remove ACKed segments from retransmission queue.
+/** Remove ACKed segments from retransmission queue and possibly transmit
+ * more data.
  *
  * This should be called when SND.UNA is updated due to incoming ACK.
  */
-void tcp_tqueue_remove_acked(tcp_conn_t *conn)
+void tcp_tqueue_ack_received(tcp_conn_t *conn)
 {
         (void) conn;
+
+        tcp_tqueue_new_data(conn);
 }