Changeset df3c6f02 in mainline for uspace/lib/net/tl/socket_core.c

Timestamp:

2011-05-31T22:58:56Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d362410

Parents:

82582e4 (diff), 4ce90544 (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/lib/net/tl/socket_core.c (modified) (3 diffs)

uspace/lib/net/tl/socket_core.c

@@ -306 +306 @@
                 
         case AF_INET6:
-                /* TODO IPv6 */
+                // TODO IPv6
                 break;
         }
@@ -376 +376 @@
 
         count = 0;
-//      socket_id = socket_globals.last_id;
+#if 0
+        socket_id = socket_globals.last_id;
+#endif
         do {
                 if (count < SOCKET_ID_TRIES) {
@@ -388 +390 @@
                         if (socket_id < INT_MAX) {
                                 ++ socket_id;
-/*                      } else if(socket_globals.last_id) {
-*                               socket_globals.last_id = 0;
-*                               socket_id = 1;
-*/                      } else {
+#if 0
+                        } else if(socket_globals.last_id) {
+                                socket_globals.last_id = 0;
+                                socket_id = 1;
+#endif
+                        } else {
                                 return ELIMIT;
                         }