Changeset 1ddbf81 in mainline

Timestamp:

2017-09-03T09:22:21Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

20c82e3

Parents:

e73dbc1

Message:

Add TCP iqueue test and missing seq_no_segment_ready test. Fix iqueue segments being inserted in the wrong order and fix infinite loop when two segments inserted in iqueue in descending order.

Location:

uspace/srv/net/tcp

Files:

• Makefile (modified) (1 diff)
• iqueue.c (modified) (2 diffs)
• iqueue.h (modified) (1 diff)
• test/iqueue.c (added)
• test/main.c (modified) (1 diff)
• test/seq_no.c (modified) (1 diff)

uspace/srv/net/tcp/Makefile

@@ -56 +56 @@
 TEST_SOURCES = \
         $(SOURCES_COMMON) \
+        test/iqueue.c \
         test/main.c \
         test/pdu.c \

uspace/srv/net/tcp/iqueue.c

@@ -84 +84 @@
                     tcp_iqueue_entry_t, link);
 
-                if (seq_no_seg_cmp(iqueue->conn, iqe->seg, qe->seg) >= 0)
+                if (seq_no_seg_cmp(iqueue->conn, iqe->seg, qe->seg) < 0)
                         break;
+
+                link = list_next(link, &iqueue->list);
         }
 
@@ -92 +94 @@
         else
                 list_append(&iqe->link, &iqueue->list);
+}
+
+/** Remove segment from incoming queue.
+ *
+ * @param iqueue        Incoming queue
+ * @param seg           Segment
+ */
+void tcp_iqueue_remove_seg(tcp_iqueue_t *iqueue, tcp_segment_t *seg)
+{
+        tcp_iqueue_entry_t *qe;
+        link_t *link;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "tcp_iqueue_remove_seg()");
+
+        link = list_first(&iqueue->list);
+        while (link != NULL) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "tcp_iqueue_remove_seg() - next");
+                qe = list_get_instance(link,
+                    tcp_iqueue_entry_t, link);
+
+                if (qe->seg == seg) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "tcp_iqueue_remove_seg() - found, DONE");
+                        list_remove(&qe->link);
+                        free(qe);
+                        return;
+                }
+
+                link = list_next(link, &iqueue->list);
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "tcp_iqueue_remove_seg() - not found");
+        assert(false);
 }
 

uspace/srv/net/tcp/iqueue.h

@@ -40 +40 @@
 extern void tcp_iqueue_init(tcp_iqueue_t *, tcp_conn_t *);
 extern void tcp_iqueue_insert_seg(tcp_iqueue_t *, tcp_segment_t *);
+extern void tcp_iqueue_remove_seg(tcp_iqueue_t *, tcp_segment_t *);
 extern int tcp_iqueue_get_ready_seg(tcp_iqueue_t *, tcp_segment_t **);
 

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

@@ -57 +57 @@
 PCUT_INIT
 
+PCUT_IMPORT(iqueue);
 PCUT_IMPORT(pdu);
 PCUT_IMPORT(segment);

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

@@ -242 +242 @@
 }
 
+/** Test seq_no_segment_ready() */
+PCUT_TEST(segment_ready)
+{
+        tcp_conn_t *conn;
+        inet_ep2_t epp;
+        tcp_segment_t *seg;
+        uint8_t *data;
+        size_t dsize;
+
+        inet_ep2_init(&epp);
+        conn = tcp_conn_new(&epp);
+        PCUT_ASSERT_NOT_NULL(conn);
+
+        dsize = 15;
+        data = calloc(dsize, 1);
+        PCUT_ASSERT_NOT_NULL(data);
+
+        seg = tcp_segment_make_data(0, data, dsize);
+        PCUT_ASSERT_NOT_NULL(seg);
+
+        /* Segment must be acceptable. Ready iff intersects RCV.NXT */
+
+        conn->rcv_nxt = 30;
+        conn->rcv_wnd = 20;
+
+        PCUT_ASSERT_INT_EQUALS(dsize, seg->len);
+
+        seg->seq = 16;
+        PCUT_ASSERT_TRUE(seq_no_segment_ready(conn, seg));
+
+        seg->seq = 17;
+        PCUT_ASSERT_TRUE(seq_no_segment_ready(conn, seg));
+
+        seg->seq = 29;
+        PCUT_ASSERT_TRUE(seq_no_segment_ready(conn, seg));
+
+        seg->seq = 30;
+        PCUT_ASSERT_TRUE(seq_no_segment_ready(conn, seg));
+
+        seg->seq = 31;
+        PCUT_ASSERT_FALSE(seq_no_segment_ready(conn, seg));
+
+        tcp_segment_delete(seg);
+        tcp_conn_delete(conn);
+        free(data);
+}
+
 /** Test seq_no_segment_acceptable() */
 PCUT_TEST(segment_acceptable)