Changeset d493830e in mainline for uspace/lib/c/generic/net/socket_client.c

Timestamp:

2010-12-27T19:16:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

727f04f

Parents:

58fe0aa

Message:

Fix incoming TCP FIN handling. Signal end of data on the socket. Do not ACK if no new data arrived.

File:

• uspace/lib/c/generic/net/socket_client.c (modified) (3 diffs)

uspace/lib/c/generic/net/socket_client.c

@@ -1006 +1006 @@
         // wait for a received packet
         ++socket->blocked;
-        while ((result = dyn_fifo_value(&socket->received)) <= 0) {
+        while ((result = dyn_fifo_value(&socket->received)) < 0) {
                 fibril_rwlock_read_unlock(&socket_globals.lock);
                 fibril_condvar_wait(&socket->receive_signal,
@@ -1018 +1018 @@
         --socket->blocked;
         fragments = (size_t) result;
+
+        if (fragments == 0) {
+                /* No more data, other side has closed the connection. */
+                return 0;
+        }
 
         // prepare lengths if more fragments
@@ -1057 +1062 @@
 
                 free(lengths);
-        } else {
+        } else { /* fragments == 1 */
                 // request packet data
                 message_id = async_send_4(socket->phone, message,