Changeset 984a9ba in mainline for uspace/srv/net/dhcp/main.c

Timestamp:

2018-07-05T09:34:09Z (7 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.

File:

• uspace/srv/net/dhcp/main.c (modified) (6 diffs)

uspace/srv/net/dhcp/main.c

@@ -50 +50 @@
 #define NAME  "dhcp"
 
-static void dhcp_client_conn(cap_call_handle_t, ipc_call_t *, void *);
+static void dhcp_client_conn(ipc_call_t *, void *);
 
 static errno_t dhcp_init(void)
@@ -84 +84 @@
 }
 
-static void dhcp_link_add_srv(cap_call_handle_t chandle, ipc_call_t *call)
+static void dhcp_link_add_srv(ipc_call_t *call)
 {
         sysarg_t link_id;
@@ -94 +94 @@
 
         rc = dhcpsrv_link_add(link_id);
-        async_answer_0(chandle, rc);
+        async_answer_0(call, rc);
 }
 
-static void dhcp_link_remove_srv(cap_call_handle_t chandle, ipc_call_t *call)
+static void dhcp_link_remove_srv(ipc_call_t *call)
 {
         sysarg_t link_id;
@@ -107 +107 @@
 
         rc = dhcpsrv_link_remove(link_id);
-        async_answer_0(chandle, rc);
+        async_answer_0(call, rc);
 }
 
-static void dhcp_discover_srv(cap_call_handle_t chandle, ipc_call_t *call)
+static void dhcp_discover_srv(ipc_call_t *call)
 {
         sysarg_t link_id;
@@ -120 +120 @@
 
         rc = dhcpsrv_discover(link_id);
-        async_answer_0(chandle, rc);
+        async_answer_0(call, rc);
 }
 
-static void dhcp_client_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+static void dhcp_client_conn(ipc_call_t *icall, void *arg)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcp_client_conn()");
 
         /* Accept the connection */
-        async_answer_0(icall_handle, EOK);
+        async_answer_0(icall, EOK);
 
         while (true) {
                 ipc_call_t call;
-                cap_call_handle_t chandle = async_get_call(&call);
+                async_get_call(&call);
                 sysarg_t method = IPC_GET_IMETHOD(call);
 
                 if (!method) {
                         /* The other side has hung up */
-                        async_answer_0(chandle, EOK);
+                        async_answer_0(&call, EOK);
                         return;
                 }
@@ -143 +143 @@
                 switch (method) {
                 case DHCP_LINK_ADD:
-                        dhcp_link_add_srv(chandle, &call);
+                        dhcp_link_add_srv(&call);
                         break;
                 case DHCP_LINK_REMOVE:
-                        dhcp_link_remove_srv(chandle, &call);
+                        dhcp_link_remove_srv(&call);
                         break;
                 case DHCP_DISCOVER:
-                        dhcp_discover_srv(chandle, &call);
+                        dhcp_discover_srv(&call);
                         break;
                 default:
-                        async_answer_0(chandle, EINVAL);
+                        async_answer_0(&call, EINVAL);
                 }
         }