Changeset 32aea9f4 in mainline

Timestamp:

2011-10-23T02:23:46Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f343a16

Parents:

8c7a054

Message:

Sort incoming segments by sequence order.

Location:

uspace/srv/net/tl/tcp

Files:

• iqueue.c (modified) (2 diffs)
• seq_no.c (modified) (2 diffs)
• seq_no.h (modified) (1 diff)

uspace/srv/net/tl/tcp/iqueue.c

@@ -65 +65 @@
 {
         tcp_iqueue_entry_t *iqe;
+        tcp_iqueue_entry_t *qe;
+        link_t *link;
         log_msg(LVL_DEBUG, "tcp_iqueue_insert_seg()");
 
@@ -75 +77 @@
         iqe->seg = seg;
 
-        /* XXX Sort by sequence number */
-        list_append(&iqe->link, &iqueue->list);
+        /* Sort by sequence number */
+
+        link = list_first(&iqueue->list);
+        while (link != NULL) {
+                qe = list_get_instance(link,
+                    tcp_iqueue_entry_t, link);
+
+                if (seq_no_seg_cmp(iqueue->conn, iqe->seg, qe->seg) >= 0)
+                        break;
+        }
+
+        if (link != NULL)
+                list_insert_before(&iqe->link, &qe->link);
+        else
+                list_append(&iqe->link, &iqueue->list);
 }
 

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

@@ -178 +178 @@
 
 /** Calculate the amount of trim needed to fit segment in receive window. */
-extern void seq_no_seg_trim_calc(tcp_conn_t *conn, tcp_segment_t *seg,
+void seq_no_seg_trim_calc(tcp_conn_t *conn, tcp_segment_t *seg,
     uint32_t *left, uint32_t *right)
 {
@@ -207 +207 @@
 }
 
+/** Segment order comparison.
+ *
+ * Compare sequence order of two acceptable segments.
+ *
+ * @param conn          Connection
+ * @param sa            Segment A
+ * @param sb            Segment B
+ *
+ * @return              -1, 0, 1, resp. if A < B, A == B, A > B in terms
+ *                      of sequence order of the beginning of the segment.
+ */
+int seq_no_seg_cmp(tcp_conn_t *conn, tcp_segment_t *sa, tcp_segment_t *sb)
+{
+        assert(seq_no_segment_acceptable(conn, sa));
+        assert(seq_no_segment_acceptable(conn, sb));
+
+        if (seq_no_lt_le(sa->seq, sb->seq, conn->rcv_nxt + conn->rcv_wnd))
+                return -1;
+
+        if (seq_no_lt_le(sb->seq, sa->seq, conn->rcv_nxt + conn->rcv_wnd))
+                return +1;
+
+        assert(sa->seq == sb->seq);
+        return 0;
+}
+
 /**
  * @}

uspace/srv/net/tl/tcp/seq_no.h

@@ -48 +48 @@
 extern void seq_no_seg_trim_calc(tcp_conn_t *, tcp_segment_t *, uint32_t *,
     uint32_t *);
+extern int seq_no_seg_cmp(tcp_conn_t *, tcp_segment_t *, tcp_segment_t *);
 
 extern uint32_t seq_no_control_len(tcp_control_t);