Changeset a2e3ee6 in mainline for uspace/srv/net/inetsrv/inetping.c

Timestamp:

2013-06-20T16:45:58Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

08bb73b

Parents:

19a4f73

Message:

use new network address infrastructure (towards IPv6 support)

File:

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

uspace/srv/net/inetsrv/inetping.c

@@ -62 +62 @@
 }
 
-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, uint32_t remote,
+    uint32_t *local)
+{
+        inet_addr_t remote_addr;
+        inet_addr_unpack(remote, &remote_addr);
+        
+        inet_addr_t local_addr;
+        int rc = inet_get_srcaddr(&remote_addr, ICMP_TOS, &local_addr);
+        if (rc != EOK)
+                return rc;
+        
+        return inet_addr_pack(&local_addr, local);
 }
 
@@ -82 +90 @@
         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);
+        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);
@@ -116 +124 @@
         }
 
-        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 +137 @@
     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);
 }