Changes in uspace/srv/net/inetsrv/inetsrv.c [9749e47:695b6ff] in mainline

File:

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

uspace/srv/net/inetsrv/inetsrv.c

@@ -46 +46 @@
 #include <stdlib.h>
 #include <sys/types.h>
+#include <net/socket_codes.h>
 #include "addrobj.h"
 #include "icmp.h"
@@ -54 +55 @@
 #include "inetcfg.h"
 #include "inetping.h"
+#include "inetping6.h"
 #include "inet_link.h"
 #include "reass.h"
@@ -61 +63 @@
 
 static inet_naddr_t solicited_node_mask = {
-        .version = ip_v6,
+        .family = AF_INET6,
         .addr6 = {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0xff, 0, 0, 0},
         .prefix = 104
@@ -67 +69 @@
 
 static inet_addr_t broadcast4_all_hosts = {
-        .version = ip_v4,
+        .family = AF_INET,
         .addr = 0xffffffff
 };
 
 static inet_addr_t multicast_all_nodes = {
-        .version = ip_v6,
+        .family = AF_INET6,
         .addr6 = {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01}
 };
@@ -114 +116 @@
                 return EEXIST;
         }
+        
+        rc = loc_service_register_with_iface(SERVICE_NAME_INETPING6, &sid,
+            INET_PORT_PING6);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
+                return EEXIST;
+        }
+        
+        rc = inet_link_discovery_start();
+        if (rc != EOK)
+                return EEXIST;
         
         return EOK;
@@ -171 +184 @@
 
         if (dgram->iplink != 0) {
-                /* XXX TODO - IPv6 */
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "dgram directly to iplink %zu",
                     dgram->iplink);
@@ -179 +191 @@
                         return ENOENT;
 
-                if (dgram->src.version != ip_v4 ||
-                        dgram->dest.version != ip_v4)
+                if (dgram->src.family != AF_INET ||
+                        dgram->dest.family != AF_INET)
                         return EINVAL;
 
@@ -217 +229 @@
 
         /* Take source address from the address object */
-        if (remote->version == ip_v4 && remote->addr == 0xffffffff) {
-                /* XXX TODO - IPv6 */
-                local->version = ip_v4;
+        if (remote->family == AF_INET && remote->addr == 0xffffffff) {
+                local->family = AF_INET;
                 local->addr = 0;
                 return EOK;
         }
-
         inet_naddr_addr(&dir.aobj->naddr, local);
         return EOK;
@@ -444 +454 @@
                 inetping_conn(iid, icall, arg);
                 break;
+        case INET_PORT_PING6:
+                inetping6_conn(iid, icall, arg);
+                break;
         default:
                 async_answer_0(iid, ENOTSUP);