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

Timestamp:

2010-12-25T17:14:36Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

092e4f1

Parents:

59e9398b (diff), 3ac66f69 (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 mainline changes.

File:

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

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

@@ -1803 +1803 @@
                         fibril_rwlock_write_unlock(socket_data->local_lock);
 
+                        socket_data->state = TCP_SOCKET_SYN_SENT;
+
                         /* Send the packet */
                         printf("connecting %d\n", packet_get_id(packet));
@@ -2085 +2087 @@
         if (!fibril) {
                 free(operation_timeout);
-                return EPARTY;  /* FIXME: use another EC */
-        }
+                return ENOMEM;
+        }
+
 //      fibril_mutex_lock(&socket_data->operation.mutex);
         /* Start the timeout fibril */