Changeset 1dcc0b9 in mainline for uspace/lib/drv/generic/remote_ieee80211.c

Timestamp:

2015-04-06T10:47:51Z (10 years ago)

Author:

Jan Kolarik <kolarik@…>

Branches:

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

Children:

d7dadcb4

Parents:

59fa7ab

Message:

Scanning whole 2.4GHz spectrum, created supplicant for managing connection between device STA and AP, finished association process between STA and AP, handling 4way handshake protocol used for key management, written needed cryptographic algorithms (AES, SHA1, HMAC, PBKDF2) for CCMP protocol, data communication on OPEN/CCMP networks.

File:

• uspace/lib/drv/generic/remote_ieee80211.c (modified) (13 diffs)

uspace/lib/drv/generic/remote_ieee80211.c

@@ -47 +47 @@
 typedef enum {
         IEEE80211_GET_SCAN_RESULTS,
-        IEEE80211_CONNECT
+        IEEE80211_CONNECT,
+        IEEE80211_DISCONNECT
 } ieee80211_funcs_t;
 
@@ -59 +60 @@
  */
 int ieee80211_get_scan_results(async_sess_t *dev_sess, 
-        ieee80211_scan_results_t *results)
+        ieee80211_scan_results_t *results, bool now)
 {
         assert(results);
@@ -65 +66 @@
         async_exch_t *exch = async_exchange_begin(dev_sess);
         
-        aid_t aid = async_send_1(exch, DEV_IFACE_ID(IEEE80211_DEV_IFACE),
-            IEEE80211_GET_SCAN_RESULTS, NULL);
+        aid_t aid = async_send_2(exch, DEV_IFACE_ID(IEEE80211_DEV_IFACE),
+            IEEE80211_GET_SCAN_RESULTS, now, NULL);
         int rc = async_data_read_start(exch, results, sizeof(ieee80211_scan_results_t));
         async_exchange_end(exch);
@@ -73 +74 @@
         async_wait_for(aid, &res);
         
-        if (rc != EOK)
+        if(res != EOK)
+                return (int) res;
+        else
                 return rc;
-        
-        return (int) res;
 }
 
@@ -82 +83 @@
  *
  * @param[in] dev_sess Device session.
- * @param[in] ssid Network SSID.
+ * @param[in] ssid_start Network SSID prefix.
  * @param[in] password Network password (pass empty string if not needed).
  *
@@ -88 +89 @@
  * negative error code otherwise.
  */
-int ieee80211_connect(async_sess_t *dev_sess, char *ssid, char *password)
-{
-        assert(ssid);
+int ieee80211_connect(async_sess_t *dev_sess, char *ssid_start, char *password)
+{
+        assert(ssid_start);
         
         sysarg_t rc_orig;
@@ -99 +100 @@
             IEEE80211_CONNECT, NULL);
         
-        sysarg_t rc = async_data_write_start(exch, ssid, str_size(ssid) + 1);
+        sysarg_t rc = async_data_write_start(exch, ssid_start, 
+                str_size(ssid_start) + 1);
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -132 +134 @@
 }
 
+/** Disconnect device from network.
+ *
+ * @param[in] dev_sess Device session.
+ *
+ * @return EOK If the operation was successfully completed,
+ * negative error code otherwise.
+ */
+int ieee80211_disconnect(async_sess_t *dev_sess)
+{
+        async_exch_t *exch = async_exchange_begin(dev_sess);
+        int rc = async_req_1_0(exch, DEV_IFACE_ID(IEEE80211_DEV_IFACE),
+            IEEE80211_DISCONNECT);
+        async_exchange_end(exch);
+        
+        return rc;
+}
+
 static void remote_ieee80211_get_scan_results(ddf_fun_t *fun, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -141 +160 @@
         memset(&scan_results, 0, sizeof(ieee80211_scan_results_t));
         
-        int rc = ieee80211_iface->get_scan_results(fun, &scan_results);
+        bool now = IPC_GET_ARG2(*call);
+        
+        int rc = ieee80211_iface->get_scan_results(fun, &scan_results, now);
         if (rc == EOK) {
                 ipc_callid_t data_callid;
@@ -170 +191 @@
         assert(ieee80211_iface->connect);
         
-        char ssid[MAX_STRING_SIZE];
+        char ssid_start[MAX_STRING_SIZE];
         char password[MAX_STRING_SIZE];
         
@@ -187 +208 @@
         }
         
-        int rc = async_data_write_finalize(data_callid, ssid, len);
+        int rc = async_data_write_finalize(data_callid, ssid_start, len);
         if (rc != EOK) {
                 async_answer_0(data_callid, EINVAL);
@@ -213 +234 @@
         }
         
-        rc = ieee80211_iface->connect(fun, ssid, password);
-        
+        rc = ieee80211_iface->connect(fun, ssid_start, password);
+        
+        async_answer_0(callid, rc);
+}
+
+static void remote_ieee80211_disconnect(ddf_fun_t *fun, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        ieee80211_iface_t *ieee80211_iface = (ieee80211_iface_t *) iface;
+        assert(ieee80211_iface->disconnect);
+        int rc = ieee80211_iface->disconnect(fun);
         async_answer_0(callid, rc);
 }
@@ -223 +253 @@
 static const remote_iface_func_ptr_t remote_ieee80211_iface_ops[] = {
         [IEEE80211_GET_SCAN_RESULTS] = remote_ieee80211_get_scan_results,
-        [IEEE80211_CONNECT] = remote_ieee80211_connect
+        [IEEE80211_CONNECT] = remote_ieee80211_connect,
+        [IEEE80211_DISCONNECT] = remote_ieee80211_disconnect
 };