Changes in uspace/srv/net/inetsrv/addrobj.c [02a09ed:a1a101d] in mainline

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 *);
@@ -104 +106 @@
 /** 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)
 {
-        fibril_mutex_lock(&addr_list_lock);
-        
+        uint32_t mask;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find(%x)", (unsigned)addr->ipv4);
+
+        fibril_mutex_lock(&addr_list_lock);
+
         list_foreach(addr_list, link) {
                 inet_addrobj_t *naddr = list_get_instance(link,
                     inet_addrobj_t, addr_list);
-                
-                if (inet_naddr_compare_mask(&naddr->naddr, addr)) {
+
+                mask = inet_netmask(naddr->naddr.bits);
+                if ((naddr->naddr.ipv4 & mask) == (addr->ipv4 & mask)) {
                         fibril_mutex_unlock(&addr_list_lock);
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: found %p",
@@ -124 +130 @@
                 }
         }
-        
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_addrobj_find: Not found");
         fibril_mutex_unlock(&addr_list_lock);
-        
+
         return NULL;
 }
@@ -212 +218 @@
 {
         inet_addr_t lsrc_addr;
-        inet_naddr_addr(&addr->naddr, &lsrc_addr);
-        
-        return inet_link_send_dgram(addr->ilink, &lsrc_addr, ldest, dgram,
+        inet_addr_t *ldest_addr;
+
+        lsrc_addr.ipv4 = addr->naddr.ipv4;
+        ldest_addr = &dgram->dest;
+
+        return inet_link_send_dgram(addr->ilink, &lsrc_addr, ldest_addr, dgram,
             proto, ttl, df);
 }