Changes in uspace/lib/c/generic/iplink_srv.c [962f03b:02a09ed] in mainline

File:

• uspace/lib/c/generic/iplink_srv.c (modified) (5 diffs)

uspace/lib/c/generic/iplink_srv.c

@@ -34 +34 @@
  * @brief IP link server stub
  */
+
 #include <errno.h>
 #include <ipc/iplink.h>
 #include <stdlib.h>
 #include <sys/types.h>
-
+#include <inet/addr.h>
 #include <inet/iplink_srv.h>
 
@@ -44 +45 @@
     ipc_call_t *call)
 {
-        int rc;
         size_t mtu;
-
-        rc = srv->ops->get_mtu(srv, &mtu);
+        int rc = srv->ops->get_mtu(srv, &mtu);
         async_answer_1(callid, rc, mtu);
 }
 
-static void iplink_addr_add_srv(iplink_srv_t *srv, ipc_callid_t callid,
-    ipc_call_t *call)
-{
-        int rc;
-        iplink_srv_addr_t addr;
-
-        addr.ipv4 = IPC_GET_ARG1(*call);
-
+static void iplink_addr_add_srv(iplink_srv_t *srv, ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_write_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        if (size != sizeof(inet_addr_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+        
+        inet_addr_t addr;
+        int rc = async_data_write_finalize(callid, &addr, size);
+        if (rc != EOK) {
+                async_answer_0(callid, (sysarg_t) rc);
+                async_answer_0(iid, (sysarg_t) rc);
+        }
+        
         rc = srv->ops->addr_add(srv, &addr);
-        async_answer_0(callid, rc);
-}
-
-static void iplink_addr_remove_srv(iplink_srv_t *srv, ipc_callid_t callid,
-    ipc_call_t *call)
-{
-        int rc;
-        iplink_srv_addr_t addr;
-
-        addr.ipv4 = IPC_GET_ARG1(*call);
-
+        async_answer_0(iid, (sysarg_t) rc);
+}
+
+static void iplink_addr_remove_srv(iplink_srv_t *srv, ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_write_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        if (size != sizeof(inet_addr_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+        
+        inet_addr_t addr;
+        int rc = async_data_write_finalize(callid, &addr, size);
+        if (rc != EOK) {
+                async_answer_0(callid, (sysarg_t) rc);
+                async_answer_0(iid, (sysarg_t) rc);
+        }
+        
         rc = srv->ops->addr_remove(srv, &addr);
-        async_answer_0(callid, rc);
-}
-
-static void iplink_send_srv(iplink_srv_t *srv, ipc_callid_t callid,
-    ipc_call_t *call)
-{
-        iplink_srv_sdu_t sdu;
-        int rc;
-
-        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(callid, rc);
-                return;
-        }
-
+        async_answer_0(iid, (sysarg_t) rc);
+}
+
+static void iplink_send_srv(iplink_srv_t *srv, ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        iplink_sdu_t sdu;
+        
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_write_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                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, &sdu.src, size);
+        if (rc != EOK) {
+                async_answer_0(callid, (sysarg_t) rc);
+                async_answer_0(iid, (sysarg_t) rc);
+        }
+        
+        if (!async_data_write_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        if (size != sizeof(inet_addr_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+        
+        rc = async_data_write_finalize(callid, &sdu.dest, size);
+        if (rc != EOK) {
+                async_answer_0(callid, (sysarg_t) rc);
+                async_answer_0(iid, (sysarg_t) rc);
+        }
+        
+        rc = async_data_write_accept(&sdu.data, false, 0, 0, 0,
+            &sdu.size);
+        if (rc != EOK)
+                return;
+        
         rc = srv->ops->send(srv, &sdu);
         free(sdu.data);
-        async_answer_0(callid, rc);
+        async_answer_0(iid, rc);
 }
 
@@ -108 +172 @@
         iplink_srv_t *srv = (iplink_srv_t *)arg;
         int rc;
-
+        
         fibril_mutex_lock(&srv->lock);
         if (srv->connected) {
@@ -115 +179 @@
                 return EBUSY;
         }
-
+        
         srv->connected = true;
         fibril_mutex_unlock(&srv->lock);
-
+        
         /* Accept the connection */
         async_answer_0(iid, EOK);
-
+        
         async_sess_t *sess = async_callback_receive(EXCHANGE_SERIALIZE);
         if (sess == NULL)
                 return ENOMEM;
-
+        
         srv->client_sess = sess;
-
+        
         rc = srv->ops->open(srv);
         if (rc != EOK)
                 return rc;
-
+        
         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 */
+                        fibril_mutex_lock(&srv->lock);
+                        srv->connected = false;
+                        fibril_mutex_unlock(&srv->lock);
                         async_answer_0(callid, EOK);
                         break;
                 }
-
+                
                 switch (method) {
                 case IPLINK_GET_MTU:
@@ -160 +227 @@
                 }
         }
-
+        
         return srv->ops->close(srv);
 }
 
-int iplink_ev_recv(iplink_srv_t *srv, iplink_srv_sdu_t *sdu)
+int iplink_ev_recv(iplink_srv_t *srv, iplink_recv_sdu_t *sdu, uint16_t af)
 {
         if (srv->client_sess == NULL)
                 return EIO;
-
+        
         async_exch_t *exch = async_exchange_begin(srv->client_sess);
-
+        
         ipc_call_t answer;
-        aid_t req = async_send_2(exch, IPLINK_EV_RECV, sdu->lsrc.ipv4,
-            sdu->ldest.ipv4, &answer);
+        aid_t req = async_send_1(exch, IPLINK_EV_RECV, (sysarg_t) af,
+            &answer);
+        
         int rc = async_data_write_start(exch, sdu->data, sdu->size);
         async_exchange_end(exch);
-
-        if (rc != EOK) {
-                async_wait_for(req, NULL);
+        
+        if (rc != EOK) {
+                async_forget(req);
                 return rc;
         }
-
+        
         sysarg_t retval;
         async_wait_for(req, &retval);
         if (retval != EOK)
                 return retval;
-
+        
         return EOK;
 }