Changes in uspace/lib/c/generic/inetping.c [6428115:3e66428] in mainline

File:

• uspace/lib/c/generic/inetping.c (modified) (4 diffs)

uspace/lib/c/generic/inetping.c

@@ -49 +49 @@
 
         assert(inetping_sess == NULL);
-
+        
         inetping_ev_ops = ev_ops;
-
+        
         rc = loc_service_get_id(SERVICE_NAME_INETPING, &inetping_svc,
             IPC_FLAG_BLOCKING);
         if (rc != EOK)
                 return ENOENT;
-
+        
         inetping_sess = loc_service_connect(EXCHANGE_SERIALIZE, inetping_svc,
             IPC_FLAG_BLOCKING);
         if (inetping_sess == NULL)
                 return ENOENT;
-
+        
         async_exch_t *exch = async_exchange_begin(inetping_sess);
 
         rc = async_connect_to_me(exch, 0, 0, 0, inetping_cb_conn, NULL);
         async_exchange_end(exch);
-
+        
         if (rc != EOK) {
                 async_hangup(inetping_sess);
@@ -72 +72 @@
                 return rc;
         }
-
+        
         return EOK;
 }
@@ -79 +79 @@
 {
         async_exch_t *exch = async_exchange_begin(inetping_sess);
-
+        
         ipc_call_t answer;
-        aid_t req = async_send_3(exch, INETPING_SEND, sdu->src.ipv4,
-            sdu->dest.ipv4, sdu->seq_no, &answer);
+        aid_t req = async_send_3(exch, INETPING_SEND, (sysarg_t) sdu->src,
+            (sysarg_t) sdu->dest, sdu->seq_no, &answer);
         sysarg_t retval = async_data_write_start(exch, sdu->data, sdu->size);
-
+        
         async_exchange_end(exch);
-
+        
         if (retval != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return retval;
         }
-
+        
         async_wait_for(req, &retval);
         return retval;
 }
 
-int inetping_get_srcaddr(inet_addr_t *remote, inet_addr_t *local)
+int inetping_get_srcaddr(uint32_t remote, uint32_t *local)
 {
+        async_exch_t *exch = async_exchange_begin(inetping_sess);
+        
         sysarg_t local_addr;
-        async_exch_t *exch = async_exchange_begin(inetping_sess);
-
-        int rc = async_req_1_1(exch, INETPING_GET_SRCADDR, remote->ipv4,
+        int rc = async_req_1_1(exch, INETPING_GET_SRCADDR, (sysarg_t) remote,
             &local_addr);
+        
         async_exchange_end(exch);
-
+        
         if (rc != EOK)
                 return rc;
-
-        local->ipv4 = local_addr;
+        
+        *local = (uint32_t) local_addr;
         return EOK;
 }
@@ -114 +115 @@
 static void inetping_ev_recv(ipc_callid_t callid, ipc_call_t *call)
 {
-        int rc;
         inetping_sdu_t sdu;
-
-        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);
-
-        rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size);
+        
+        int rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
                 return;
         }
-
+        
         rc = inetping_ev_ops->recv(&sdu);
         free(sdu.data);