Changeset 048cd69 in mainline for uspace/srv/net/tcp/tqueue.c

Timestamp:

2015-06-07T15:41:04Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

204ba47

Parents:

4d11204 (diff), c3f7d37 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge network transport layer API rewrite.

File:

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

uspace/srv/net/tcp/tqueue.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -282 +282 @@
 }
 
-void tcp_transmit_segment(tcp_sockpair_t *sp, tcp_segment_t *seg)
+void tcp_transmit_segment(inet_ep2_t *epp, tcp_segment_t *seg)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG,
-            "tcp_transmit_segment(f:(%u),l:(%u), %p)",
-            sp->local.port, sp->foreign.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,
             seg->seq, seg->wnd);
@@ -301 +301 @@
         tcp_pdu_t *pdu;
 
-        if (tcp_pdu_encode(sp, seg, &pdu) != EOK) {
+        if (tcp_pdu_encode(epp, seg, &pdu) != EOK) {
                 log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. Segment dropped.");
                 return;
@@ -351 +351 @@
 
         /* Reset retransmission timer */
-        tcp_tqueue_timer_set(tqe->conn);
+        fibril_timer_set_locked(conn->retransmit.timer, RETRANSMIT_TIMEOUT,
+            retransmit_timeout_func, (void *) conn);
 
         tcp_conn_unlock(conn);
-        tcp_conn_delref(conn);
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "### %s: retransmit_timeout_func(%p) end", conn->name, conn);