Changeset d9e14fa4 in mainline for uspace/srv/net/tl/tcp/ucall.c

Timestamp:

2011-12-09T16:06:28Z (12 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.

File:

• uspace/srv/net/tl/tcp/ucall.c (modified) (3 diffs)

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;
+                }
         }