Changeset f023251 in mainline for uspace/srv/net/inetsrv/icmpv6.c

Timestamp:

2013-09-29T21:06:10Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e948fde

Parents:

13be2583

Message:

HelenOS internet address version should not be based on BSD sockets definition.

File:

• uspace/srv/net/inetsrv/icmpv6.c (modified) (2 diffs)

uspace/srv/net/inetsrv/icmpv6.c

@@ -59 +59 @@
         
         addr128_t src_v6;
-        uint16_t src_af = inet_addr_get(&dgram->src, NULL, &src_v6);
+        ip_ver_t src_ver = inet_addr_get(&dgram->src, NULL, &src_v6);
         
         addr128_t dest_v6;
-        uint16_t dest_af = inet_addr_get(&dgram->dest, NULL, &dest_v6);
-        
-        if ((src_af != dest_af) || (src_af != AF_INET6))
+        ip_ver_t dest_ver = inet_addr_get(&dgram->dest, NULL, &dest_v6);
+        
+        if ((src_ver != dest_ver) || (src_ver != ip_v6))
                 return EINVAL;
         
@@ -118 +118 @@
         inetping6_sdu_t sdu;
         
-        uint16_t src_af = inet_addr_get(&dgram->src, NULL, &sdu.src);
-        uint16_t dest_af = inet_addr_get(&dgram->dest, NULL, &sdu.dest);
-        
-        if ((src_af != dest_af) || (src_af != AF_INET6))
+        ip_ver_t src_ver = inet_addr_get(&dgram->src, NULL, &sdu.src);
+        ip_ver_t dest_ver = inet_addr_get(&dgram->dest, NULL, &sdu.dest);
+        
+        if ((src_ver != dest_ver) || (src_ver != ip_v6))
                 return EINVAL;