Changeset 02a09ed in mainline for uspace/srv/net/inetsrv/addrobj.c

Timestamp:

2013-06-28T20:20:03Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1d24ad3

Parents:

edf0d27

Message:

add basic infrastructure for IPv6 (inactive)
make inet_addr_t a universal address type

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 addr_addr;
-        int rc = inet_addr_pack(addr, &addr_addr);
-        if (rc != EOK)
-                return NULL;
-        
         fibril_mutex_lock(&addr_list_lock);
         
@@ -123 +117 @@
                     inet_addrobj_t, addr_list);
                 
-                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)) {
+                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",
@@ -227 +214 @@
         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,
+        return inet_link_send_dgram(addr->ilink, &lsrc_addr, ldest, dgram,
             proto, ttl, df);
 }