Changeset 98abd40 in mainline for uspace/srv/net/inetsrv/inetping.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/inetping.c (modified) (10 diffs)

uspace/srv/net/inetsrv/inetping.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <sys/types.h>
-
+#include <net/socket_codes.h>
 #include "icmp.h"
 #include "icmp_std.h"
@@ -55 +55 @@
 static uint16_t inetping_ident = 0;
 
-static inetping_client_t *inetping_client_find(uint16_t);
-
 static int inetping_send(inetping_client_t *client, inetping_sdu_t *sdu)
 {
@@ -62 +60 @@
 }
 
-static int inetping_get_srcaddr(inetping_client_t *client, inet_addr_t *remote,
-    inet_addr_t *local)
-{
-        return inet_get_srcaddr(remote, ICMP_TOS, local);
+static int inetping_get_srcaddr(inetping_client_t *client, addr32_t remote,
+    addr32_t *local)
+{
+        inet_addr_t remote_addr;
+        inet_addr_set(remote, &remote_addr);
+        
+        inet_addr_t local_addr;
+        int rc = inet_get_srcaddr(&remote_addr, ICMP_TOS, &local_addr);
+        if (rc != EOK)
+                return rc;
+        
+        uint16_t family = inet_addr_get(&local_addr, local, NULL);
+        if (family != AF_INET)
+                return EINVAL;
+        
+        return EOK;
+}
+
+static inetping_client_t *inetping_client_find(uint16_t ident)
+{
+        fibril_mutex_lock(&client_list_lock);
+        
+        list_foreach(client_list, link) {
+                inetping_client_t *client = list_get_instance(link,
+                    inetping_client_t, client_list);
+                
+                if (client->ident == ident) {
+                        fibril_mutex_unlock(&client_list_lock);
+                        return client;
+                }
+        }
+        
+        fibril_mutex_unlock(&client_list_lock);
+        return NULL;
 }
 
 int inetping_recv(uint16_t ident, inetping_sdu_t *sdu)
 {
-        inetping_client_t *client;
-        async_exch_t *exch;
-        ipc_call_t answer;
-
-        client = inetping_client_find(ident);
+        inetping_client_t *client = inetping_client_find(ident);
         if (client == NULL) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "Unknown ICMP ident. Dropping.");
                 return ENOENT;
         }
-
-        exch = async_exchange_begin(client->sess);
-
-        aid_t req = async_send_3(exch, INETPING_EV_RECV, sdu->src.ipv4,
-            sdu->dest.ipv4, sdu->seq_no, &answer);
+        
+        async_exch_t *exch = async_exchange_begin(client->sess);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_3(exch, INETPING_EV_RECV, (sysarg_t) sdu->src,
+            (sysarg_t) sdu->dest, sdu->seq_no, &answer);
         int rc = async_data_write_start(exch, sdu->data, sdu->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;
 }
 
@@ -116 +139 @@
         }
 
-        sdu.src.ipv4 = IPC_GET_ARG1(*call);
-        sdu.dest.ipv4 = IPC_GET_ARG2(*call);
+        sdu.src = IPC_GET_ARG1(*call);
+        sdu.dest = IPC_GET_ARG2(*call);
         sdu.seq_no = IPC_GET_ARG3(*call);
 
@@ -129 +152 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        inet_addr_t remote;
-        inet_addr_t local;
-        int rc;
-
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_get_srcaddr_srv()");
-
-        remote.ipv4 = IPC_GET_ARG1(*call);
-        local.ipv4 = 0;
-
-        rc = inetping_get_srcaddr(client, &remote, &local);
-        async_answer_1(callid, rc, local.ipv4);
+        
+        uint32_t remote = IPC_GET_ARG1(*call);
+        uint32_t local = 0;
+        
+        int rc = inetping_get_srcaddr(client, remote, &local);
+        async_answer_1(callid, rc, (sysarg_t) local);
 }
 
@@ -147 +166 @@
         if (sess == NULL)
                 return ENOMEM;
-
+        
         client->sess = sess;
         link_initialize(&client->client_list);
-
+        
         fibril_mutex_lock(&client_list_lock);
         client->ident = ++inetping_ident;
         list_append(&client->client_list, &client_list);
         fibril_mutex_unlock(&client_list_lock);
-
+        
         return EOK;
 }
@@ -163 +182 @@
         async_hangup(client->sess);
         client->sess = NULL;
-
+        
         fibril_mutex_lock(&client_list_lock);
         list_remove(&client->client_list);
@@ -169 +188 @@
 }
 
-static inetping_client_t *inetping_client_find(uint16_t ident)
-{
-        fibril_mutex_lock(&client_list_lock);
-
-        list_foreach(client_list, link) {
-                inetping_client_t *client = list_get_instance(link,
-                    inetping_client_t, client_list);
-
-                if (client->ident == ident) {
-                        fibril_mutex_unlock(&client_list_lock);
-                        return client;
-                }
-        }
-
-        fibril_mutex_unlock(&client_list_lock);
-        return NULL;
-}
-
 void inetping_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        inetping_client_t client;
-        int rc;
-
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_conn()");
-
+        
         /* Accept the connection */
         async_answer_0(iid, EOK);
-
-        rc = inetping_client_init(&client);
+        
+        inetping_client_t client;
+        int rc = inetping_client_init(&client);
         if (rc != EOK)
                 return;
-
+        
         while (true) {
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
                 sysarg_t method = IPC_GET_IMETHOD(call);
-
+                
                 if (!method) {
                         /* The other side has hung up */
@@ -211 +210 @@
                         break;
                 }
-
+                
                 switch (method) {
                 case INETPING_SEND:
@@ -223 +222 @@
                 }
         }
-
+        
         inetping_client_fini(&client);
 }