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

Timestamp:

2013-10-05T11:53:43Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cbfc8b7

Parents:

408424e (diff), 3e896e1 (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/sroute.c (modified) (2 diffs)

uspace/srv/net/inetsrv/sroute.c

@@ -95 +95 @@
 inet_sroute_t *inet_sroute_find(inet_addr_t *addr)
 {
-        uint16_t addr_af = inet_addr_get(addr, NULL, NULL);
+        ip_ver_t addr_ver = inet_addr_get(addr, NULL, NULL);
         
         inet_sroute_t *best = NULL;
@@ -104 +104 @@
         list_foreach(sroute_list, sroute_list, inet_sroute_t, sroute) {
                 uint8_t dest_bits;
-                uint16_t dest_af = inet_naddr_get(&sroute->dest, NULL, NULL,
+                ip_ver_t dest_ver = inet_naddr_get(&sroute->dest, NULL, NULL,
                     &dest_bits);
                 
                 /* Skip comparison with different address family */
-                if (addr_af != dest_af)
+                if (addr_ver != dest_ver)
                         continue;