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

Timestamp:

2013-06-28T20:20:03Z (12 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/sroute.c (modified) (4 diffs)

uspace/srv/net/inetsrv/sroute.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
-
 #include "sroute.h"
 #include "inetsrv.h"
 #include "inet_link.h"
-#include "inet_util.h"
 
 static FIBRIL_MUTEX_INITIALIZE(sroute_list_lock);
@@ -97 +95 @@
 inet_sroute_t *inet_sroute_find(inet_addr_t *addr)
 {
-        uint32_t addr_addr;
-        int rc = inet_addr_pack(addr, &addr_addr);
-        if (rc != EOK)
-                return NULL;
+        uint16_t addr_af = inet_addr_get(addr, NULL, NULL);
         
         inet_sroute_t *best = NULL;
@@ -111 +106 @@
                     inet_sroute_t, sroute_list);
                 
-                uint32_t dest_addr;
                 uint8_t dest_bits;
-                rc = inet_naddr_pack(&sroute->dest, &dest_addr, &dest_bits);
-                if (rc != EOK)
+                uint16_t dest_af = inet_naddr_get(&sroute->dest, NULL, NULL,
+                    &dest_bits);
+                
+                /* Skip comparison with different address family */
+                if (addr_af != dest_af)
                         continue;
                 
@@ -121 +118 @@
                         continue;
                 
-                uint32_t mask = inet_netmask(dest_bits);
-                if ((dest_addr & mask) == (addr_addr & mask)) {
+                if (inet_naddr_compare_mask(&sroute->dest, addr)) {
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: found candidate %p",
                             sroute);