Changeset 6e88fea in mainline

Timestamp:

2011-10-24T05:28:31Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2a3214e

Parents:

6df418c4

Message:

Transition to CLOSED state.

Location:

uspace/srv/net/tl/tcp

Files:

• conn.c (modified) (4 diffs)
• conn.h (modified) (1 diff)
• test.c (modified) (1 diff)

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

@@ -120 +120 @@
 }
 
+/** Delist connection.
+ *
+ * Remove connection from the connection map.
+ */
+void tcp_conn_remove(tcp_conn_t *conn)
+{
+        list_remove(&conn->link);
+}
+
 /** Synchronize connection.
  *
@@ -150 +159 @@
                 break;
         case st_close_wait:
-                log_msg(LVL_DEBUG, "FIN sent -> Close-Wait");
+                log_msg(LVL_DEBUG, "FIN sent -> Last-Ack");
                 conn->cstate = st_last_ack;
                 break;
@@ -596 +605 @@
                 return cp_done;
 
-        /* TODO */
+        if (conn->fin_is_acked) {
+                log_msg(LVL_DEBUG, " FIN acked -> Closed");
+                tcp_conn_remove(conn);
+                conn->cstate = st_closed;
+                return cp_done;
+        }
+
         return cp_continue;
 }
@@ -762 +777 @@
         if (tcp_segment_text_size(seg) == 0 && (seg->ctrl & CTL_FIN) != 0) {
                 log_msg(LVL_DEBUG, " - FIN found in segment.");
+
+                /* Send ACK */
+                tcp_tqueue_ctrl_seg(conn, CTL_ACK);
 
                 conn->rcv_nxt++;

uspace/srv/net/tl/tcp/conn.h

@@ -40 +40 @@
 
 extern tcp_conn_t *tcp_conn_new(tcp_sock_t *, tcp_sock_t *);
-void tcp_conn_add(tcp_conn_t *);
+extern void tcp_conn_add(tcp_conn_t *);
+extern void tcp_conn_remove(tcp_conn_t *);
 extern void tcp_conn_sync(tcp_conn_t *);
 extern void tcp_conn_fin_sent(tcp_conn_t *);

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

@@ -73 +73 @@
         }
 
+        async_usleep(1000*1000);
+
+        printf("test_srv() close connection\n");
+        tcp_uc_close(conn);
+
         printf("test_srv() terminating\n");
 }