Changes in uspace/srv/net/inetsrv/inetsrv.c [f9b2cb4c:9ae6fc7] in mainline

File:

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

uspace/srv/net/inetsrv/inetsrv.c

@@ -46 +46 @@
 #include <stdlib.h>
 #include <sys/types.h>
-#include <task.h>
+#include <net/socket_codes.h>
 #include "addrobj.h"
 #include "icmp.h"
@@ -55 +55 @@
 #include "inetcfg.h"
 #include "inetping.h"
+#include "inetping6.h"
 #include "inet_link.h"
 #include "reass.h"
@@ -62 +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
 };
 
-static inet_addr_t broadcast4_all_hosts = {
-        .version = ip_v4,
-        .addr = 0xffffffff
-};
-
 static inet_addr_t multicast_all_nodes = {
-        .version = ip_v6,
+        .family = AF_INET,
         .addr6 = {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01}
 };
 
+static void inet_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+
 static FIBRIL_MUTEX_INITIALIZE(client_list_lock);
 static LIST_INITIALIZE(client_list);
 
-static void inet_default_conn(ipc_callid_t, ipc_call_t *, void *);
-
 static int inet_init(void)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_init()");
         
-        port_id_t port;
-        int rc = async_create_port(INTERFACE_INET,
-            inet_default_conn, NULL, &port);
-        if (rc != EOK)
-                return rc;
-        
-        rc = async_create_port(INTERFACE_INETCFG,
-            inet_cfg_conn, NULL, &port);
-        if (rc != EOK)
-                return rc;
-        
-        rc = async_create_port(INTERFACE_INETPING,
-            inetping_conn, NULL, &port);
-        if (rc != EOK)
-                return rc;
-        
-        rc = loc_server_register(NAME);
+        async_set_client_connection(inet_client_conn);
+        
+        int rc = loc_server_register(NAME);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server (%d).", rc);
@@ -109 +91 @@
         
         service_id_t sid;
-        rc = loc_service_register(SERVICE_NAME_INET, &sid);
+        rc = loc_service_register_with_iface(SERVICE_NAME_INET, &sid,
+            INET_PORT_DEFAULT);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
                 return EEXIST;
         }
+        
+        rc = loc_service_register_with_iface(SERVICE_NAME_INETCFG, &sid,
+            INET_PORT_CFG);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
+                return EEXIST;
+        }
+        
+        rc = loc_service_register_with_iface(SERVICE_NAME_INETPING, &sid,
+            INET_PORT_PING);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
+                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;
+        }
+        
+        inet_sroute_t *sroute = inet_sroute_new();
+        if (sroute == NULL) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed creating default route (%d).", rc);
+                return ENOMEM;
+        }
+
+        inet_naddr(&sroute->dest, 0, 0, 0, 0, 0);
+        inet_addr(&sroute->router, 10, 0, 2, 2);
+        sroute->name = str_dup("default");
+        inet_sroute_add(sroute);
+
+        rc = inet_link_discovery_start();
+        if (rc != EOK)
+                return EEXIST;
         
         return EOK;
@@ -167 +186 @@
 {
         inet_dir_t dir;
-        inet_link_t *ilink;
         int rc;
-
-        if (dgram->iplink != 0) {
-                /* XXX TODO - IPv6 */
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "dgram directly to iplink %zu",
-                    dgram->iplink);
-                /* Send packet directly to the specified IP link */
-                ilink = inet_link_get_by_id(dgram->iplink);
-                if (ilink == 0)
-                        return ENOENT;
-
-                if (dgram->src.version != ip_v4 ||
-                        dgram->dest.version != ip_v4)
-                        return EINVAL;
-
-                return inet_link_send_dgram(ilink, dgram->src.addr,
-                    dgram->dest.addr, dgram, proto, ttl, df);
-        }
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "dgram to be routed");
-
-        /* Route packet using source/destination addresses */
 
         rc = inet_find_dir(&dgram->src, &dgram->dest, dgram->tos, &dir);
