Changeset 8d48c7e in mainline for uspace/lib

Timestamp:

2015-06-02T16:00:42Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2c4bb828

Parents:

ab6326bc

Message:

Find the association to deliver the datagram using amap.

Location:

uspace/lib

Files:

• c/generic/inet.c (modified) (1 diff)
• c/generic/iplink.c (modified) (3 diffs)
• c/include/inet/iplink.h (modified) (3 diffs)
• nettl/include/nettl/amap.h (modified) (1 diff)
• nettl/include/nettl/portrng.h (modified) (2 diffs)
• nettl/src/amap.c (modified) (1 diff)
• nettl/src/portrng.c (modified) (2 diffs)

uspace/lib/c/generic/inet.c

@@ -177 +177 @@
         
         dgram.tos = IPC_GET_ARG1(*icall);
+        dgram.iplink = IPC_GET_ARG2(*icall);
         
         ipc_callid_t callid;

uspace/lib/c/generic/iplink.c

@@ -47 +47 @@
 static void iplink_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 
-int iplink_open(async_sess_t *sess, iplink_ev_ops_t *ev_ops,
+int iplink_open(async_sess_t *sess, iplink_ev_ops_t *ev_ops, void *arg,
     iplink_t **riplink)
 {
@@ -56 +56 @@
         iplink->sess = sess;
         iplink->ev_ops = ev_ops;
+        iplink->arg = arg;
         
         async_exch_t *exch = async_exchange_begin(sess);
@@ -234 +235 @@
         
         return (int) retval;
+}
+
+void *iplink_get_userptr(iplink_t *iplink)
+{
+        return iplink->arg;
 }
 

uspace/lib/c/include/inet/iplink.h

@@ -44 +44 @@
         async_sess_t *sess;
         struct iplink_ev_ops *ev_ops;
+        void *arg;
 } iplink_t;
 
@@ -81 +82 @@
 } iplink_ev_ops_t;
 
-extern int iplink_open(async_sess_t *, iplink_ev_ops_t *, iplink_t **);
+extern int iplink_open(async_sess_t *, iplink_ev_ops_t *, void *, iplink_t **);
 extern void iplink_close(iplink_t *);
 extern int iplink_send(iplink_t *, iplink_sdu_t *);
@@ -90 +91 @@
 extern int iplink_get_mac48(iplink_t *, addr48_t *);
 extern int iplink_set_mac48(iplink_t *, addr48_t);
+extern void *iplink_get_userptr(iplink_t *);
 
 #endif

uspace/lib/nettl/include/nettl/amap.h

@@ -96 +96 @@
     inet_ep2_t *);
 extern void amap_remove(amap_t *, inet_ep2_t *);
-extern int amap_find(amap_t *, inet_ep2_t *, void **);
+extern int amap_find_match(amap_t *, inet_ep2_t *, void **);
 
 #endif

uspace/lib/nettl/include/nettl/portrng.h

@@ -46 +46 @@
         /** Port number */
         uint16_t pn;
+        /** User argument */
+        void *arg;
 } portrng_port_t;
 
@@ -60 +62 @@
 extern int portrng_alloc(portrng_t *, uint16_t, void *,
     portrng_flags_t, uint16_t *);
+extern int portrng_find_port(portrng_t *, uint16_t, void **);
 extern void portrng_free_port(portrng_t *, uint16_t);
 extern bool portrng_empty(portrng_t *);

uspace/lib/nettl/src/amap.c

@@ -510 +510 @@
 }
 
-int amap_find(amap_t *map, inet_ep2_t *epp, void **rarg)
-{
-        log_msg(LOG_DEFAULT, LVL_NOTE, "amap_find()");
-        return EOK;
+/** Find association matching an endpoint pair.
+ *
+ * Used to find which association to deliver a datagram to.
+ *
+ * @param map   Association map
+ * @param epp   Endpoint pair
+ * @param rarg  Place to store user argument for the matching association.
+ *
+ * @return      EOK on success, ENOENT if not found.
+ */
+int amap_find_match(amap_t *map, inet_ep2_t *epp, void **rarg)
+{
+        int rc;
+        amap_repla_t *repla;
+        amap_laddr_t *laddr;
+        amap_llink_t *llink;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "amap_find_match(llink=%zu)",
+            epp->local_link);
+
+        /* Remode endpoint, local address */
+        rc = amap_repla_find(map, &epp->remote, &epp->local.addr, &repla);
+        if (rc == EOK) {
+                rc = portrng_find_port(repla->portrng, epp->local.port,
+                    rarg);
+                if (rc == EOK) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "Matched repla / "
+                            "port %" PRIu16, epp->local.port);
+                        return EOK;
+                }
+        }
+
+        /* Local address */
+        rc = amap_laddr_find(map, &epp->local.addr, &laddr);
+        if (rc == EOK) {
+                rc = portrng_find_port(laddr->portrng, epp->local.port,
+                    rarg);
+                if (rc == EOK) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "Matched laddr / "
+                            "port %" PRIu16, epp->local.port);
+                        return EOK;
+                }
+        }
+
+        /* Local link */
+        rc = amap_llink_find(map, epp->local_link, &llink);
+        if (epp->local_link != 0 && rc == EOK) {
+                rc = portrng_find_port(llink->portrng, epp->local.port,
+                    rarg);
+                if (rc == EOK) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "Matched llink / "
+                            "port %" PRIu16, epp->local.port);
+                        return EOK;
+                }
+        }
+
+        /* Unspecified */
+        rc = portrng_find_port(map->unspec, epp->local.port, rarg);
+        if (rc == EOK) {
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Matched unspec / port %" PRIu16,
+                    epp->local.port);
+                return EOK;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "No match.");
+        return ENOENT;
 }
 

uspace/lib/nettl/src/portrng.c

@@ -118 +118 @@
 
         p->pn = pnum;
+        p->arg = arg;
         list_append(&p->lprng, &pr->used);
         *apnum = pnum;
@@ -123 +124 @@
             pnum);
         return EOK;
+}
+
+int portrng_find_port(portrng_t *pr, uint16_t pnum, void **rarg)
+{
+        list_foreach(pr->used, lprng, portrng_port_t, port) {
+                if (port->pn == pnum) {
+                        *rarg = port->arg;
+                        return EOK;
+                }
+        }
+
+        return ENOENT;
 }