Changeset 89ac5513 in mainline for uspace/srv/net/inetsrv/addrobj.c

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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/inetsrv/addrobj.c (modified) (2 diffs)

uspace/srv/net/inetsrv/addrobj.c

@@ -112 +112 @@
 inet_addrobj_t *inet_addrobj_find(inet_addr_t *addr, inet_addrobj_find_t find)
 {
-        uint32_t mask;
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find(%x)", (unsigned)addr->ipv4);
-
-        fibril_mutex_lock(&addr_list_lock);
-
+        uint32_t addr_addr;
+        int rc = inet_addr_pack(addr, &addr_addr);
+        if (rc != EOK)
+                return NULL;
+        
+        fibril_mutex_lock(&addr_list_lock);
+        
         list_foreach(addr_list, link) {
                 inet_addrobj_t *naddr = list_get_instance(link,
                     inet_addrobj_t, addr_list);
-
-                mask = inet_netmask(naddr->naddr.bits);
-                if ((naddr->naddr.ipv4 & mask) == (addr->ipv4 & mask)) {
+                
+                uint32_t naddr_addr;
+                uint8_t naddr_bits;
+                rc = inet_naddr_pack(&naddr->naddr, &naddr_addr, &naddr_bits);
+                if (rc != EOK)
+                        continue;
+                
+                uint32_t mask = inet_netmask(naddr_bits);
+                if ((naddr_addr & mask) == (addr_addr & mask)) {
                         fibril_mutex_unlock(&addr_list_lock);
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p",
@@ -218 +225 @@
 {
         inet_addr_t lsrc_addr;
-        inet_addr_t *ldest_addr;
-
-        lsrc_addr.ipv4 = addr->naddr.ipv4;
-        ldest_addr = &dgram->dest;
-
+        inet_naddr_addr(&addr->naddr, &lsrc_addr);
+        
+        inet_addr_t *ldest_addr = ldest;
+        
         return inet_link_send_dgram(addr->ilink, &lsrc_addr, ldest_addr, dgram,
             proto, ttl, df);