Changeset 7cf7ded in mainline for uspace/srv/net/tl/tcp/tqueue.c

Timestamp:

2011-11-15T23:50:57Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4f3f6285

Parents:

8218b6b

Message:

TCP retransmission (WIP). Allow setting timer in timer handler.
Simulate packet drop. Fixes.

File:

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

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

@@ -36 +36 @@
 
 #include <adt/list.h>
+#include <errno.h>
+#include <fibril_synch.h>
 #include <byteorder.h>
 #include <io/log.h>
@@ -50 +52 @@
 #include "tcp_type.h"
 
-void tcp_tqueue_init(tcp_tqueue_t *tqueue, tcp_conn_t *conn)
+#define RETRANSMIT_TIMEOUT      (2*1000*1000)
+
+static void retransmit_timeout_func(void *arg);
+static void tcp_tqueue_timer_set(tcp_conn_t *conn);
+static void tcp_tqueue_timer_clear(tcp_conn_t *conn);
+
+int tcp_tqueue_init(tcp_tqueue_t *tqueue, tcp_conn_t *conn)
 {
         tqueue->conn = conn;
+        tqueue->timer = fibril_timer_create();
+        if (tqueue->timer == NULL)
+                return ENOMEM;
+
         list_initialize(&tqueue->list);
+
+        return EOK;
+}
+
+void tcp_tqueue_fini(tcp_tqueue_t *tqueue)
+{
+        if (tqueue->timer != NULL) {
+                fibril_timer_destroy(tqueue->timer);
+                tqueue->timer = NULL;
+        }
 }
 
@@ -92 +114 @@
                 }
 
+                tqe->conn = conn;
                 tqe->seg = rt_seg;
                 list_append(&tqe->link, &conn->retransmit.list);
-        }
-
+
+                /* Set retransmission timer */
+                tcp_tqueue_timer_set(conn);
+        }
+
+        tcp_prepare_transmit_segment(conn, seg);
+}
+
+void tcp_prepare_transmit_segment(tcp_conn_t *conn, tcp_segment_t *seg)
+{
         /*
          * Always send ACK once we have received SYN, except for RST segments.
@@ -105 +136 @@
 
         seg->seq = conn->snd_nxt;
-        seg->wnd = conn->rcv_wnd;
-
-        log_msg(LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
-            seg->seq, seg->wnd);
-
-        if ((seg->ctrl & CTL_ACK) != 0)
-                seg->ack = conn->rcv_nxt;
-        else
-                seg->ack = 0;
-
         conn->snd_nxt += seg->len;
 
@@ -204 +225 @@
                         tcp_segment_delete(tqe->seg);
                         free(tqe);
+
+                        /* Reset retransmission timer */
+                        tcp_tqueue_timer_set(conn);
                 }
 
                 cur = next;
         }
+
+        /* Clear retransmission timer if the queue is empty. */
+        if (list_empty(&conn->retransmit.list))
+                tcp_tqueue_timer_clear(conn);
 
         /* Possibly transmit more data */
@@ -213 +241 @@
 }
 
+void tcp_conn_transmit_segment(tcp_conn_t *conn, tcp_segment_t *seg)
+{
+        log_msg(LVL_DEBUG, "tcp_conn_transmit_segment(%p, %p)", conn, seg);
+
+        seg->wnd = conn->rcv_wnd;
+
+        if ((seg->ctrl & CTL_ACK) != 0)
+                seg->ack = conn->rcv_nxt;
+        else
+                seg->ack = 0;
+
+        tcp_transmit_segment(&conn->ident, seg);
+}
+
 void tcp_transmit_segment(tcp_sockpair_t *sp, tcp_segment_t *seg)
 {
         log_msg(LVL_DEBUG, "tcp_transmit_segment(%p, %p)", sp, seg);
+
+        log_msg(LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
+            seg->seq, seg->wnd);
 /*
         tcp_pdu_prepare(conn, seg, &data, &len);
         tcp_pdu_transmit(data, len);
 */
-        //tcp_rqueue_bounce_seg(sp, seg);
-        tcp_ncsim_bounce_seg(sp, seg);
+        tcp_rqueue_bounce_seg(sp, seg);
+//      tcp_ncsim_bounce_seg(sp, seg);
+}
+
+static void retransmit_timeout_func(void *arg)
+{
+        tcp_conn_t *conn = (tcp_conn_t *) arg;
+        tcp_tqueue_entry_t *tqe;
+        tcp_segment_t *rt_seg;
+        link_t *link;
+
+        log_msg(LVL_DEBUG, "### %s: retransmit_timeout_func(%p)", conn->name, conn);
+        link = list_first(&conn->retransmit.list);
+        if (link == NULL) {
+                log_msg(LVL_DEBUG, "Nothing to retransmit");
+                return;
+        }
+
+        tqe = list_get_instance(link, tcp_tqueue_entry_t, link);
+
+        rt_seg = tcp_segment_dup(tqe->seg);
+        if (rt_seg == NULL) {
+                log_msg(LVL_ERROR, "Memory allocation failed.");
+                /* XXX Handle properly */
+                return;
+        }
+
+        log_msg(LVL_DEBUG, "### %s: retransmitting segment", conn->name);
+        tcp_conn_transmit_segment(tqe->conn, rt_seg);
+
+        /* Reset retransmission timer */
+        tcp_tqueue_timer_set(tqe->conn);
+}
+
+/** Set or re-set retransmission timer */
+static void tcp_tqueue_timer_set(tcp_conn_t *conn)
+{
+        log_msg(LVL_DEBUG, "### %s: tcp_tqueue_timer_set()", conn->name);
+
+        (void) retransmit_timeout_func;
+        fibril_timer_set(conn->retransmit.timer, RETRANSMIT_TIMEOUT,
+            retransmit_timeout_func, (void *) conn);
+}
+
+/** Clear retransmission timer */
+static void tcp_tqueue_timer_clear(tcp_conn_t *conn)
+{
+        log_msg(LVL_DEBUG, "### %s: tcp_tqueue_timer_clear()", conn->name);
+
+        fibril_timer_clear(conn->retransmit.timer);
 }