Changeset d9e14fa4 in mainline

Timestamp:

2011-12-09T16:06:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

03be171

Parents:

0ac2158

Message:

Implement RST processing.

Location:

uspace/srv/net/tl/tcp

Files:

• conn.c (modified) (4 diffs)
• sock.c (modified) (2 diffs)
• tcp_type.h (modified) (3 diffs)
• ucall.c (modified) (3 diffs)

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

@@ -117 +117 @@
 
         conn->cstate = st_listen;
+        conn->reset = false;
+        conn->ap = ap_passive;
         conn->fin_is_acked = false;
         conn->ident.local = *lsock;
@@ -176 +178 @@
         conn->snd_nxt = conn->iss;
         conn->snd_una = conn->iss;
+        conn->ap = ap_active;
 
         tcp_tqueue_ctrl_seg(conn, CTL_SYN);
@@ -278 +281 @@
         log_msg(LVL_DEBUG, "%s: tcp_conn_reset()", conn->name);
         tcp_conn_state_set(conn, st_closed);
+        conn->reset = true;
+
         tcp_conn_tw_timer_clear(conn);
         tcp_tqueue_clear(&conn->retransmit);
+
+        fibril_condvar_broadcast(&conn->rcv_buf_cv);
+}
+
+/** Signal to the user that connection has been reset.
+ *
+ * Send an out-of-band signal to the user.
+ */
+static void tcp_reset_signal(tcp_conn_t *conn)
+{
+        /* TODO */
+        log_msg(LVL_DEBUG, "%s: tcp_reset_signal()", conn->name);
 }
 
@@ -485 +502 @@
 static cproc_t tcp_conn_seg_proc_rst(tcp_conn_t *conn, tcp_segment_t *seg)
 {
-        /* TODO */
-        return cp_continue;
+        switch (conn->cstate) {
+        case st_syn_received:
+                /* XXX In case of passive open, revert to Listen state */
+                if (conn->ap == ap_passive) {
+                        tcp_conn_state_set(conn, st_listen);
+                        /* XXX Revert conn->ident */
+                        tcp_conn_tw_timer_clear(conn);
+                        tcp_tqueue_clear(&conn->retransmit);
+                } else {
+                        tcp_conn_reset(conn);
+                }
+                break;
+        case st_established:
+        case st_fin_wait_1:
+        case st_fin_wait_2:
+        case st_close_wait:
+                /* General "connection reset" signal */
+                tcp_reset_signal(conn);
+                tcp_conn_reset(conn);
+                break;
+        case st_closing:
+        case st_last_ack:
+        case st_time_wait:
+                tcp_conn_reset(conn);
+                break;
+        case st_listen:
+        case st_syn_sent:
+        case st_closed:
+                assert(false);
+        }
+
+        return cp_done;
 }
 

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

@@ -451 +451 @@
                         rc = ENOTCONN;
                         break;
+                case TCP_ERESET:
+                        rc = ECONNABORTED;
+                        break;
                 default:
                         assert(false);
@@ -520 +523 @@
                 rc = ENOTCONN;
                 break;
+        case TCP_ERESET:
+                rc = ECONNABORTED;
+                break;
         default:
                 assert(false);

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

@@ -147 +147 @@
 } tcp_tqueue_t;
 
+typedef enum {
+        ap_active,
+        ap_passive
+} acpass_t;
+
 typedef struct tcp_conn {
         char *name;
@@ -154 +159 @@
         tcp_sockpair_t ident;
 
+        /** Active or passive connection */
+        acpass_t ap;
+
         /** Connection state */
         tcp_cstate_t cstate;
+        /** True if connection was reset */
+        bool reset;
         /** Protects @c cstate */
         fibril_mutex_t cstate_lock;
@@ -245 +255 @@
 } tcp_segment_t;
 
-typedef enum {
-        ap_active,
-        ap_passive
-} acpass_t;
 
 typedef struct {

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

@@ -126 +126 @@
         while (size > 0) {
                 buf_free = conn->snd_buf_size - conn->snd_buf_used;
-                while (buf_free == 0)
+                while (buf_free == 0 && !conn->reset)
                         tcp_tqueue_new_data(conn);
+
+                if (conn->reset)
+                        return TCP_ERESET;
 
                 xfer_size = min(size, buf_free);
@@ -157 +160 @@
 
         /* Wait for data to become available */
-        while (conn->rcv_buf_used == 0 && !conn->rcv_buf_fin) {
+        while (conn->rcv_buf_used == 0 && !conn->rcv_buf_fin && !conn->reset) {
                 log_msg(LVL_DEBUG, "tcp_uc_receive() - wait for data");
                 fibril_condvar_wait(&conn->rcv_buf_cv, &conn->rcv_buf_lock);
@@ -165 +168 @@
                 fibril_mutex_unlock(&conn->rcv_buf_lock);
 
-                /* End of data, peer closed connection. */
-                assert(conn->rcv_buf_fin);
                 *rcvd = 0;
                 *xflags = 0;
-                return TCP_ECLOSING;
+
+                if (conn->rcv_buf_fin) {
+                        /* End of data, peer closed connection */
+                        return TCP_ECLOSING;
+                } else {
+                        /* Connection was reset */
+                        assert(conn->reset);
+                        return TCP_ERESET;
+                }
         }