Changeset 98abd40 in mainline for uspace/srv/net/inetsrv/addrobj.c

Timestamp:

2013-07-06T21:57:22Z (11 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/inetsrv/addrobj.c (modified) (4 diffs)

uspace/srv/net/inetsrv/addrobj.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
-
 #include "addrobj.h"
 #include "inetsrv.h"
 #include "inet_link.h"
-#include "inet_util.h"
 
 static inet_addrobj_t *inet_addrobj_find_by_name_locked(const char *, inet_link_t *);
@@ -106 +104 @@
 /** Find address object matching address @a addr.
  *
- * @param addr  Address
- * @oaram find  iaf_net to find network (using mask),
- *              iaf_addr to find local address (exact match)
+ * @param addr Address
+ * @oaram find iaf_net to find network (using mask),
+ *             iaf_addr to find local address (exact match)
+ *
  */
 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);
-
+        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)) {
+                
+                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",
@@ -130 +124 @@
                 }
         }
-
+        
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: Not found");
         fibril_mutex_unlock(&addr_list_lock);
-
+        
         return NULL;
 }
@@ -218 +212 @@
 {
         inet_addr_t lsrc_addr;
-        inet_addr_t *ldest_addr;
-
-        lsrc_addr.ipv4 = addr->naddr.ipv4;
-        ldest_addr = ldest;
-
-        return inet_link_send_dgram(addr->ilink, &lsrc_addr, ldest_addr, dgram,
+        inet_naddr_addr(&addr->naddr, &lsrc_addr);
+        
+        return inet_link_send_dgram(addr->ilink, &lsrc_addr, ldest, dgram,
             proto, ttl, df);
 }