Changes in uspace/lib/c/generic/iplink_srv.c [25a179e:8d2dd7f2] in mainline

File:

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

uspace/lib/c/generic/iplink_srv.c

@@ -78 +78 @@
                 async_answer_0(callid, rc);
         
-        async_answer_0(iid, rc);
+        async_answer_0(iid, (sysarg_t) rc);
 }
 
@@ -89 +89 @@
         ipc_callid_t callid;
 
+        rc = async_data_write_receive(&callid, &size);
+        if (rc != EOK) {
+                async_answer_0(callid, (sysarg_t) rc);
+                async_answer_0(iid, (sysarg_t) rc);
+        }
+
+        rc = srv->ops->set_mac48(srv, &mac);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+        
+        rc = async_data_read_finalize(callid, &mac, sizeof(addr48_t));
+        if (rc != EOK)
+                async_answer_0(callid, rc);
+        
+        async_answer_0(iid, (sysarg_t) rc);
+}
+
+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);
-        }
-
-        rc = srv->ops->set_mac48(srv, &mac);
-        if (rc != EOK) {
-                async_answer_0(iid, rc);
-                return;
-        }
-        
-        rc = async_data_read_finalize(callid, &mac, sizeof(addr48_t));
-        if (rc != EOK)
-                async_answer_0(callid, rc);
-        
-        async_answer_0(iid, rc);
-}
-
-static void iplink_addr_add_srv(iplink_srv_t *srv, ipc_callid_t iid,
+                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(iid, (sysarg_t) rc);
+}
+
+static void iplink_addr_remove_srv(iplink_srv_t *srv, ipc_callid_t iid,
     ipc_call_t *icall)
 {
@@ -127 +156 @@
         int rc = async_data_write_finalize(callid, &addr, size);
         if (rc != EOK) {
-                async_answer_0(callid, rc);
+                async_answer_0(callid, (sysarg_t) rc);
+                async_answer_0(iid, (sysarg_t) rc);
+        }
+        
+        rc = srv->ops->addr_remove(srv, &addr);
+        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;
+        
+        sdu.src = IPC_GET_ARG1(*icall);
+        sdu.dest = IPC_GET_ARG2(*icall);
+        
+        int rc = async_data_write_accept(&sdu.data, false, 0, 0, 0,
+            &sdu.size);
+        if (rc != EOK) {
                 async_answer_0(iid, rc);
-        }
-        
-        rc = srv->ops->addr_add(srv, &addr);
+                return;
+        }
+        
+        rc = srv->ops->send(srv, &sdu);
+        free(sdu.data);
         async_answer_0(iid, rc);
 }
 
-static void iplink_addr_remove_srv(iplink_srv_t *srv, ipc_callid_t iid,
-    ipc_call_t *icall)
-{
+static void iplink_send6_srv(iplink_srv_t *srv, ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        iplink_sdu6_t sdu;
+        
         ipc_callid_t callid;
         size_t size;
@@ -146 +197 @@
         }
         
-        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, rc);
-                async_answer_0(iid, rc);
-        }
-        
-        rc = srv->ops->addr_remove(srv, &addr);
-        async_answer_0(iid, rc);
-}
-
-static void iplink_send_srv(iplink_srv_t *srv, ipc_callid_t iid,
-    ipc_call_t *icall)
-{
-        iplink_sdu_t sdu;
-        
-        sdu.src = IPC_GET_ARG1(*icall);
-        sdu.dest = IPC_GET_ARG2(*icall);
-        
-        int rc = async_data_write_accept(&sdu.data, false, 0, 0, 0,
-            &sdu.size);
-        if (rc != EOK) {
-                async_answer_0(iid, rc);
-                return;
-        }
-        
-        rc = srv->ops->send(srv, &sdu);
-        free(sdu.data);
-        async_answer_0(iid, rc);
-}
-
-static void iplink_send6_srv(iplink_srv_t *srv, ipc_callid_t iid,
-    ipc_call_t *icall)
-{
-        iplink_sdu6_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(addr48_t)) {
                 async_answer_0(callid, EINVAL);
@@ -204 +205 @@
         int rc = async_data_write_finalize(callid, &sdu.dest, size);
         if (rc != EOK) {
-                async_answer_0(callid, rc);
-                async_answer_0(iid, rc);
+                async_answer_0(callid, (sysarg_t) rc);
+                async_answer_0(iid, (sysarg_t) rc);
         }
         
@@ -321 +322 @@
         }
         
-        int retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         if (retval != EOK)
@@ -347 +348 @@
         }
         
-        int retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         if (retval != EOK)