Changeset 984a9ba in mainline for uspace/srv/net/ethip

Timestamp:

2018-07-05T09:34:09Z (8 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

63d46341

Parents:

76f566d

Message:

do not expose the call capability handler from the async framework

Keep the call capability handler encapsulated within the async framework
and do not expose it explicitly via its API. Use the pointer to
ipc_call_t as the sole object identifying an IPC call in the code that
uses the async framework.

This plugs a major leak in the abstraction and also simplifies both the
async framework (slightly) and all IPC servers.

Location:

uspace/srv/net/ethip

Files:

• ethip.c (modified) (3 diffs)
• ethip_nic.c (modified) (7 diffs)

uspace/srv/net/ethip/ethip.c

@@ -63 +63 @@
 static errno_t ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
 
-static void ethip_client_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg);
+static void ethip_client_conn(ipc_call_t *icall, void *arg);
 
 static iplink_ops_t ethip_iplink_ops = {
@@ -142 +142 @@
 }
 
-static void ethip_client_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+static void ethip_client_conn(ipc_call_t *icall, void *arg)
 {
         ethip_nic_t *nic;
@@ -155 +155 @@
         }
 
-        iplink_conn(icall_handle, icall, &nic->iplink);
+        iplink_conn(icall, &nic->iplink);
 }
 

uspace/srv/net/ethip/ethip_nic.c

@@ -52 +52 @@
 
 static errno_t ethip_nic_open(service_id_t sid);
-static void ethip_nic_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg);
+static void ethip_nic_cb_conn(ipc_call_t *icall, void *arg);
 
 static LIST_INITIALIZE(ethip_nic_list);
@@ -229 +229 @@
 }
 
-static void ethip_nic_addr_changed(ethip_nic_t *nic, cap_call_handle_t chandle,
-    ipc_call_t *call)
+static void ethip_nic_addr_changed(ethip_nic_t *nic, ipc_call_t *call)
 {
         uint8_t *addr;
@@ -236 +235 @@
         errno_t rc;
 
-        rc = async_data_write_accept((void **)&addr, false, 0, 0, 0, &size);
+        rc = async_data_write_accept((void **) &addr, false, 0, 0, 0, &size);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "data_write_accept() failed");
@@ -255 +254 @@
 
         free(addr);
-        async_answer_0(chandle, EOK);
-}
-
-static void ethip_nic_received(ethip_nic_t *nic, cap_call_handle_t chandle,
-    ipc_call_t *call)
+        async_answer_0(call, EOK);
+}
+
+static void ethip_nic_received(ethip_nic_t *nic, ipc_call_t *call)
 {
         errno_t rc;
@@ -282 +280 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_received() done, rc=%s", str_error_name(rc));
-        async_answer_0(chandle, rc);
-}
-
-static void ethip_nic_device_state(ethip_nic_t *nic, cap_call_handle_t chandle,
-    ipc_call_t *call)
+        async_answer_0(call, rc);
+}
+
+static void ethip_nic_device_state(ethip_nic_t *nic, ipc_call_t *call)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_nic_device_state()");
-        async_answer_0(chandle, ENOTSUP);
-}
-
-static void ethip_nic_cb_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+        async_answer_0(call, ENOTSUP);
+}
+
+static void ethip_nic_cb_conn(ipc_call_t *icall, void *arg)
 {
         ethip_nic_t *nic = (ethip_nic_t *)arg;
@@ -300 +297 @@
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                async_get_call(&call);
 
                 if (!IPC_GET_IMETHOD(call)) {
@@ -309 +306 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case NIC_EV_ADDR_CHANGED:
-                        ethip_nic_addr_changed(nic, chandle, &call);
+                        ethip_nic_addr_changed(nic, &call);
                         break;
                 case NIC_EV_RECEIVED:
-                        ethip_nic_received(nic, chandle, &call);
+                        ethip_nic_received(nic, &call);
                         break;
                 case NIC_EV_DEVICE_STATE:
-                        ethip_nic_device_state(nic, chandle, &call);
+                        ethip_nic_device_state(nic, &call);
                         break;
                 default:
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "unknown IPC method: %" PRIun, IPC_GET_IMETHOD(call));
-                        async_answer_0(chandle, ENOTSUP);
+                        async_answer_0(&call, ENOTSUP);
                 }
         }