@@ -217 +214 @@
 
         /* Take source address from the address object */
-        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;
@@ -292 +282 @@
         inet_dgram_t dgram;
         
-        dgram.iplink = IPC_GET_ARG1(*icall);
-        dgram.tos = IPC_GET_ARG2(*icall);
-        
-        uint8_t ttl = IPC_GET_ARG3(*icall);
-        int df = IPC_GET_ARG4(*icall);
+        dgram.tos = IPC_GET_ARG1(*icall);
+        
+        uint8_t ttl = IPC_GET_ARG2(*icall);
+        int df = IPC_GET_ARG3(*icall);
         
         ipc_callid_t callid;
@@ -428 +417 @@
 }
 
+static void inet_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        sysarg_t port;
+
+        port = IPC_GET_ARG1(*icall);
+
+        switch (port) {
+        case INET_PORT_DEFAULT:
+                inet_default_conn(iid, icall, arg);
+                break;
+        case INET_PORT_CFG:
+                inet_cfg_conn(iid, icall, arg);
+                break;
+        case INET_PORT_PING:
+                inetping_conn(iid, icall, arg);
+                break;
+        case INET_PORT_PING6:
+                inetping6_conn(iid, icall, arg);
+                break;
+        default:
+                async_answer_0(iid, ENOTSUP);
+                break;
+        }
+}
+
 static inet_client_t *inet_client_find(uint8_t proto)
 {
         fibril_mutex_lock(&client_list_lock);
 
-        list_foreach(client_list, client_list, inet_client_t, client) {
+        list_foreach(client_list, link) {
+                inet_client_t *client = list_get_instance(link, inet_client_t,
+                    client_list);
+
                 if (client->protocol == proto) {
                         fibril_mutex_unlock(&client_list_lock);
@@ -446 +463 @@
 {
         async_exch_t *exch = async_exchange_begin(client->sess);
-
+        
         ipc_call_t answer;
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "inet_ev_recv: iplink=%zu",
-            dgram->iplink);
-
-        aid_t req = async_send_2(exch, INET_EV_RECV, dgram->tos,
-            dgram->iplink, &answer);
-
+        aid_t req = async_send_1(exch, INET_EV_RECV, dgram->tos, &answer);
+        
         int rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));
         if (rc != EOK) {
@@ -461 +473 @@
                 return rc;
         }
-
+        
         rc = async_data_write_start(exch, &dgram->dest, sizeof(inet_addr_t));
         if (rc != EOK) {
@@ -468 +480 @@
                 return rc;
         }
-
+        
         rc = async_data_write_start(exch, dgram->data, dgram->size);
-
+        
         async_exchange_end(exch);
-
+        
         if (rc != EOK) {
                 async_forget(req);
                 return rc;
         }
-
+        
         sysarg_t retval;
         async_wait_for(req, &retval);
-
+        
         return (int) retval;
 }
@@ -493 +505 @@
         if (proto == IP_PROTO_ICMP)
                 return icmp_recv(dgram);
-
+        
         if (proto == IP_PROTO_ICMPV6)
                 return icmpv6_recv(dgram);
@@ -515 +527 @@
         if ((addr != NULL) ||
             (inet_naddr_compare_mask(&solicited_node_mask, &packet->dest)) ||
-            (inet_addr_compare(&multicast_all_nodes, &packet->dest)) || 
-            (inet_addr_compare(&broadcast4_all_hosts, &packet->dest))) {
+            (inet_addr_compare(&multicast_all_nodes, &packet->dest))) {
                 /* Destined for one of the local addresses */
 
@@ -522 +533 @@
                 if (packet->offs == 0 && !packet->mf) {
                         /* It is complete deliver it immediately */
-                        dgram.iplink = packet->link_id;
                         dgram.src = packet->src;
                         dgram.dest = packet->dest;