Changeset c3b25985 in mainline for uspace/lib/c

Timestamp:

2014-08-05T21:43:50Z (11 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

ee95794

Parents:

1f1fa64

Message:

Add support for actual MAC change in networking stack.

Location:

uspace/lib/c

Files:

• generic/iplink.c (modified) (3 diffs)
• generic/iplink_srv.c (modified) (3 diffs)
• include/inet/iplink.h (modified) (2 diffs)
• include/inet/iplink_srv.h (modified) (2 diffs)
• include/ipc/iplink.h (modified) (2 diffs)

uspace/lib/c/generic/iplink.c

@@ -171 +171 @@
 }
 
+int iplink_set_mac48(iplink_t *iplink, addr48_t mac)
+{
+        async_exch_t *exch = async_exchange_begin(iplink->sess);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, IPLINK_GET_MAC48, &answer);
+        
+        int rc = async_data_read_start(exch, mac, sizeof(addr48_t));
+        
+        loc_exchange_end(exch);
+        
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+        
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        
+        return (int) retval;
+}
+
+
 int iplink_addr_add(iplink_t *iplink, inet_addr_t *addr)
 {
@@ -230 +253 @@
         free(sdu.data);
         async_answer_0(iid, rc);
+}
+
+static void iplink_ev_change_addr(iplink_t *iplink, ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        addr48_t *addr;
+        size_t size;
+        
+        int rc = async_data_write_accept((void **)&addr, false,
+            sizeof(addr48_t), sizeof(addr48_t), 0, &size);
+        if (rc != EOK) {
+                async_answer_0(iid, rc);
+                return;
+        }
+
+        rc = iplink->ev_ops->change_addr(iplink, *addr);
+        free(addr);
+        async_answer_0(iid, EOK);
 }
 
@@ -249 +290 @@
                         iplink_ev_recv(iplink, callid, &call);
                         break;
+                case IPLINK_EV_CHANGE_ADDR:
+                        iplink_ev_change_addr(iplink, callid, &call);
                 default:
                         async_answer_0(callid, ENOTSUP);

uspace/lib/c/generic/iplink_srv.c

@@ -81 +81 @@
 }
 
+static void iplink_set_mac48_srv(iplink_srv_t *srv, ipc_callid_t iid,
+    ipc_call_t *icall)
+{
+        int rc;
+        size_t size;
+        addr48_t mac;
+        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)
@@ -252 +279 @@
                         iplink_get_mac48_srv(srv, callid, &call);
                         break;
+                case IPLINK_SET_MAC48:
+                        iplink_set_mac48_srv(srv, callid, &call);
+                        break;
                 case IPLINK_SEND:
                         iplink_send_srv(srv, callid, &call);
@@ -300 +330 @@
 }
 
+int iplink_ev_change_addr(iplink_srv_t *srv, addr48_t *addr)
+{
+        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_0(exch, IPLINK_EV_CHANGE_ADDR, &answer);
+        
+        int rc = async_data_write_start(exch, addr, sizeof(addr48_t));
+        async_exchange_end(exch);
+        
+        if (rc != EOK) {
+                async_forget(req);
+                return rc;
+        }
+        
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        if (retval != EOK)
+                return retval;
+        
+        return EOK;
+}
+
 /** @}
  */

uspace/lib/c/include/inet/iplink.h

@@ -78 +78 @@
 typedef struct iplink_ev_ops {
         int (*recv)(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
+        int (*change_addr)(iplink_t *, addr48_t);
 } iplink_ev_ops_t;
 
@@ -88 +89 @@
 extern int iplink_get_mtu(iplink_t *, size_t *);
 extern int iplink_get_mac48(iplink_t *, addr48_t *);
+extern int iplink_set_mac48(iplink_t *, addr48_t);
 
 #endif

uspace/lib/c/include/inet/iplink_srv.h

@@ -59 +59 @@
         int (*get_mtu)(iplink_srv_t *, size_t *);
         int (*get_mac48)(iplink_srv_t *, addr48_t *);
+        int (*set_mac48)(iplink_srv_t *, addr48_t *);
         int (*addr_add)(iplink_srv_t *, inet_addr_t *);
         int (*addr_remove)(iplink_srv_t *, inet_addr_t *);
@@ -67 +68 @@
 extern int iplink_conn(ipc_callid_t, ipc_call_t *, void *);
 extern int iplink_ev_recv(iplink_srv_t *, iplink_recv_sdu_t *, ip_ver_t);
+extern int iplink_ev_change_addr(iplink_srv_t *, addr48_t *);
 
 #endif

uspace/lib/c/include/ipc/iplink.h

@@ -41 +41 @@
         IPLINK_GET_MTU = IPC_FIRST_USER_METHOD,
         IPLINK_GET_MAC48,
+        IPLINK_SET_MAC48,
         IPLINK_SEND,
         IPLINK_SEND6,
@@ -48 +49 @@
 
 typedef enum {
-        IPLINK_EV_RECV = IPC_FIRST_USER_METHOD
+        IPLINK_EV_RECV = IPC_FIRST_USER_METHOD,
+        IPLINK_EV_CHANGE_ADDR,
 } iplink_event_t;