Changeset 704586fb in mainline

Timestamp:

2011-12-01T19:28:49Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3aa2642a

Parents:

26ec91c

Message:

Fix RST to refuse connection and handle it properly in connect().

Location:

uspace/srv/net/tl/tcp

Files:

• conn.c (modified) (7 diffs)
• sock.c (modified) (2 diffs)
• tqueue.c (modified) (3 diffs)
• tqueue.h (modified) (1 diff)
• ucall.c (modified) (2 diffs)

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

@@ -59 +59 @@
 static void tcp_conn_seg_process(tcp_conn_t *conn, tcp_segment_t *seg);
 static void tcp_conn_tw_timer_set(tcp_conn_t *conn);
+static void tcp_conn_tw_timer_clear(tcp_conn_t *conn);
 
 /** Create new segment structure.
@@ -255 +256 @@
         list_foreach(conn_list, link) {
                 tcp_conn_t *conn = list_get_instance(link, tcp_conn_t, link);
-                if (tcp_sockpair_match(sp, &conn->ident)) {
+                tcp_sockpair_t *csp = &conn->ident;
+                log_msg(LVL_DEBUG, "compare with conn (f:(%x,%u), l:(%x,%u))",
+                    csp->foreign.addr.ipv4, csp->foreign.port,
+                    csp->local.addr.ipv4, csp->local.port);
+                if (tcp_sockpair_match(sp, csp)) {
                         return conn;
                 }
@@ -261 +266 @@
 
         return NULL;
+}
+
+/** Reset connection.
+ *
+ * @param conn  Connection
+ */
+static void tcp_conn_reset(tcp_conn_t *conn)
+{
+        log_msg(LVL_DEBUG, "%s: tcp_conn_reset()", conn->name);
+        tcp_conn_state_set(conn, st_closed);
+        tcp_conn_tw_timer_clear(conn);
+        tcp_tqueue_clear(&conn->retransmit);
 }
 
@@ -370 +387 @@
                 log_msg(LVL_DEBUG, "%s: Connection reset. -> Closed",
                     conn->name);
-                /* XXX Signal user error */
-                tcp_conn_state_set(conn, st_closed);
+                /* Reset connection */
+                tcp_conn_reset(conn);
                 /* XXX delete connection */
                 return;
@@ -1003 +1020 @@
 
         log_msg(LVL_DEBUG, "tw_timeout_func(%p)", conn);
+
+        if (conn->cstate == st_closed) {
+                log_msg(LVL_DEBUG, "Connection already closed.");
+                return;
+        }
+
         log_msg(LVL_DEBUG, "%s: TW Timeout -> Closed", conn->name);
-
         tcp_conn_remove(conn);
         tcp_conn_state_set(conn, st_closed);
@@ -1019 +1041 @@
 }
 
+/** Clear the Time-Wait timeout.
+ *
+ * @param conn          Connection
+ */
+void tcp_conn_tw_timer_clear(tcp_conn_t *conn)
+{
+        fibril_timer_clear(conn->tw_timer);
+}
+
 /** Trim segment to the receive window.
  *
@@ -1067 +1098 @@
 void tcp_reply_rst(tcp_sockpair_t *sp, tcp_segment_t *seg)
 {
-        tcp_sockpair_t rsp;
         tcp_segment_t *rseg;
 
         log_msg(LVL_DEBUG, "tcp_reply_rst(%p, %p)", sp, seg);
 
-        tcp_sockpair_flipped(sp, &rsp);
         rseg = tcp_segment_make_rst(seg);
-        tcp_transmit_segment(&rsp, rseg);
+        tcp_transmit_segment(sp, rseg);
 }
 

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

@@ -248 +248 @@
 
         trc = tcp_uc_open(lport, &fsocket, ap_active, &socket->conn);
-        socket->conn->name = (char *)"C";
+
+        if (socket->conn != NULL)
+                socket->conn->name = (char *)"C";
 
         switch (trc) {
@@ -307 +309 @@
 
         trc = tcp_uc_open(sock_core->port, &fsocket, ap_passive, &conn);
-        conn->name = (char *)"S";
+        if (conn != NULL)
+                conn->name = (char *)"S";
 
         log_msg(LVL_DEBUG, " - decode TCP return code");

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

@@ -71 +71 @@
 }
 
+void tcp_tqueue_clear(tcp_tqueue_t *tqueue)
+{
+        tcp_tqueue_timer_clear(tqueue->conn);
+}
+
 void tcp_tqueue_fini(tcp_tqueue_t *tqueue)
 {
@@ -267 +272 @@
 void tcp_transmit_segment(tcp_sockpair_t *sp, tcp_segment_t *seg)
 {
-        log_msg(LVL_DEBUG, "tcp_transmit_segment(%p, %p)", sp, seg);
+        log_msg(LVL_DEBUG, "tcp_transmit_segment(f:(%x,%u),l:(%x,%u), %p)",
+            sp->foreign.addr.ipv4, sp->foreign.port,
+            sp->local.addr.ipv4, sp->local.port, seg);
 
         log_msg(LVL_DEBUG, "SEG.SEQ=%" PRIu32 ", SEG.WND=%" PRIu32,
@@ -299 +306 @@
 
         log_msg(LVL_DEBUG, "### %s: retransmit_timeout_func(%p)", conn->name, conn);
+
+        if (conn->cstate == st_closed) {
+                log_msg(LVL_DEBUG, "Connection already closed.");
+                return;
+        }
+
         link = list_first(&conn->retransmit.list);
         if (link == NULL) {

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

@@ -40 +40 @@
 
 extern int tcp_tqueue_init(tcp_tqueue_t *, tcp_conn_t *);
+extern void tcp_tqueue_clear(tcp_tqueue_t *);
 extern void tcp_tqueue_fini(tcp_tqueue_t *);
 extern void tcp_tqueue_ctrl_seg(tcp_conn_t *, tcp_control_t);

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

@@ -91 +91 @@
 
         if (nconn->cstate != st_established) {
-                fibril_mutex_unlock(&nconn->cstate_lock);
-
                 log_msg(LVL_DEBUG, "tcp_uc_open: Connection was reset.");
                 assert(nconn->cstate == st_closed);
@@ -238 +236 @@
         tcp_conn_t *conn;
 
-        log_msg(LVL_DEBUG, "tcp_as_segment_arrived()");
+        log_msg(LVL_DEBUG, "tcp_as_segment_arrived(f:(%x,%u), l:(%x,%u))",
+            sp->foreign.addr.ipv4, sp->foreign.port,
+            sp->local.addr.ipv4, sp->local.port);
 
         conn = tcp_conn_find(sp);