Changeset c42f50d in mainline for uspace/srv/net/inetsrv/addrobj.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/addrobj.c (modified) (3 diffs)

uspace/srv/net/inetsrv/addrobj.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
-#include <net/socket_codes.h>
 #include "addrobj.h"
 #include "inetsrv.h"
@@ -218 +217 @@
         inet_addr_t lsrc_addr;
         inet_naddr_addr(&addr->naddr, &lsrc_addr);
-        
+
         addr32_t lsrc_v4;
         addr128_t lsrc_v6;
-        uint16_t lsrc_af = inet_addr_get(&lsrc_addr, &lsrc_v4, &lsrc_v6);
-        
+        ip_ver_t lsrc_ver = inet_addr_get(&lsrc_addr, &lsrc_v4, &lsrc_v6);
+
         addr32_t ldest_v4;
         addr128_t ldest_v6;
-        uint16_t ldest_af = inet_addr_get(ldest, &ldest_v4, &ldest_v6);
-        
-        if (lsrc_af != ldest_af)
+        ip_ver_t ldest_ver = inet_addr_get(ldest, &ldest_v4, &ldest_v6);
+
+        if (lsrc_ver != ldest_ver)
                 return EINVAL;
-        
+
         int rc;
         addr48_t ldest_mac;
-        
-        switch (ldest_af) {
-        case AF_INET:
+
+        switch (ldest_ver) {
+        case ip_v4:
                 return inet_link_send_dgram(addr->ilink, lsrc_v4, ldest_v4,
                     dgram, proto, ttl, df);
-        case AF_INET6:
+        case ip_v6:
                 /*
                  * Translate local destination IPv6 address.
@@ -244 +243 @@
                 if (rc != EOK)
                         return rc;
-                
+
                 return inet_link_send_dgram6(addr->ilink, ldest_mac, dgram,
                     proto, ttl, df);
-        }
-        
+        default:
+                assert(false);
+                break;
+        }
+
         return ENOTSUP;
 }