Changes in uspace/srv/net/inetsrv/addrobj.c [5a324d99:feeac0d] in mainline

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