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

uspace/srv/net/inetsrv/inetsrv.c

@@ -63 +63 @@
 
 static inet_naddr_t solicited_node_mask = {
-        .family = AF_INET6,
+        .version = ip_v6,
         .addr6 = {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0xff, 0, 0, 0},
         .prefix = 104
@@ -69 +69 @@
 
 static inet_addr_t broadcast4_all_hosts = {
-        .family = AF_INET,
+        .version = ip_v4,
         .addr = 0xffffffff
 };
 
 static inet_addr_t multicast_all_nodes = {
-        .family = AF_INET6,
+        .version = ip_v6,
         .addr6 = {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01}
 };
@@ -180 +180 @@
 
         if (dgram->iplink != 0) {
+                /* XXX TODO - IPv6 */
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "dgram directly to iplink %zu",
                     dgram->iplink);
@@ -187 +188 @@
                         return ENOENT;
 
-                if (dgram->src.family != AF_INET ||
-                        dgram->dest.family != AF_INET)
+                if (dgram->src.version != ip_v4 ||
+                        dgram->dest.version != ip_v4)
                         return EINVAL;
 
@@ -225 +226 @@
 
         /* Take source address from the address object */
-        if (remote->family == AF_INET && remote->addr == 0xffffffff) {
-                local->family = AF_INET;
+        if (remote->version == ip_v4 && remote->addr == 0xffffffff) {
+                /* XXX TODO - IPv6 */
+                local->version = ip_v4;
                 local->addr = 0;
                 return EOK;
         }
+
         inet_naddr_addr(&dir.aobj->naddr, local);
         return EOK;