Changeset 1dcc0b9 in mainline for uspace/drv/nic/ar9271/wmi.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/drv/nic/ar9271/wmi.c (modified) (2 diffs)

uspace/drv/nic/ar9271/wmi.c

@@ -231 +231 @@
         size_t buffer_size = header_size + command_length;
         void *buffer = malloc(buffer_size);
-        memcpy(buffer+header_size, command_buffer, command_length);
+        
+        if(command_buffer != NULL) {
+                memcpy(buffer+header_size, command_buffer, command_length);
+        }
         
         /* Set up WMI header */
@@ -261 +264 @@
         
         /* Read response. */
-        rc = htc_read_control_message(htc_device, response_buffer, 
-                response_buffer_size, NULL);
-        if(rc != EOK) {
-                free(buffer);
-                usb_log_error("Failed to receive WMI message response. "
-                    "Error: %d\n", rc);
-                return rc;
-        }
+        /* TODO: Ignoring WMI management RX messages ~ TX statuses etc. */
+        uint16_t cmd_id;
+        do {
+                rc = htc_read_control_message(htc_device, response_buffer, 
+                        response_buffer_size, NULL);
+                if(rc != EOK) {
+                        free(buffer);
+                        usb_log_error("Failed to receive WMI message response. "
+                            "Error: %d\n", rc);
+                        return rc;
+                }
+                
+                if(response_buffer_size < sizeof(htc_frame_header_t) + 
+                        sizeof(wmi_command_header_t)) {
+                        free(buffer);
+                        usb_log_error("Corrupted response received.\n");
+                        return EINVAL;
+                }
+                
+                wmi_command_header_t *wmi_hdr = (wmi_command_header_t *) 
+                        ((void*) response_buffer + sizeof(htc_frame_header_t));
+                cmd_id = uint16_t_be2host(wmi_hdr->command_id);
+        } while(cmd_id & WMI_MGMT_CMD_MASK);
         
         if(clean_resp_buffer) {