Changeset 6b0b508 in mainline

Timestamp:

2013-03-14T15:39:53Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

05bfce7

Parents:

22e80508

Message:

better workaround for #521

Location:

uspace

Files:

• lib/net/tl/socket_core.c (modified) (1 diff)
• srv/net/udp/sock.c (modified) (3 diffs)

uspace/lib/net/tl/socket_core.c

@@ -83 +83 @@
 {
         /* If bound */
-        
-        // FIXME:
-        // Temporary workaround for ticket #521
-        // (causes port leak)
-#if 0
         if (socket->port) {
                 /* Release the port */
                 socket_port_release(global_sockets, socket);
         }
-#endif
         
         dyn_fifo_destroy(&socket->accepted);

uspace/srv/net/udp/sock.c

@@ -289 +289 @@
             (udp_sockdata_t *) sock_core->specific_data;
         
-        if ((sock_core->port == 0) || (sock_core->port == -1)) {
+        if (sock_core->port <= 0) {
                 /* Implicitly bind socket to port */
                 int rc = socket_bind_free_port(&gsock, sock_core,
@@ -299 +299 @@
                 
                 assert(sock_core->port > 0);
+                
                 udp_error_t urc = udp_uc_set_local_port(socket->assoc,
                     sock_core->port);
@@ -307 +308 @@
                         goto out;
                 }
+                
+                last_used_port = sock_core->port;
         }