Changeset 7c912b6 in mainline for uspace/srv/net/tcp/sock.c

Timestamp:

2012-05-12T09:39:20Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0d67e16

Parents:

01a7aa1

Message:

Fix delivery of end-of-connection condition.

File:

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

uspace/srv/net/tcp/sock.c

@@ -652 +652 @@
         log_msg(LVL_DEBUG, "tcp_sock_recvfrom(): lock recv_buffer_lock");
         fibril_mutex_lock(&socket->recv_buffer_lock);
-        while (socket->recv_buffer_used == 0) {
+        while (socket->recv_buffer_used == 0 && socket->recv_error == TCP_EOK) {
                 log_msg(LVL_DEBUG, "wait for recv_buffer_cv + recv_buffer_used != 0");
                 fibril_condvar_wait(&socket->recv_buffer_cv,
@@ -850 +850 @@
                 if (trc != TCP_EOK) {
                         sock->recv_error = trc;
+                        fibril_condvar_broadcast(&sock->recv_buffer_cv);
                         fibril_mutex_unlock(&sock->recv_buffer_lock);
+                        tcp_sock_notify_data(sock->sock_core);
                         break;
                 }
@@ -857 +859 @@
 
                 sock->recv_buffer_used = data_len;
+                fibril_condvar_broadcast(&sock->recv_buffer_cv);
                 fibril_mutex_unlock(&sock->recv_buffer_lock);
-                fibril_condvar_broadcast(&sock->recv_buffer_cv);
                 tcp_sock_notify_data(sock->sock_core);
         }