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

Timestamp:

2013-09-29T21:06:10Z (12 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/inet_link.c (modified) (2 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -294 +294 @@
 {
         addr32_t src_v4;
-        uint16_t src_af = inet_addr_get(&dgram->src, &src_v4, NULL);
-        if (src_af != AF_INET)
+        ip_ver_t src_ver = inet_addr_get(&dgram->src, &src_v4, NULL);
+        if (src_ver != ip_v4)
                 return EINVAL;
         
         addr32_t dest_v4;
-        uint16_t dest_af = inet_addr_get(&dgram->dest, &dest_v4, NULL);
-        if (dest_af != AF_INET)
+        ip_ver_t dest_ver = inet_addr_get(&dgram->dest, &dest_v4, NULL);
+        if (dest_ver != ip_v4)
                 return EINVAL;
         
@@ -369 +369 @@
 {
         addr128_t src_v6;
-        uint16_t src_af = inet_addr_get(&dgram->src, NULL, &src_v6);
-        if (src_af != AF_INET6)
+        ip_ver_t src_ver = inet_addr_get(&dgram->src, NULL, &src_v6);
+        if (src_ver != ip_v6)
                 return EINVAL;
         
         addr128_t dest_v6;
-        uint16_t dest_af = inet_addr_get(&dgram->dest, NULL, &dest_v6);
-        if (dest_af != AF_INET6)
+        ip_ver_t dest_ver = inet_addr_get(&dgram->dest, NULL, &dest_v6);
+        if (dest_ver != ip_v6)
                 return EINVAL;