Changeset 30c5d13 in mainline

Timestamp:

2013-07-16T17:27:42Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9ae6fc7

Parents:

1f97352

Message:

restore accidentally removed iaf_addr lookup functionality

Location:

uspace

Files:

• lib/c/generic/inet/addr.c (modified) (1 diff)
• lib/c/include/inet/addr.h (modified) (1 diff)
• srv/net/inetsrv/addrobj.c (modified) (1 diff)

uspace/lib/c/generic/inet/addr.c

@@ -260 +260 @@
 }
 
+int inet_naddr_compare(const inet_naddr_t *naddr, const inet_addr_t *addr)
+{
+        if (naddr->family != addr->family)
+                return 0;
+        
+        switch (naddr->family) {
+        case AF_INET:
+                return (naddr->addr == addr->addr);
+        case AF_INET6:
+                return addr128_compare(naddr->addr6, addr->addr6);
+        default:
+                return 0;
+        }
+}
+
 int inet_naddr_compare_mask(const inet_naddr_t *naddr, const inet_addr_t *addr)
 {

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

@@ -97 +97 @@
 extern int inet_addr_is_any(const inet_addr_t *);
 
+extern int inet_naddr_compare(const inet_naddr_t *, const inet_addr_t *);
 extern int inet_naddr_compare_mask(const inet_naddr_t *, const inet_addr_t *);
 

uspace/srv/net/inetsrv/addrobj.c

@@ -119 +119 @@
                     inet_addrobj_t, addr_list);
                 
-                if (inet_naddr_compare_mask(&naddr->naddr, addr)) {
-                        fibril_mutex_unlock(&addr_list_lock);
-                        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p",
-                            naddr);
-                        return naddr;
+                switch (find) {
+                case iaf_net:
+                        if (inet_naddr_compare_mask(&naddr->naddr, addr)) {
+                                fibril_mutex_unlock(&addr_list_lock);
+                                log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p",
+                                    naddr);
+                                return naddr;
+                        }
+                        break;
+                case iaf_addr:
+                        if (inet_naddr_compare(&naddr->naddr, addr)) {
+                                fibril_mutex_unlock(&addr_list_lock);
+                                log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p",
+                                    naddr);
+                                return naddr;
+                        }
+                        break;
                 }
         }