Changeset 097967b in mainline

Timestamp:

2010-12-28T12:00:46Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c41834a, eaef141

Parents:

e64e40b (diff), 86f6121 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge more TCP fixes.

Location:

uspace

Files:

• lib/c/generic/net/socket_client.c (modified) (1 diff)
• srv/net/tl/tcp/tcp.c (modified) (2 diffs)

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

@@ -1023 +1023 @@
         if (fragments == 0) {
                 /* No more data, other side has closed the connection. */
+                fibril_mutex_unlock(&socket->receive_lock);
+                fibril_rwlock_read_unlock(&socket_globals.lock);
                 return 0;
         }

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

@@ -769 +769 @@
         }
 
-        if (header->finalize)
-                socket_data->next_incoming += 1;
-
         /* If next in sequence is an incoming FIN */
         if (socket_data->next_incoming == socket_data->fin_incoming) {
@@ -2247 +2244 @@
 
                 tcp_prepare_operation_header(socket, socket_data, header, 0, 0);
-                rc = tcp_queue_packet(socket, socket_data, packet, 0);
+                rc = tcp_queue_packet(socket, socket_data, packet, total_length);
                 if (rc != EOK)
                         return rc;