Changeset 984a9ba in mainline for uspace/lib/drv/generic/remote_ieee80211.c

Timestamp:

2018-07-05T09:34:09Z (6 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/lib/drv/generic/remote_ieee80211.c (modified) (4 diffs)

uspace/lib/drv/generic/remote_ieee80211.c

@@ -268 +268 @@
 
 static void remote_ieee80211_get_scan_results(ddf_fun_t *fun, void *iface,
-    cap_call_handle_t chandle, ipc_call_t *call)
+    ipc_call_t *call)
 {
         ieee80211_iface_t *ieee80211_iface = (ieee80211_iface_t *) iface;
@@ -280 +280 @@
         errno_t rc = ieee80211_iface->get_scan_results(fun, &scan_results, now);
         if (rc == EOK) {
-                cap_call_handle_t data_chandle;
+                ipc_call_t data;
                 size_t max_len;
-                if (!async_data_read_receive(&data_chandle, &max_len)) {
-                        async_answer_0(data_chandle, EINVAL);
-                        async_answer_0(chandle, EINVAL);
+                if (!async_data_read_receive(&data, &max_len)) {
+                        async_answer_0(&data, EINVAL);
+                        async_answer_0(call, EINVAL);
                         return;
                 }
 
                 if (max_len < sizeof(ieee80211_scan_results_t)) {
-                        async_answer_0(data_chandle, ELIMIT);
-                        async_answer_0(chandle, ELIMIT);
+                        async_answer_0(&data, ELIMIT);
+                        async_answer_0(call, ELIMIT);
                         return;
                 }
 
-                async_data_read_finalize(data_chandle, &scan_results,
+                async_data_read_finalize(&data, &scan_results,
                     sizeof(ieee80211_scan_results_t));
         }
 
-        async_answer_0(chandle, rc);
+        async_answer_0(call, rc);
 }
 
 static void remote_ieee80211_connect(ddf_fun_t *fun, void *iface,
-    cap_call_handle_t chandle, ipc_call_t *call)
+    ipc_call_t *call)
 {
         ieee80211_iface_t *ieee80211_iface = (ieee80211_iface_t *) iface;
@@ -310 +310 @@
         char password[MAX_STRING_SIZE];
 
-        cap_call_handle_t data_chandle;
+        ipc_call_t data;
         size_t len;
-        if (!async_data_write_receive(&data_chandle, &len)) {
-                async_answer_0(data_chandle, EINVAL);
-                async_answer_0(chandle, EINVAL);
+        if (!async_data_write_receive(&data, &len)) {
+                async_answer_0(&data, EINVAL);
+                async_answer_0(call, EINVAL);
                 return;
         }
 
         if (len > MAX_STRING_SIZE) {
-                async_answer_0(data_chandle, EINVAL);
-                async_answer_0(chandle, EINVAL);
-                return;
-        }
-
-        errno_t rc = async_data_write_finalize(data_chandle, ssid_start, len);
+                async_answer_0(&data, EINVAL);
+                async_answer_0(call, EINVAL);
+                return;
+        }
+
+        errno_t rc = async_data_write_finalize(&data, ssid_start, len);
         if (rc != EOK) {
-                async_answer_0(data_chandle, EINVAL);
-                async_answer_0(chandle, EINVAL);
-                return;
-        }
-
-        if (!async_data_write_receive(&data_chandle, &len)) {
-                async_answer_0(data_chandle, EINVAL);
-                async_answer_0(chandle, EINVAL);
+                async_answer_0(&data, EINVAL);
+                async_answer_0(call, EINVAL);
+                return;
+        }
+
+        if (!async_data_write_receive(&data, &len)) {
+                async_answer_0(&data, EINVAL);
+                async_answer_0(call, EINVAL);
                 return;
         }
 
         if (len > MAX_STRING_SIZE) {
-                async_answer_0(data_chandle, EINVAL);
-                async_answer_0(chandle, EINVAL);
-                return;
-        }
-
-        rc = async_data_write_finalize(data_chandle, password, len);
+                async_answer_0(&data, EINVAL);
+                async_answer_0(call, EINVAL);
+                return;
+        }
+
+        rc = async_data_write_finalize(&data, password, len);
         if (rc != EOK) {
-                async_answer_0(data_chandle, EINVAL);
-                async_answer_0(chandle, EINVAL);
+                async_answer_0(&data, EINVAL);
+                async_answer_0(call, EINVAL);
                 return;
         }
@@ -352 +352 @@
         rc = ieee80211_iface->connect(fun, ssid_start, password);
 
-        async_answer_0(chandle, rc);
+        async_answer_0(call, rc);
 }
 
 static void remote_ieee80211_disconnect(ddf_fun_t *fun, void *iface,
-    cap_call_handle_t chandle, ipc_call_t *call)
+    ipc_call_t *call)
 {
         ieee80211_iface_t *ieee80211_iface = (ieee80211_iface_t *) iface;
         assert(ieee80211_iface->disconnect);
         errno_t rc = ieee80211_iface->disconnect(fun);
-        async_answer_0(chandle, rc);
+        async_answer_0(call, rc);
 }