Changeset 975d528 in mainline for uspace/srv/net/tcp/conn.c

Timestamp:

2017-09-10T17:48:58Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e1b4ae0

Parents:

12dcd5f

Message:

Add unit tests for TCP tqueue. Fix tqueue possibly being finalized without freeing pending segments.

File:

• uspace/srv/net/tcp/conn.c (modified) (5 diffs)

uspace/srv/net/tcp/conn.c

@@ -44 +44 @@
 #include <stdlib.h>
 #include "conn.h"
+#include "inet.h"
 #include "iqueue.h"
+#include "pdu.h"
 #include "segment.h"
 #include "seq_no.h"
@@ -62 +64 @@
 static amap_t *amap;
 
-static void tcp_conn_seg_process(tcp_conn_t *conn, tcp_segment_t *seg);
-static void tcp_conn_tw_timer_set(tcp_conn_t *conn);
-static void tcp_conn_tw_timer_clear(tcp_conn_t *conn);
+static void tcp_conn_seg_process(tcp_conn_t *, tcp_segment_t *);
+static void tcp_conn_tw_timer_set(tcp_conn_t *);
+static void tcp_conn_tw_timer_clear(tcp_conn_t *);
+static void tcp_transmit_segment(inet_ep2_t *, tcp_segment_t *);
+
+static tcp_tqueue_cb_t tcp_conn_tqueue_cb = {
+        .transmit_seg = tcp_transmit_segment
+};
 
 /** Initialize connections. */
@@ -130 +137 @@
 
         /* Initialize retransmission queue */
-        if (tcp_tqueue_init(&conn->retransmit, conn) != EOK)
+        if (tcp_tqueue_init(&conn->retransmit, conn, &tcp_conn_tqueue_cb)
+            != EOK) {
                 goto error;
+        }
 
         tqueue_inited = true;
@@ -295 +304 @@
 void tcp_conn_remove(tcp_conn_t *conn)
 {
+        if (!link_used(&conn->link))
+                return;
+
         fibril_mutex_lock(&conn_list_lock);
         amap_remove(amap, &conn->ident);
@@ -1346 +1358 @@
 }
 
+static void tcp_transmit_segment(inet_ep2_t *epp, tcp_segment_t *seg)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG,
+            "tcp_transmit_segment(l:(%u),f:(%u), %p)",
+            epp->local.port, epp->remote.port, seg);
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
+            seg->seq, seg->wnd);
+
+        tcp_segment_dump(seg);
+
+//      tcp_rqueue_bounce_seg(sp, seg);
+//      tcp_ncsim_bounce_seg(sp, seg);
+
+        tcp_pdu_t *pdu;
+
+        if (tcp_pdu_encode(epp, seg, &pdu) != EOK) {
+                log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped.");
+                return;
+        }
+
+        tcp_transmit_pdu(pdu);
+        tcp_pdu_delete(pdu);
+}
+
 /** Compute flipped endpoint pair for response.
  *