Changeset 95c675b in mainline for uspace/lib/nettl/src/amap.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• uspace/lib/nettl/src/amap.c (modified) (6 diffs)

uspace/lib/nettl/src/amap.c

@@ -59 +59 @@
 #include <stdlib.h>
 
+/** Convert association map flags to port range flags.
+ *
+ * @param flags Association map flags
+ * @return Port range flags
+ */
+static portrng_flags_t aflags_to_pflags(amap_flags_t flags)
+{
+        portrng_flags_t pflags;
+
+        pflags = 0;
+        if ((flags & af_allow_system) != 0)
+                pflags |= pf_allow_system;
+
+        return pflags;
+}
+
 /** Create association map.
  *
@@ -97 +113 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG2, "amap_destroy()");
+
+        assert(list_empty(&map->repla));
+        assert(list_empty(&map->laddr));
+        assert(list_empty(&map->llink));
         free(map);
 }
@@ -374 +394 @@
         mepp = *epp;
 
-        rc = portrng_alloc(repla->portrng, epp->local.port, arg, flags,
+        rc = portrng_alloc(repla->portrng, epp->local.port, arg, aflags_to_pflags(flags),
             &mepp.local.port);
         if (rc != EOK) {
@@ -418 +438 @@
         mepp = *epp;
 
-        rc = portrng_alloc(laddr->portrng, epp->local.port, arg, flags,
+        rc = portrng_alloc(laddr->portrng, epp->local.port, arg, aflags_to_pflags(flags),
             &mepp.local.port);
         if (rc != EOK) {
@@ -462 +482 @@
         mepp = *epp;
 
-        rc = portrng_alloc(llink->portrng, epp->local.port, arg, flags,
+        rc = portrng_alloc(llink->portrng, epp->local.port, arg, aflags_to_pflags(flags),
             &mepp.local.port);
         if (rc != EOK) {
@@ -494 +514 @@
         mepp = *epp;
 
-        rc = portrng_alloc(map->unspec, epp->local.port, arg, flags,
+        rc = portrng_alloc(map->unspec, epp->local.port, arg, aflags_to_pflags(flags),
             &mepp.local.port);
         if (rc != EOK) {