Changeset 1ddbf81 in mainline for uspace/srv/net/tcp/iqueue.c

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.

File:

• uspace/srv/net/tcp/iqueue.c (modified) (2 diffs)

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);
 }