Changeset 6df418c4 in mainline for uspace/srv/net/tl/tcp/tqueue.c

Timestamp:

2011-10-24T04:23:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6e88fea

Parents:

f343a16

Message:

Retransmission queue, detect ACK of FIN.

File:

• uspace/srv/net/tl/tcp/tqueue.c (modified) (3 diffs)

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

@@ -35 +35 @@
  */
 
+#include <adt/list.h>
 #include <byteorder.h>
 #include <io/log.h>
 #include <macros.h>
 #include <mem.h>
+#include <stdlib.h>
 #include "conn.h"
 #include "header.h"
 #include "rqueue.h"
 #include "segment.h"
+#include "seq_no.h"
 #include "tqueue.h"
 #include "tcp_type.h"
 
+void tcp_tqueue_init(tcp_tqueue_t *tqueue, tcp_conn_t *conn)
+{
+        tqueue->conn = conn;
+        list_initialize(&tqueue->list);
+}
+
 void tcp_tqueue_ctrl_seg(tcp_conn_t *conn, tcp_control_t ctrl)
 {
@@ -58 +67 @@
 void tcp_tqueue_seg(tcp_conn_t *conn, tcp_segment_t *seg)
 {
+        tcp_segment_t *rt_seg;
+        tcp_tqueue_entry_t *tqe;
+
         log_msg(LVL_DEBUG, "tcp_tqueue_seg(%p, %p)", conn, seg);
-        /* XXX queue */
+
+        /*
+         * Add segment to retransmission queue
+         */
+
+        if (seg->len > 0) {
+                rt_seg = tcp_segment_dup(seg);
+                if (rt_seg == NULL) {
+                        log_msg(LVL_ERROR, "Memory allocation failed.");
+                        /* XXX Handle properly */
+                        return;
+                }
+
+                tqe = calloc(1, sizeof(tcp_tqueue_entry_t));
+                if (tqe == NULL) {
+                        log_msg(LVL_ERROR, "Memory allocation failed.");
+                        /* XXX Handle properly */
+                        return;
+                }
+
+                tqe->seg = rt_seg;
+                list_append(&tqe->link, &conn->retransmit.list);
+        }
 
         /*
@@ -146 +180 @@
 void tcp_tqueue_ack_received(tcp_conn_t *conn)
 {
-        (void) conn;
-
+        link_t *cur, *next;
+
+        log_msg(LVL_DEBUG, "tcp_tqueue_ack_received(%p)", conn);
+
+        cur = conn->retransmit.list.head.next;
+
+        while (cur != &conn->retransmit.list.head) {
+                next = cur->next;
+
+                tcp_tqueue_entry_t *tqe = list_get_instance(cur,
+                    tcp_tqueue_entry_t, link);
+
+                if (seq_no_segment_acked(conn, tqe->seg, conn->snd_una)) {
+                        /* Remove acknowledged segment */
+                        list_remove(cur);
+
+                        if ((tqe->seg->ctrl & CTL_FIN) != 0) {
+                                /* Our FIN has been acked */
+                                conn->fin_is_acked = true;
+                        }
+
+                        tcp_segment_delete(tqe->seg);
+                        free(tqe);
+                }
+
+                cur = next;
+        }
+
+        /* Possibly transmit more data */
         tcp_tqueue_new_data(conn);
 }