Changeset 1ede059 in mainline

Timestamp:

2015-06-06T15:06:20Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c15d6f

Parents:

2c4bb828

Message:

Give portrng a chance to actually allocate the port.

Location:

uspace/lib/nettl/src

Files:

• amap.c (modified) (1 diff)
• portrng.c (modified) (1 diff)

uspace/lib/nettl/src/amap.c

@@ -394 +394 @@
         }
 
-        /** Allocate local port? */
-        if (mepp.local.port == inet_port_any) {
-                mepp.local.port = inet_port_dyn_lo; /* XXX */
-                log_msg(LOG_DEFAULT, LVL_NOTE, "amap_insert: allocated local "
-                    "port %" PRIu16, mepp.local.port);
-        } else {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "amap_insert: local "
-                    "port %" PRIu16 " specified", mepp.local.port);
-        }
-
         raddr = !inet_addr_is_any(&mepp.remote.addr);
         rport = mepp.remote.port != inet_port_any;

uspace/lib/nettl/src/portrng.c

@@ -102 +102 @@
                 log_msg(LOG_DEFAULT, LVL_NOTE, "selected %" PRIu16, pnum);
         } else {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "user asked for %" PRIu16, pnum);
+
                 if ((flags & pf_allow_system) == 0 &&
                     pnum < inet_port_user_lo) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "system port not allowed");
                         return EINVAL;
                 }
 
                 list_foreach(pr->used, lprng, portrng_port_t, port) {
-                        if (port->pn == pnum)
+                        if (port->pn == pnum) {
+                                log_msg(LOG_DEFAULT, LVL_NOTE, "port already used");
                                 return EEXISTS;
+                        }
                 }
         }