Changeset 98abd40 in mainline for uspace/srv/net/udp/assoc.c

Timestamp:

2013-07-06T21:57:22Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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 changes

File:

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

uspace/srv/net/udp/assoc.c

@@ -82 +82 @@
         if (lsock != NULL)
                 assoc->ident.local = *lsock;
+        
         if (fsock != NULL)
                 assoc->ident.foreign = *fsock;
@@ -251 +252 @@
                 sp.foreign = *fsock;
 
-        if (sp.foreign.addr.ipv4 == 0 || sp.foreign.port == 0)
+        if ((inet_addr_is_any(&sp.foreign.addr)) ||
+            (sp.foreign.port == UDP_PORT_ANY))
                 return EINVAL;
 
@@ -370 +372 @@
 static bool udp_socket_match(udp_sock_t *sock, udp_sock_t *patt)
 {
-        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)
+        if ((!inet_addr_is_any(&patt->addr)) &&
+            (!inet_addr_compare(&patt->addr, &sock->addr)))
                 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;
 }
@@ -414 +413 @@
 {
         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_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);
@@ -435 +431 @@
                 }
         }
-
+        
         fibril_mutex_unlock(&assoc_list_lock);
         return NULL;