]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
WPS: Parse Registrar Configuration Methods
authorRahul Jain <rahul.jain@samsung.com>
Wed, 26 Feb 2014 12:09:49 +0000 (17:39 +0530)
committerJouni Malinen <j@w1.fi>
Wed, 5 Mar 2014 21:26:16 +0000 (23:26 +0200)
This new subelement was added into the WFA Vendor Extension.

Signed-off-by: Rahul Jain <rahul.jain@samsung.com>
src/wps/wps_attr_parse.c
src/wps/wps_attr_parse.h
src/wps/wps_defs.h

index 1ebcfe9d22b2df4ba16a5d4b95997f2e1ec1e251..40bc1ad2d2c5bd665669e138775d4061b72454f8 100644 (file)
@@ -59,6 +59,14 @@ static int wps_set_vendor_ext_wfa_subelem(struct wps_parse_attr *attr,
                }
                attr->settings_delay_time = pos;
                break;
+       case WFA_ELEM_REGISTRAR_CONFIGURATION_METHODS:
+               if (len != 2) {
+                       wpa_printf(MSG_DEBUG, "WPS: Invalid Registrar Configuration Methods length %u",
+                                  len);
+                       return -1;
+               }
+               attr->registrar_configuration_methods = pos;
+               break;
        default:
                wpa_printf(MSG_MSGDUMP, "WPS: Skipped unknown WFA Vendor "
                           "Extension subelement %u", id);
index eeb08d12d9a6f44d6cfcb7c668c92542333dda84..82c4739f61f530a1b3e790be1c96a323cdb41f5a 100644 (file)
@@ -55,6 +55,7 @@ struct wps_parse_attr {
        const u8 *network_key_shareable; /* 1 octet (Bool) */
        const u8 *request_to_enroll; /* 1 octet (Bool) */
        const u8 *ap_channel; /* 2 octets */
+       const u8 *registrar_configuration_methods; /* 2 octets */
 
        /* variable length fields */
        const u8 *manufacturer;
index 6f8a49f04a5e8092377e7c76c6096c1527b87c1b..e125048ca5b9c033252f296f4e44d8f0a55de59a 100644 (file)
@@ -146,7 +146,8 @@ enum {
        WFA_ELEM_AUTHORIZEDMACS = 0x01,
        WFA_ELEM_NETWORK_KEY_SHAREABLE = 0x02,
        WFA_ELEM_REQUEST_TO_ENROLL = 0x03,
-       WFA_ELEM_SETTINGS_DELAY_TIME = 0x04
+       WFA_ELEM_SETTINGS_DELAY_TIME = 0x04,
+       WFA_ELEM_REGISTRAR_CONFIGURATION_METHODS = 0x05
 };
 
 /* Device Password ID */