Changeset 4c14b88 in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2013-12-31T07:57:14Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b973dc

Parents:

6297465 (diff), 208b5f5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline changes

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"
@@ -55 +54 @@
 #include "inetcfg.h"
 #include "inetping.h"
-#include "inetping6.h"
 #include "inet_link.h"
 #include "reass.h"
@@ -63 +61 @@
 
 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 +67 @@
 
 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}
 };
@@ -116 +114 @@
                 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;
@@ -184 +171 @@
 
         if (dgram->iplink != 0) {
+                /* XXX TODO - IPv6 */
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "dgram directly to iplink %zu",
                     dgram->iplink);
@@ -191 +179 @@
                         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;
 
@@ -229 +217 @@
 
         /* 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;
@@ -454 +444 @@
                 inetping_conn(iid, icall, arg);
                 break;
-        case INET_PORT_PING6:
-                inetping6_conn(iid, icall, arg);
-                break;
         default:
                 async_answer_0(iid, ENOTSUP);