Changes in uspace/lib/c/generic/inet.c [d8b47eca:bd8bfc5a] in mainline

File:

• uspace/lib/c/generic/inet.c (modified) (7 diffs)

uspace/lib/c/generic/inet.c

@@ -30 +30 @@
 #include <assert.h>
 #include <errno.h>
-#include <net/socket_codes.h>
 #include <inet/inet.h>
 #include <ipc/inet.h>
@@ -45 +44 @@
 {
         async_exch_t *exch = async_exchange_begin(inet_sess);
-        
+
         ipc_call_t answer;
         aid_t req = async_send_0(exch, INET_CALLBACK_CREATE, &answer);
         int rc = async_connect_to_me(exch, 0, 0, 0, inet_cb_conn, NULL);
         async_exchange_end(exch);
-        
+
         if (rc != EOK)
                 return rc;
-        
+
         sysarg_t retval;
         async_wait_for(req, &retval);
-        
-        return retval;
+        if (retval != EOK)
+                return retval;
+
+        return EOK;
 }
 
 static int inet_set_proto(uint8_t protocol)
 {
+        int rc;
+
         async_exch_t *exch = async_exchange_begin(inet_sess);
-        int rc = async_req_1_0(exch, INET_SET_PROTO, protocol);
+        rc = async_req_1_0(exch, INET_SET_PROTO, protocol);
         async_exchange_end(exch);
-        
+
         return rc;
 }
@@ -77 +80 @@
         assert(inet_ev_ops == NULL);
         assert(inet_protocol == 0);
-        
+
         rc = loc_service_get_id(SERVICE_NAME_INET, &inet_svc,
             IPC_FLAG_BLOCKING);
         if (rc != EOK)
                 return ENOENT;
-        
+
         inet_sess = loc_service_connect(EXCHANGE_SERIALIZE, inet_svc,
             IPC_FLAG_BLOCKING);
         if (inet_sess == NULL)
                 return ENOENT;
-        
+
         if (inet_set_proto(protocol) != EOK) {
                 async_hangup(inet_sess);
@@ -93 +96 @@
                 return EIO;
         }
-        
+
         if (inet_callback_create() != EOK) {
                 async_hangup(inet_sess);
@@ -99 +102 @@
                 return EIO;
         }
-        
+
         inet_protocol = protocol;
         inet_ev_ops = ev_ops;
@@ -109 +112 @@
 {
         async_exch_t *exch = async_exchange_begin(inet_sess);
-        
+
         ipc_call_t answer;
-        aid_t req = async_send_3(exch, INET_SEND, dgram->tos, ttl, df,
-            &answer);
-        
-        int rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));
+        aid_t req = async_send_5(exch, INET_SEND, dgram->src.ipv4,
+            dgram->dest.ipv4, dgram->tos, ttl, df, &answer);
+        int rc = async_data_write_start(exch, dgram->data, dgram->size);
+        async_exchange_end(exch);
+
         if (rc != EOK) {
-                async_exchange_end(exch);
-                async_forget(req);
+                async_wait_for(req, NULL);
                 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);
-        
-        return (int) retval;
+        if (retval != EOK)
+                return retval;
+
+        return EOK;
 }
 
 int inet_get_srcaddr(inet_addr_t *remote, uint8_t tos, inet_addr_t *local)
 {
+        sysarg_t local_addr;
         async_exch_t *exch = async_exchange_begin(inet_sess);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_1(exch, INET_GET_SRCADDR, tos, &answer);
-        
-        int rc = async_data_write_start(exch, remote, sizeof(inet_addr_t));
-        if (rc != EOK) {
-                async_exchange_end(exch);
-                async_forget(req);
+
+        int rc = async_req_2_1(exch, INET_GET_SRCADDR, remote->ipv4,
+            tos, &local_addr);
+        async_exchange_end(exch);
+
+        if (rc != EOK)
                 return rc;
-        }
-        
-        rc = async_data_read_start(exch, local, sizeof(inet_addr_t));
-        
-        async_exchange_end(exch);
-        
-        if (rc != EOK) {
-                async_forget(req);
-                return rc;
-        }
-        
-        sysarg_t retval;
-        async_wait_for(req, &retval);
-        
-        return (int) retval;
+
+        local->ipv4 = local_addr;
+        return EOK;
 }
 
-static void inet_ev_recv(ipc_callid_t iid, ipc_call_t *icall)
+static void inet_ev_recv(ipc_callid_t callid, ipc_call_t *call)
 {
+        int rc;
         inet_dgram_t dgram;
-        
-        dgram.tos = IPC_GET_ARG1(*icall);
-        
-        ipc_callid_t callid;
-        size_t size;
-        if (!async_data_write_receive(&callid, &size)) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(iid, EINVAL);
+
+        dgram.src.ipv4 = IPC_GET_ARG1(*call);
+        dgram.dest.ipv4 = IPC_GET_ARG2(*call);
+        dgram.tos = IPC_GET_ARG3(*call);
+
+        rc = async_data_write_accept(&dgram.data, false, 0, 0, 0, &dgram.size);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
                 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);
-                async_answer_0(iid, rc);
-                return;
-        }
-        
-        if (!async_data_write_receive(&callid, &size)) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(iid, EINVAL);
-                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);
-                return;
-        }
-        
-        rc = async_data_write_accept(&dgram.data, false, 0, 0, 0, &dgram.size);
-        if (rc != EOK) {
-                async_answer_0(iid, rc);
-                return;
-        }
-        
+
         rc = inet_ev_ops->recv(&dgram);
-        async_answer_0(iid, rc);
+        async_answer_0(callid, rc);
 }
 
@@ -233 +172 @@
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
-                
+
                 if (!IPC_GET_IMETHOD(call)) {
                         /* TODO: Handle hangup */
                         return;
                 }
-                
+
                 switch (IPC_GET_IMETHOD(call)) {
                 case INET_EV_RECV: