Changeset 153cc76a in mainline for uspace/srv/net/tl/tcp/tqueue.c

Timestamp:

2011-12-23T16:42:22Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7e1b130

Parents:

4291215 (diff), 2f0dd2a (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:

Mainline changes.

File:

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

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

@@ -188 +188 @@
                 /* We are sending out FIN */
                 ctrl = CTL_FIN;
-                tcp_conn_fin_sent(conn);
         } else {
                 ctrl = 0;
@@ -206 +205 @@
         if (send_fin)
                 conn->snd_buf_fin = false;
+
+        fibril_condvar_broadcast(&conn->snd_buf_cv);
+
+        if (send_fin)
+                tcp_conn_fin_sent(conn);
 
         tcp_tqueue_seg(conn, seg);
@@ -313 +317 @@
         log_msg(LVL_DEBUG, "### %s: retransmit_timeout_func(%p)", conn->name, conn);
 
+        fibril_mutex_lock(&conn->lock);
+
         if (conn->cstate == st_closed) {
                 log_msg(LVL_DEBUG, "Connection already closed.");
+                fibril_mutex_unlock(&conn->lock);
+                tcp_conn_delref(conn);
                 return;
         }
@@ -321 +329 @@
         if (link == NULL) {
                 log_msg(LVL_DEBUG, "Nothing to retransmit");
+                fibril_mutex_unlock(&conn->lock);
+                tcp_conn_delref(conn);
                 return;
         }
@@ -329 +339 @@
         if (rt_seg == NULL) {
                 log_msg(LVL_ERROR, "Memory allocation failed.");
+                fibril_mutex_unlock(&conn->lock);
+                tcp_conn_delref(conn);
                 /* XXX Handle properly */
                 return;
@@ -338 +350 @@
         /* Reset retransmission timer */
         tcp_tqueue_timer_set(tqe->conn);
+
+        fibril_mutex_unlock(&conn->lock);
+        tcp_conn_delref(conn);
 }
 
@@ -345 +360 @@
         log_msg(LVL_DEBUG, "### %s: tcp_tqueue_timer_set()", conn->name);
 
-        (void) retransmit_timeout_func;
+        /* Clear first to make sure we update refcnt correctly */
+        tcp_tqueue_timer_clear(conn);
+
+        tcp_conn_addref(conn);
         fibril_timer_set(conn->retransmit.timer, RETRANSMIT_TIMEOUT,
             retransmit_timeout_func, (void *) conn);
@@ -355 +373 @@
         log_msg(LVL_DEBUG, "### %s: tcp_tqueue_timer_clear()", conn->name);
 
-        fibril_timer_clear(conn->retransmit.timer);
+        if (fibril_timer_clear(conn->retransmit.timer) == fts_active)
+                tcp_conn_delref(conn);
 }