Changeset b86a32e in mainline for uspace/lib/c/generic/iplink_srv.c

Timestamp:

2013-07-15T12:14:55Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c84146d3

Parents:

87159eb8 (diff), 956d4281 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline changes.

File:

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

uspace/lib/c/generic/iplink_srv.c

@@ -50 +50 @@
 }
 
+static void iplink_get_mac48_srv(iplink_srv_t *srv, ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        addr48_t mac;
+        int rc = srv->ops->get_mac48(srv, &mac);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+        
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        if (size != sizeof(addr48_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+        
+        rc = async_data_read_finalize(callid, &mac, size);
+        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)
@@ -111 +142 @@
         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;
@@ -119 +170 @@
         }
         
-        if (size != sizeof(inet_addr_t)) {
+        if (size != sizeof(addr48_t)) {
                 async_answer_0(callid, EINVAL);
                 async_answer_0(iid, EINVAL);
@@ -125 +176 @@
         }
         
-        int rc = async_data_write_finalize(callid, &sdu.src, size);
+        int rc = async_data_write_finalize(callid, &sdu.dest, size);
         if (rc != EOK) {
                 async_answer_0(callid, (sysarg_t) rc);
@@ -131 +182 @@
         }
         
-        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);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+        
+        rc = srv->ops->send6(srv, &sdu);
         free(sdu.data);
         async_answer_0(iid, rc);
@@ -170 +205 @@
 int iplink_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        iplink_srv_t *srv = (iplink_srv_t *)arg;
+        iplink_srv_t *srv = (iplink_srv_t *) arg;
         int rc;
         
@@ -214 +249 @@
                         iplink_get_mtu_srv(srv, callid, &call);
                         break;
+                case IPLINK_GET_MAC48:
+                        iplink_get_mac48_srv(srv, callid, &call);
+                        break;
                 case IPLINK_SEND:
                         iplink_send_srv(srv, callid, &call);
+                        break;
+                case IPLINK_SEND6:
+                        iplink_send6_srv(srv, callid, &call);
                         break;
                 case IPLINK_ADDR_ADD: