Changes in uspace/srv/net/tcp/tqueue.c [9520af7:7c15d6f] in mainline

File:

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

uspace/srv/net/tcp/tqueue.c

@@ -43 +43 @@
 #include <mem.h>
 #include <stdlib.h>
-
 #include "conn.h"
-#include "inet.h"
 #include "ncsim.h"
+#include "pdu.h"
 #include "rqueue.h"
 #include "segment.h"
 #include "seq_no.h"
 #include "tqueue.h"
+#include "tcp.h"
 #include "tcp_type.h"
 
 #define RETRANSMIT_TIMEOUT      (2*1000*1000)
 
-static void retransmit_timeout_func(void *);
-static void tcp_tqueue_timer_set(tcp_conn_t *);
-static void tcp_tqueue_timer_clear(tcp_conn_t *);
-static void tcp_tqueue_seg(tcp_conn_t *, tcp_segment_t *);
-static void tcp_conn_transmit_segment(tcp_conn_t *, tcp_segment_t *);
-static void tcp_prepare_transmit_segment(tcp_conn_t *, tcp_segment_t *);
-static void tcp_tqueue_send_immed(tcp_conn_t *, tcp_segment_t *);
-
-int tcp_tqueue_init(tcp_tqueue_t *tqueue, tcp_conn_t *conn,
-    tcp_tqueue_cb_t *cb)
+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(&conn->lock);
-        tqueue->cb = cb;
         if (tqueue->timer == NULL)
                 return ENOMEM;
@@ -84 +78 @@
 void tcp_tqueue_fini(tcp_tqueue_t *tqueue)
 {
-        link_t *link;
-        tcp_tqueue_entry_t *tqe;
-
         if (tqueue->timer != NULL) {
                 fibril_timer_destroy(tqueue->timer);
                 tqueue->timer = NULL;
         }
-
-        while (!list_empty(&tqueue->list)) {
-                link = list_first(&tqueue->list);
-                tqe = list_get_instance(link, tcp_tqueue_entry_t, link);
-                list_remove(link);
-
-                tcp_segment_delete(tqe->seg);
-                free(tqe);
-        }
 }
 
@@ -105 +87 @@
 {
         tcp_segment_t *seg;
-
-        assert(fibril_mutex_is_locked(&conn->lock));
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_tqueue_ctrl_seg(%p, %u)", conn, ctrl);
@@ -115 +95 @@
 }
 
-static void tcp_tqueue_seg(tcp_conn_t *conn, tcp_segment_t *seg)
+void tcp_tqueue_seg(tcp_conn_t *conn, tcp_segment_t *seg)
 {
         tcp_segment_t *rt_seg;
         tcp_tqueue_entry_t *tqe;
-
-        assert(fibril_mutex_is_locked(&conn->lock));
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_tqueue_seg(%p, %p)", conn->name, conn,
@@ -157 +135 @@
 }
 
-static void tcp_prepare_transmit_segment(tcp_conn_t *conn, tcp_segment_t *seg)
+void tcp_prepare_transmit_segment(tcp_conn_t *conn, tcp_segment_t *seg)
 {
         /*
@@ -289 +267 @@
 }
 
-static void tcp_conn_transmit_segment(tcp_conn_t *conn, tcp_segment_t *seg)
+void tcp_conn_transmit_segment(tcp_conn_t *conn, tcp_segment_t *seg)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_transmit_segment(%p, %p)",
@@ -301 +279 @@
                 seg->ack = 0;
 
-        tcp_tqueue_send_immed(conn, seg);
-}
-
-void tcp_tqueue_send_immed(tcp_conn_t *conn, tcp_segment_t *seg)
+        tcp_transmit_segment(&conn->ident, seg);
+}
+
+void tcp_transmit_segment(inet_ep2_t *epp, tcp_segment_t *seg)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG,
-            "tcp_tqueue_send_immed(l:(%u),f:(%u), %p)",
-            conn->ident.local.port, conn->ident.remote.port, seg);
+            "tcp_transmit_segment(l:(%u),f:(%u), %p)",
+            epp->local.port, epp->remote.port, seg);
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
@@ -314 +292 @@
 
         tcp_segment_dump(seg);
-
-        conn->retransmit.cb->transmit_seg(&conn->ident, seg);
+/*
+        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_pdu_t *pdu;
+
+        if (tcp_pdu_encode(epp, seg, &pdu) != EOK) {
+                log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped.");
+                return;
+        }
+
+        tcp_transmit_pdu(pdu);
+        tcp_pdu_delete(pdu);
 }
 
@@ -370 +362 @@
 static void tcp_tqueue_timer_set(tcp_conn_t *conn)
 {
-        assert(fibril_mutex_is_locked(&conn->lock));
-
         log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_set() begin", conn->name);
 
@@ -387 +377 @@
 static void tcp_tqueue_timer_clear(tcp_conn_t *conn)
 {
-        assert(fibril_mutex_is_locked(&conn->lock));
-
         log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: tcp_tqueue_timer_clear() begin", conn->name);