Changeset 98abd40 in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2013-07-06T21:57:22Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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:

Merge mainline changes

File:

• uspace/srv/net/inetsrv/inetsrv.c (modified) (7 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"
 #include "icmp_std.h"
+#include "icmpv6.h"
+#include "icmpv6_std.h"
 #include "inetsrv.h"
 #include "inetcfg.h"
 #include "inetping.h"
+#include "inetping6.h"
 #include "inet_link.h"
 #include "reass.h"
@@ -93 +96 @@
         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);
@@ -104 +114 @@
         }
 
-        sroute->dest.ipv4 = 0;
-        sroute->dest.bits = 0;
-        sroute->router.ipv4 = (10 << 24) | (0 << 16) | (2 << 8) | 2;
+        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();
+        rc = inet_link_discovery_start();
         if (rc != EOK)
                 return EEXIST;
@@ -194 +203 @@
 
         /* Take source address from the address object */
-        local->ipv4 = dir.aobj->naddr.ipv4;
+        inet_naddr_addr(&dir.aobj->naddr, local);
         return EOK;
 }
 
-static void inet_get_srcaddr_srv(inet_client_t *client, ipc_callid_t callid,
-    ipc_call_t *call)
-{
+static void inet_get_srcaddr_srv(inet_client_t *client, ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srcaddr_srv()");
+        
+        uint8_t tos = IPC_GET_ARG1(*icall);
+        
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_write_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        if (size != sizeof(inet_addr_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+        
         inet_addr_t remote;
-        uint8_t tos;
+        int rc = async_data_write_finalize(callid, &remote, size);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+        }
+        
         inet_addr_t local;
-        int rc;
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srcaddr_srv()");
-
-        remote.ipv4 = IPC_GET_ARG1(*call);
-        tos = IPC_GET_ARG2(*call);
-        local.ipv4 = 0;
-
         rc = inet_get_srcaddr(&remote, tos, &local);
-        async_answer_1(callid, rc, local.ipv4);
-}
-
-static void inet_send_srv(inet_client_t *client, ipc_callid_t callid,
-    ipc_call_t *call)
-{
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+        
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        if (size != sizeof(inet_addr_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+        
+        rc = async_data_read_finalize(callid, &local, size);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+        
+        async_answer_0(iid, rc);
+}
+
+static void inet_send_srv(inet_client_t *client, ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_send_srv()");
+        
         inet_dgram_t dgram;
-        uint8_t ttl;
-        int df;
-        int rc;
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_send_srv()");
-
-        dgram.src.ipv4 = IPC_GET_ARG1(*call);
-        dgram.dest.ipv4 = IPC_GET_ARG2(*call);
-        dgram.tos = IPC_GET_ARG3(*call);
-        ttl = IPC_GET_ARG4(*call);
-        df = IPC_GET_ARG5(*call);
-
-        rc = async_data_write_accept(&dgram.data, false, 0, 0, 0, &dgram.size);
+        
+        dgram.tos = IPC_GET_ARG1(*icall);
+        
+        uint8_t ttl = IPC_GET_ARG2(*icall);
+        int df = IPC_GET_ARG3(*icall);
+        
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_write_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        if (size != sizeof(inet_addr_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+        
+        int rc = async_data_write_finalize(callid, &dgram.src, size);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
-                return;
-        }
-
+                async_answer_0(iid, rc);
+        }
+        
+        if (!async_data_write_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        if (size != sizeof(inet_addr_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+        
+        rc = async_data_write_finalize(callid, &dgram.dest, size);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+        }
+        
+        rc = async_data_write_accept(&dgram.data, false, 0, 0, 0,
+            &dgram.size);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+        
         rc = inet_send(client, &dgram, client->protocol, ttl, df);
-
+        
         free(dgram.data);
-        async_answer_0(callid, rc);
+        async_answer_0(iid, rc);
 }
 
@@ -339 +422 @@
                 inetping_conn(iid, icall, arg);
                 break;
+        case INET_PORT_PING6:
+                inetping6_conn(iid, icall, arg);
+                break;
         default:
                 async_answer_0(iid, ENOTSUP);
@@ -366 +452 @@
 {
         async_exch_t *exch = async_exchange_begin(client->sess);
-
+        
         ipc_call_t answer;
-        aid_t req = async_send_3(exch, INET_EV_RECV, dgram->src.ipv4,
-            dgram->dest.ipv4, dgram->tos, &answer);
-        int rc = async_data_write_start(exch, dgram->data, dgram->size);
-        async_exchange_end(exch);
-
-        if (rc != EOK) {
+        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) {
+                async_exchange_end(exch);
                 async_forget(req);
                 return rc;
         }
-
+        
+        rc = async_data_write_start(exch, &dgram->dest, sizeof(inet_addr_t));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                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);
-        if (retval != EOK)
-                return retval;
-
-        return EOK;
+        
+        return (int) retval;
 }
 
@@ -392 +491 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_recv_dgram_local()");
 
-        /* ICMP messages are handled internally */
+        /* ICMP and ICMPv6 messages are handled internally */
         if (proto == IP_PROTO_ICMP)
                 return icmp_recv(dgram);
+        
+        if (proto == IP_PROTO_ICMPV6)
+                return icmpv6_recv(dgram);
 
         client = inet_client_find(proto);