Changeset 3e2291a9 in mainline

Timestamp:

2017-09-17T23:37:43Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

797dc79e

Parents:

6969eea3

Message:

TCP tests for ucall module and some more for conn module. Implement tcp_uc_abort(). Fix tcp_uc_open() leaking connection of connecting failed. Fix missing transition Closing → Time-Wait. Fix wrong SEG.ACK in response to FIN.

Location:

uspace/srv/net/tcp

Files:

• Makefile (modified) (1 diff)
• conn.c (modified) (4 diffs)
• test/conn.c (modified) (3 diffs)
• test/main.c (modified) (1 diff)
• test/ucall.c (added)
• ucall.c (modified) (2 diffs)

uspace/srv/net/tcp/Makefile

@@ -64 +64 @@
         test/segment.c \
         test/seq_no.c \
-        test/tqueue.c
+        test/tqueue.c \
+        test/ucall.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/net/tcp/conn.c

@@ -100 +100 @@
 void tcp_conns_fini(void)
 {
+        assert(list_empty(&conn_list));
+
         amap_destroy(amap);
         amap = NULL;
-
-        assert(list_empty(&conn_list));
 }
 
@@ -458 +458 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_reset()", conn->name);
+
+        if (conn->cstate == st_closed)
+                return;
+
         conn->reset = true;
         tcp_conn_state_set(conn, st_closed);
@@ -910 +914 @@
                 return cp_done;
 
-        /* TODO */
+        if (conn->fin_is_acked) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN acked -> Time-Wait",
+                    conn->name);
+                tcp_conn_state_set(conn, st_time_wait);
+        }
+
         return cp_continue;
 }
@@ -1107 +1116 @@
                 log_msg(LOG_DEFAULT, LVL_DEBUG, " - FIN found in segment.");
 
+                conn->rcv_nxt++;
+                conn->rcv_wnd--;
+
                 /* Send ACK */
                 tcp_tqueue_ctrl_seg(conn, CTL_ACK);
-
-                conn->rcv_nxt++;
-                conn->rcv_wnd--;
 
                 /* Change connection state */

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

@@ -57 +57 @@
         tcp_rqueue_init(&test_rqueue_cb);
         tcp_rqueue_fibril_start();
+
+        /* Enable internal loopback */
+        tcp_conn_lb = tcp_lb_segment;
 }
 
@@ -118 +121 @@
         int rc;
 
-        tcp_conn_lb = tcp_lb_segment;
-
         inet_ep2_init(&epp);
         inet_addr(&epp.local.addr, 127, 0, 0, 1);
@@ -146 +147 @@
 }
 
+/** Test establishing a connection */
+PCUT_TEST(conn_establish)
+{
+        tcp_conn_t *cconn, *sconn;
+        inet_ep2_t cepp, sepp;
+        int rc;
+
+        /* Client EPP */
+        inet_ep2_init(&cepp);
+        inet_addr(&cepp.local.addr, 127, 0, 0, 1);
+        inet_addr(&cepp.remote.addr, 127, 0, 0, 1);
+        cepp.remote.port = inet_port_user_lo;
+
+        /* Server EPP */
+        inet_ep2_init(&sepp);
+        inet_addr(&sepp.local.addr, 127, 0, 0, 1);
+        sepp.local.port = inet_port_user_lo;
+
+        /* Client side of the connection */
+        cconn = tcp_conn_new(&cepp);
+        PCUT_ASSERT_NOT_NULL(cconn);
+
+        rc = tcp_conn_add(cconn);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_INT_EQUALS(st_listen, cconn->cstate);
+        PCUT_ASSERT_FALSE(tcp_conn_got_syn(cconn));
+
+        /* Server side of the connection */
+        sconn = tcp_conn_new(&sepp);
+        PCUT_ASSERT_NOT_NULL(sconn);
+
+        rc = tcp_conn_add(sconn);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_INT_EQUALS(st_listen, sconn->cstate);
+        PCUT_ASSERT_FALSE(tcp_conn_got_syn(sconn));
+
+        /* Start establishing the connection */
+
+        tcp_conn_lock(cconn);
+        tcp_conn_sync(cconn);
+        PCUT_ASSERT_INT_EQUALS(st_syn_sent, cconn->cstate);
+        PCUT_ASSERT_FALSE(tcp_conn_got_syn(cconn));
+
+        /* Wait for client-side state to transition */
+        while (cconn->cstate == st_syn_sent)
+                fibril_condvar_wait(&cconn->cstate_cv, &cconn->lock);
+
+        PCUT_ASSERT_INT_EQUALS(st_established, cconn->cstate);
+        PCUT_ASSERT_TRUE(tcp_conn_got_syn(cconn));
+        tcp_conn_unlock(cconn);
+
+        /* Wait for server-side state to transition */
+        tcp_conn_lock(sconn);
+        while (sconn->cstate == st_listen || sconn->cstate == st_syn_received)
+                fibril_condvar_wait(&sconn->cstate_cv, &sconn->lock);
+
+        PCUT_ASSERT_INT_EQUALS(st_established, sconn->cstate);
+        PCUT_ASSERT_TRUE(tcp_conn_got_syn(sconn));
+
+        /* Verify counters */
+        PCUT_ASSERT_EQUALS(cconn->iss + 1, cconn->snd_nxt);
+        PCUT_ASSERT_EQUALS(cconn->iss + 1, cconn->snd_una);
+        PCUT_ASSERT_EQUALS(sconn->iss + 1, sconn->snd_nxt);
+        PCUT_ASSERT_EQUALS(sconn->iss + 1, sconn->snd_una);
+
+        tcp_conn_unlock(sconn);
+
+        tcp_conn_lock(cconn);
+        tcp_conn_reset(cconn);
+        tcp_conn_unlock(cconn);
+        tcp_conn_delete(cconn);
+
+        tcp_conn_lock(sconn);
+        tcp_conn_reset(sconn);
+        tcp_conn_unlock(sconn);
+        tcp_conn_delete(sconn);
+}
+
+PCUT_TEST(ep2_flipped)
+{
+        inet_ep2_t a, fa;
+
+        inet_addr(&a.local.addr, 1, 2, 3, 4);
+        a.local.port = 1234;
+        inet_addr(&a.remote.addr, 5, 6, 7, 8);
+        a.remote.port = 5678;
+
+        tcp_ep2_flipped(&a, &fa);
+
+        PCUT_ASSERT_INT_EQUALS(a.local.port, fa.remote.port);
+        PCUT_ASSERT_INT_EQUALS(a.remote.port, fa.local.port);
+
+        PCUT_ASSERT_TRUE(inet_addr_compare(&a.local.addr, &fa.remote.addr));
+        PCUT_ASSERT_TRUE(inet_addr_compare(&a.remote.addr, &fa.local.addr));
+}
+
 PCUT_EXPORT(conn);

uspace/srv/net/tcp/test/main.c

@@ -64 +64 @@
 PCUT_IMPORT(seq_no);
 PCUT_IMPORT(tqueue);
+PCUT_IMPORT(ucall);
 
 PCUT_MAIN()

uspace/srv/net/tcp/ucall.c

@@ -108 +108 @@
                 assert(nconn->cstate == st_closed);
                 tcp_conn_unlock(nconn);
+                tcp_conn_delete(nconn);
                 return TCP_ERESET;
         }
@@ -280 +281 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_abort()");
+\
+        tcp_conn_lock(conn);
+        tcp_conn_reset(conn);
+        tcp_conn_unlock(conn);
 }