Changeset 3e2291a9 in mainline for uspace/srv/net/tcp/conn.c

Timestamp:

2017-09-17T23:37:43Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

797dc79e

Parents:

6969eea3

Message:

TCP tests for ucall module and some more for conn module. Implement tcp_uc_abort(). Fix tcp_uc_open() leaking connection of connecting failed. Fix missing transition Closing → Time-Wait. Fix wrong SEG.ACK in response to FIN.

File:

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

uspace/srv/net/tcp/conn.c

@@ -100 +100 @@
 void tcp_conns_fini(void)
 {
+        assert(list_empty(&conn_list));
+
         amap_destroy(amap);
         amap = NULL;
-
-        assert(list_empty(&conn_list));
 }
 
@@ -458 +458 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_reset()", conn->name);
+
+        if (conn->cstate == st_closed)
+                return;
+
         conn->reset = true;
         tcp_conn_state_set(conn, st_closed);
@@ -910 +914 @@
                 return cp_done;
 
-        /* TODO */
+        if (conn->fin_is_acked) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN acked -> Time-Wait",
+                    conn->name);
+                tcp_conn_state_set(conn, st_time_wait);
+        }
+
         return cp_continue;
 }
@@ -1107 +1116 @@
                 log_msg(LOG_DEFAULT, LVL_DEBUG, " - FIN found in segment.");
 
+                conn->rcv_nxt++;
+                conn->rcv_wnd--;
+
                 /* Send ACK */
                 tcp_tqueue_ctrl_seg(conn, CTL_ACK);
-
-                conn->rcv_nxt++;
-                conn->rcv_wnd--;
 
                 /* Change connection state */