Changeset 8499160 in mainline

Timestamp:

2015-06-06T16:23:27Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8dc9b72

Parents:

9362cc2

Message:

Call tcp_conn_remove() whenever we change to closed state. Not only close, but delete connections when client terminates.

Location:

uspace/srv/net/tcp

Files:

• conn.c (modified) (3 diffs)
• service.c (modified) (1 diff)
• ucall.c (modified) (1 diff)

uspace/srv/net/tcp/conn.c

@@ -322 +322 @@
         assert(old_state != st_closed);
         if (nstate == st_closed) {
+                tcp_conn_remove(conn);
                 /* Drop one reference for now being in closed state */
                 tcp_conn_delref(conn);
@@ -882 +883 @@
         if (conn->fin_is_acked) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: FIN acked -> Closed", conn->name);
-                tcp_conn_remove(conn);
                 tcp_conn_state_set(conn, st_closed);
                 return cp_done;
@@ -1283 +1283 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: TW Timeout -> Closed", conn->name);
-        tcp_conn_remove(conn);
         tcp_conn_state_set(conn, st_closed);
 

uspace/srv/net/tcp/service.c

@@ -875 +875 @@
                             tcp_cconn_t, lclient);
                         tcp_uc_close(cconn->conn);
+                        tcp_uc_delete(cconn->conn);
                         tcp_cconn_destroy(cconn);
                 }

uspace/srv/net/tcp/ucall.c

@@ -258 +258 @@
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_close - listen/syn_sent");
                 tcp_conn_reset(conn);
-                tcp_conn_remove(conn);
                 tcp_conn_unlock(conn);
                 return TCP_EOK;