Changes in uspace/srv/net/ethip/atrans.c [69a93df7:5c2e8d0] in mainline

File:

• uspace/srv/net/ethip/atrans.c (modified) (5 diffs)

uspace/srv/net/ethip/atrans.c

@@ -49 +49 @@
 static FIBRIL_CONDVAR_INITIALIZE(atrans_cv);
 
-static ethip_atrans_t *atrans_find(iplink_srv_addr_t *ip_addr)
+static ethip_atrans_t *atrans_find(addr32_t ip_addr)
 {
-        list_foreach(atrans_list, link) {
-                ethip_atrans_t *atrans = list_get_instance(link,
-                    ethip_atrans_t, atrans_list);
-
-                if (atrans->ip_addr.ipv4 == ip_addr->ipv4)
+        list_foreach(atrans_list, atrans_list, ethip_atrans_t, atrans) {
+                if (atrans->ip_addr == ip_addr)
                         return atrans;
         }
@@ -62 +59 @@
 }
 
-int atrans_add(iplink_srv_addr_t *ip_addr, mac48_addr_t *mac_addr)
+int atrans_add(addr32_t ip_addr, addr48_t mac_addr)
 {
         ethip_atrans_t *atrans;
@@ -71 +68 @@
                 return ENOMEM;
 
-        atrans->ip_addr = *ip_addr;
-        atrans->mac_addr = *mac_addr;
+        atrans->ip_addr = ip_addr;
+        addr48(mac_addr, atrans->mac_addr);
 
         fibril_mutex_lock(&atrans_list_lock);
@@ -88 +85 @@
 }
 
-int atrans_remove(iplink_srv_addr_t *ip_addr)
+int atrans_remove(addr32_t ip_addr)
 {
         ethip_atrans_t *atrans;
@@ -106 +103 @@
 }
 
-int atrans_lookup(iplink_srv_addr_t *ip_addr, mac48_addr_t *mac_addr)
+static int atrans_lookup_locked(addr32_t ip_addr, addr48_t mac_addr)
 {
-        ethip_atrans_t *atrans;
+        ethip_atrans_t *atrans = atrans_find(ip_addr);
+        if (atrans == NULL)
+                return ENOENT;
 
-        fibril_mutex_lock(&atrans_list_lock);
-        atrans = atrans_find(ip_addr);
-        if (atrans == NULL) {
-                fibril_mutex_unlock(&atrans_list_lock);
-                return ENOENT;
-        }
-
-        fibril_mutex_unlock(&atrans_list_lock);
-        *mac_addr = atrans->mac_addr;
+        addr48(atrans->mac_addr, mac_addr);
         return EOK;
 }
 
-int atrans_wait_timeout(suseconds_t timeout)
+int atrans_lookup(addr32_t ip_addr, addr48_t mac_addr)
 {
         int rc;
 
         fibril_mutex_lock(&atrans_list_lock);
-        rc = fibril_condvar_wait_timeout(&atrans_cv, &atrans_list_lock,
-            timeout);
+        rc = atrans_lookup_locked(ip_addr, mac_addr);
         fibril_mutex_unlock(&atrans_list_lock);
+
+        return rc;
+}
+
+static void atrans_lookup_timeout_handler(void *arg)
+{
+        bool *timedout = (bool *)arg;
+
+        fibril_mutex_lock(&atrans_list_lock);
+        *timedout = true;
+        fibril_mutex_unlock(&atrans_list_lock);
+        fibril_condvar_broadcast(&atrans_cv);
+}
+
+int atrans_lookup_timeout(addr32_t ip_addr, suseconds_t timeout,
+    addr48_t mac_addr)
+{
+        fibril_timer_t *t;
+        bool timedout;
+        int rc;
+
+        t = fibril_timer_create(NULL);
+        if (t == NULL)
+                return ENOMEM;
+
+        timedout = false;
+        fibril_timer_set(t, timeout, atrans_lookup_timeout_handler, &timedout);
+
+        fibril_mutex_lock(&atrans_list_lock);
+
+        while ((rc = atrans_lookup_locked(ip_addr, mac_addr)) == ENOENT &&
+            !timedout) {
+                fibril_condvar_wait(&atrans_cv, &atrans_list_lock);
+        }
+
+        fibril_mutex_unlock(&atrans_list_lock);
+        (void) fibril_timer_clear(t);
+        fibril_timer_destroy(t);
 
         return rc;