Changes in uspace/lib/c/generic/iplink.c [02a09ed:ffa8912] in mainline

File:

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

uspace/lib/c/generic/iplink.c

@@ -39 +39 @@
 #include <errno.h>
 #include <inet/iplink.h>
-#include <inet/addr.h>
 #include <ipc/iplink.h>
 #include <ipc/services.h>
@@ -50 +49 @@
     iplink_t **riplink)
 {
-        iplink_t *iplink = calloc(1, sizeof(iplink_t));
+        iplink_t *iplink = NULL;
+        int rc;
+
+        iplink = calloc(1, sizeof(iplink_t));
         if (iplink == NULL)
                 return ENOMEM;
-        
+
         iplink->sess = sess;
         iplink->ev_ops = ev_ops;
-        
+
         async_exch_t *exch = async_exchange_begin(sess);
-        
-        int rc = async_connect_to_me(exch, 0, 0, 0, iplink_cb_conn, iplink);
+
+        rc = async_connect_to_me(exch, 0, 0, 0, iplink_cb_conn, iplink);
         async_exchange_end(exch);
-        
+
         if (rc != EOK)
                 goto error;
-        
+
         *riplink = iplink;
         return EOK;
-        
+
 error:
         if (iplink != NULL)
                 free(iplink);
-        
+
         return rc;
 }
@@ -84 +86 @@
 {
         async_exch_t *exch = async_exchange_begin(iplink->sess);
-        
+
         ipc_call_t answer;
-        aid_t req = async_send_0(exch, IPLINK_SEND, &answer);
-        
-        int rc = async_data_write_start(exch, &sdu->src, sizeof(inet_addr_t));
+        aid_t req = async_send_2(exch, IPLINK_SEND, sdu->lsrc.ipv4,
+            sdu->ldest.ipv4, &answer);
+        int rc = async_data_write_start(exch, sdu->data, sdu->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, &sdu->dest, sizeof(inet_addr_t));
-        if (rc != EOK) {
-                async_exchange_end(exch);
-                async_forget(req);
-                return rc;
-        }
-        
-        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);
-        
-        return (int) retval;
+        if (retval != EOK)
+                return retval;
+
+        return EOK;
 }
 
@@ -132 +121 @@
 }
 
-int iplink_addr_add(iplink_t *iplink, inet_addr_t *addr)
+int iplink_addr_add(iplink_t *iplink, iplink_addr_t *addr)
 {
         async_exch_t *exch = async_exchange_begin(iplink->sess);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_0(exch, IPLINK_ADDR_ADD, &answer);
-        
-        int rc = async_data_write_start(exch, addr, sizeof(inet_addr_t));
+
+        int rc = async_req_1_0(exch, IPLINK_ADDR_ADD, (sysarg_t)addr->ipv4);
         async_exchange_end(exch);
-        
-        if (rc != EOK) {
-                async_forget(req);
-                return rc;
-        }
-        
-        sysarg_t retval;
-        async_wait_for(req, &retval);
-        
-        return (int) retval;
+
+        return rc;
 }
 
-int iplink_addr_remove(iplink_t *iplink, inet_addr_t *addr)
+int iplink_addr_remove(iplink_t *iplink, iplink_addr_t *addr)
 {
         async_exch_t *exch = async_exchange_begin(iplink->sess);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_0(exch, IPLINK_ADDR_REMOVE, &answer);
-        
-        int rc = async_data_write_start(exch, addr, sizeof(inet_addr_t));
+
+        int rc = async_req_1_0(exch, IPLINK_ADDR_REMOVE, (sysarg_t)addr->ipv4);
         async_exchange_end(exch);
-        
-        if (rc != EOK) {
-                async_forget(req);
-                return rc;
-        }
-        
-        sysarg_t retval;
-        async_wait_for(req, &retval);
-        
-        return (int) retval;
+
+        return rc;
 }
 
-static void iplink_ev_recv(iplink_t *iplink, ipc_callid_t iid,
-    ipc_call_t *icall)
+static void iplink_ev_recv(iplink_t *iplink, ipc_callid_t callid,
+    ipc_call_t *call)
 {
-        iplink_recv_sdu_t sdu;
-        
-        uint16_t af = IPC_GET_ARG1(*icall);
-        
-        int rc = async_data_write_accept(&sdu.data, false, 0, 0, 0,
-            &sdu.size);
+        int rc;
+        iplink_sdu_t sdu;
+
+        sdu.lsrc.ipv4 = IPC_GET_ARG1(*call);
+        sdu.ldest.ipv4 = IPC_GET_ARG2(*call);
+
+        rc = async_data_write_accept(&sdu.data, false, 0, 0, 0, &sdu.size);
         if (rc != EOK) {
-                async_answer_0(iid, rc);
+                async_answer_0(callid, rc);
                 return;
         }
-        
-        rc = iplink->ev_ops->recv(iplink, &sdu, af);
+
+        rc = iplink->ev_ops->recv(iplink, &sdu);
         free(sdu.data);
-        async_answer_0(iid, rc);
+        async_answer_0(callid, rc);
 }
 
 static void iplink_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        iplink_t *iplink = (iplink_t *) arg;
-        
+        iplink_t *iplink = (iplink_t *)arg;
+
         while (true) {
                 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 IPLINK_EV_RECV: