Changes in uspace/srv/net/udp/assoc.c [695b6ff:451481c8] in mainline

File:

• uspace/srv/net/udp/assoc.c (modified) (8 diffs)

uspace/srv/net/udp/assoc.c

@@ -82 +82 @@
         if (lsock != NULL)
                 assoc->ident.local = *lsock;
-        
         if (fsock != NULL)
                 assoc->ident.foreign = *fsock;
@@ -186 +185 @@
 }
 
-/** Set IP link in association.
- *
- * @param assoc         Association
- * @param iplink        IP link
- */
-void udp_assoc_set_iplink(udp_assoc_t *assoc, service_id_t iplink)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_iplink(%p, %zu)",
-            assoc, iplink);
-        fibril_mutex_lock(&assoc->lock);
-        assoc->ident.iplink = iplink;
-        fibril_mutex_unlock(&assoc->lock);
-}
-
 /** Set foreign socket in association.
  *
@@ -266 +251 @@
                 sp.foreign = *fsock;
 
-        if ((inet_addr_is_any(&sp.foreign.addr)) ||
-            (sp.foreign.port == UDP_PORT_ANY))
+        if (sp.foreign.addr.ipv4 == 0 || sp.foreign.port == 0)
                 return EINVAL;
 
@@ -295 +279 @@
 
         fibril_mutex_lock(&assoc->lock);
-        while (list_empty(&assoc->rcv_queue) && !assoc->reset) {
+        while (list_empty(&assoc->rcv_queue)) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - waiting");
                 fibril_condvar_wait(&assoc->rcv_queue_cv, &assoc->lock);
-        }
-
-        if (assoc->reset) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - association was reset");
-                fibril_mutex_unlock(&assoc->lock);
-                return ECONNABORTED;
         }
 
@@ -345 +323 @@
 }
 
-/** Reset association.
- *
- * This causes any pendingreceive operations to return immediately with
- * UDP_ERESET.
- */
-void udp_assoc_reset(udp_assoc_t *assoc)
-{
-        fibril_mutex_lock(&assoc->lock);
-        assoc->reset = true;
-        fibril_condvar_broadcast(&assoc->rcv_queue_cv);
-        fibril_mutex_unlock(&assoc->lock);
-}
-
 static int udp_assoc_queue_msg(udp_assoc_t *assoc, udp_sockpair_t *sp,
     udp_msg_t *msg)
@@ -386 +351 @@
 static bool udp_socket_match(udp_sock_t *sock, udp_sock_t *patt)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG,
-            "udp_socket_match(sock=(%u), pat=(%u))", sock->port, patt->port);
-        
-        if ((!inet_addr_is_any(&patt->addr)) &&
-            (!inet_addr_compare(&patt->addr, &sock->addr)))
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_socket_match(sock=(%x,%u), pat=(%x,%u))",
+            sock->addr.ipv4, sock->port, patt->addr.ipv4, patt->port);
+
+        if (patt->addr.ipv4 != UDP_IPV4_ANY &&
+            patt->addr.ipv4 != sock->addr.ipv4)
                 return false;
-        
-        if ((patt->port != UDP_PORT_ANY) &&
-            (patt->port != sock->port))
+
+        if (patt->port != UDP_PORT_ANY &&
+            patt->port != sock->port)
                 return false;
-        
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, " -> match");
-        
+
         return true;
 }
@@ -430 +395 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_find_ref(%p)", sp);
-        
+
         fibril_mutex_lock(&assoc_list_lock);
-        
-        list_foreach(assoc_list, link, udp_assoc_t, assoc) {
+
+        list_foreach(assoc_list, link) {
+                udp_assoc_t *assoc = list_get_instance(link, udp_assoc_t, link);
                 udp_sockpair_t *asp = &assoc->ident;
-                
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "compare with assoc (f:(%x,%u), l:(%x,%u))",
+                    asp->foreign.addr.ipv4, asp->foreign.port,
+                    asp->local.addr.ipv4, asp->local.port);
+
                 /* Skip unbound associations */
                 if (asp->local.port == UDP_PORT_ANY)
                         continue;
-                
+
                 if (udp_sockpair_match(sp, asp)) {
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "Returning assoc %p", assoc);
@@ -447 +416 @@
                 }
         }
-        
+
         fibril_mutex_unlock(&assoc_list_lock);
         return NULL;