Changeset 9520af7 in mainline for uspace/srv/net/tcp/conn.c

Timestamp:

2017-09-12T15:48:01Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1d40c93d

Parents:

0a1e7e4

Message:

Allow TCP conn tests that involve transferring data by enabling an internal loopback. Add simple →SYN, ←RST test.

File:

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

uspace/srv/net/tcp/conn.c

@@ -47 +47 @@
 #include "iqueue.h"
 #include "pdu.h"
+#include "rqueue.h"
 #include "segment.h"
 #include "seq_no.h"
@@ -65 +66 @@
 /** Connection association map */
 static amap_t *amap;
+/** Taken after tcp_conn_t lock */
 static FIBRIL_MUTEX_INITIALIZE(amap_lock);
+
+/** Internal loopback configuration */
+tcp_lb_t tcp_conn_lb = tcp_lb_none;
 
 static void tcp_conn_seg_process(tcp_conn_t *, tcp_segment_t *);
@@ -71 +76 @@
 static void tcp_conn_tw_timer_clear(tcp_conn_t *);
 static void tcp_transmit_segment(inet_ep2_t *, tcp_segment_t *);
+static void tcp_conn_trim_seg_to_wnd(tcp_conn_t *, tcp_segment_t *);
+static void tcp_reply_rst(inet_ep2_t *, tcp_segment_t *);
 
 static tcp_tqueue_cb_t tcp_conn_tqueue_cb = {
@@ -324 +331 @@
  * Remove connection from the connection map.
  */
-void tcp_conn_remove(tcp_conn_t *conn)
+static void tcp_conn_remove(tcp_conn_t *conn)
 {
         if (!conn->mapped)
@@ -369 +376 @@
 void tcp_conn_sync(tcp_conn_t *conn)
 {
+        assert(fibril_mutex_is_locked(&conn->lock));
+
         /* XXX select ISS */
         conn->iss = 1;
@@ -1358 +1367 @@
  * @param seg           Segment
  */
-void tcp_conn_trim_seg_to_wnd(tcp_conn_t *conn, tcp_segment_t *seg)
+static void tcp_conn_trim_seg_to_wnd(tcp_conn_t *conn, tcp_segment_t *seg)
 {
         uint32_t left, right;
@@ -1382 +1391 @@
 }
 
+/** Transmit segment over network.
+ *
+ * @param epp Endpoint pair with source and destination information
+ * @param seg Segment (ownership retained by caller)
+ */
 static void tcp_transmit_segment(inet_ep2_t *epp, tcp_segment_t *seg)
 {
+        tcp_pdu_t *pdu;
+        tcp_segment_t *dseg;
+        inet_ep2_t rident;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG,
             "tcp_transmit_segment(l:(%u),f:(%u), %p)",
@@ -1393 +1411 @@
         tcp_segment_dump(seg);
 
-//      tcp_rqueue_bounce_seg(sp, seg);
-//      tcp_ncsim_bounce_seg(sp, seg);
-
-        tcp_pdu_t *pdu;
+        if (tcp_conn_lb == tcp_lb_segment) {
+                /* Loop back segment */
+//              tcp_ncsim_bounce_seg(sp, seg);
+
+                /* Reverse the identification */
+                tcp_ep2_flipped(epp, &rident);
+
+                /* Insert segment back into rqueue */
+                dseg = tcp_segment_dup(seg);
+                tcp_rqueue_insert_seg(&rident, dseg);
+                return;
+        }
 
         if (tcp_pdu_encode(epp, seg, &pdu) != EOK) {
@@ -1403 +1429 @@
         }
 
+        if (tcp_conn_lb == tcp_lb_pdu) {
+                /* Loop back PDU */
+                if (tcp_pdu_decode(pdu, &rident, &dseg) != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped.");
+                        tcp_pdu_delete(pdu);
+                        return;
+                }
+
+                tcp_pdu_delete(pdu);
+
+                /* Insert decoded segment into rqueue */
+                tcp_rqueue_insert_seg(&rident, dseg);
+                return;
+        }
+
         tcp_transmit_pdu(pdu);
         tcp_pdu_delete(pdu);
@@ -1425 +1466 @@
  * @param seg           Incoming segment
  */
-void tcp_reply_rst(inet_ep2_t *epp, tcp_segment_t *seg)
+static void tcp_reply_rst(inet_ep2_t *epp, tcp_segment_t *seg)
 {
         tcp_segment_t *rseg;