Changeset 9094c0f in mainline for uspace/srv/net/tcp/sock.c

Timestamp:

2012-05-11T10:33:01Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

01a7aa1

Parents:

d786dea9

Message:

Fix recv[from]() with small user buffer.

File:

• uspace/srv/net/tcp/sock.c (modified) (1 diff)

uspace/srv/net/tcp/sock.c

@@ -728 +728 @@
         rc = async_data_read_finalize(rcallid, socket->recv_buffer, length);
 
-        socket->recv_buffer_used = 0;
+        socket->recv_buffer_used -= length;
+        log_msg(LVL_DEBUG, "tcp_sock_recvfrom: %zu left in buffer",
+            socket->recv_buffer_used);
+        if (socket->recv_buffer_used > 0) {
+                memmove(socket->recv_buffer, socket->recv_buffer + length,
+                    socket->recv_buffer_used);
+                tcp_sock_notify_data(socket->sock_core);
+        }
+
         fibril_condvar_broadcast(&socket->recv_buffer_cv);