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

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

@@ -70 +70 @@
 
         /* Allocate receive buffer */
+        fibril_mutex_initialize(&conn->rcv_buf_lock);
+        fibril_condvar_initialize(&conn->rcv_buf_cv);
         conn->rcv_buf_size = RCV_BUF_SIZE;
         conn->rcv_buf_used = 0;
+
         conn->rcv_buf = calloc(1, conn->rcv_buf_size);
         if (conn->rcv_buf == NULL) {
@@ -306 +309 @@
         if ((seg->ctrl & CTL_ACK) != 0) {
                 conn->snd_una = seg->ack;
-                tcp_tqueue_remove_acked(conn);
+
+                /*
+                 * Prune acked segments from retransmission queue and
+                 * possibly transmit more data.
+                 */
+                tcp_tqueue_ack_received(conn);
         }
 
@@ -459 +467 @@
                 /* Update SND.UNA */
                 conn->snd_una = seg->ack;
-
-                /* Prune acked segments from retransmission queue */
-                tcp_tqueue_remove_acked(conn);
         }
 
@@ -468 +473 @@
                 conn->snd_wl1 = seg->seq;
                 conn->snd_wl2 = seg->ack;
-        }
+
+                log_msg(LVL_DEBUG, "Updating send window, SND.WND=%" PRIu32
+                    ", SND.WL1=%" PRIu32 ", SND.WL2=%" PRIu32,
+                    conn->snd_wnd, conn->snd_wl1, conn->snd_wl2);
+        }
+
+        /*
+         * Prune acked segments from retransmission queue and
+         * possibly transmit more data.
+         */
+        tcp_tqueue_ack_received(conn);
 
         return cp_continue;
@@ -659 +674 @@
         tcp_conn_trim_seg_to_wnd(conn, seg);
 
+        fibril_mutex_lock(&conn->rcv_buf_lock);
+
         /* Determine how many bytes to copy */
         text_size = tcp_segment_text_size(seg);
@@ -664 +681 @@
 
         /* Copy data to receive buffer */
-        tcp_segment_text_copy(seg, conn->rcv_buf, xfer_size);
+        tcp_segment_text_copy(seg, conn->rcv_buf + conn->rcv_buf_used,
+            xfer_size);
+        conn->rcv_buf_used += xfer_size;
+
+        /* Signal to the receive function that new data has arrived */
+        fibril_condvar_broadcast(&conn->rcv_buf_cv);
+        fibril_mutex_unlock(&conn->rcv_buf_lock);
 
         log_msg(LVL_DEBUG, "Received %zu bytes of data.", xfer_size);