diff options
| author | Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> | 2012-04-20 15:18:34 +0300 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-04-23 10:49:04 +0300 |
| commit | 26694acdacf8fc5e402bea044bd166677531c423 (patch) | |
| tree | f8b8de5366f311735dd5b078d1db6ef953dd2984 | |
| parent | d9724d24b091a9412992cc6883ca6a225fa1a88c (diff) | |
| download | connman-26694acdacf8fc5e402bea044bd166677531c423.tar.gz connman-26694acdacf8fc5e402bea044bd166677531c423.tar.bz2 connman-26694acdacf8fc5e402bea044bd166677531c423.zip | |
gsupplicant: Add WPS specific capabilities parsing for BSS
| -rw-r--r-- | gsupplicant/gsupplicant.h | 5 | ||||
| -rw-r--r-- | gsupplicant/supplicant.c | 37 |
2 files changed, 38 insertions, 4 deletions
diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h index 03df6ca8..d5f5a29e 100644 --- a/gsupplicant/gsupplicant.h +++ b/gsupplicant/gsupplicant.h @@ -75,6 +75,11 @@ extern "C" { #define G_SUPPLICANT_MAX_FAST_SCAN 4 +#define G_SUPPLICANT_WPS_CONFIGURED (1 << 0) +#define G_SUPPLICANT_WPS_PBC (1 << 1) +#define G_SUPPLICANT_WPS_PIN (1 << 2) +#define G_SUPPLICANT_WPS_REGISTRAR (1 << 3) + typedef enum { G_SUPPLICANT_MODE_UNKNOWN, G_SUPPLICANT_MODE_INFRA, diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index c5a2da72..b44ea69a 100644 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -188,6 +188,7 @@ struct g_supplicant_bss { dbus_bool_t privacy; dbus_bool_t psk; dbus_bool_t ieee8021x; + unsigned int wps_capabilities; }; struct _GSupplicantNetwork { @@ -1248,13 +1249,19 @@ static void bss_process_ies(DBusMessageIter *iter, void *user_data) const unsigned char WPS_OUI[] = { 0x00, 0x50, 0xf2, 0x04 }; unsigned char *ie, *ie_end; DBusMessageIter array; + unsigned int value; int ie_len; #define WMM_WPA1_WPS_INFO 221 #define WPS_INFO_MIN_LEN 6 #define WPS_VERSION_TLV 0x104A #define WPS_STATE_TLV 0x1044 +#define WPS_METHODS_TLV 0x1012 +#define WPS_REGISTRAR_TLV 0x1041 #define WPS_VERSION 0x10 +#define WPS_PBC 0x04 +#define WPS_PIN 0x00 +#define WPS_CONFIGURED 0x02 dbus_message_iter_recurse(iter, &array); dbus_message_iter_get_fixed_array(&array, &ie, &ie_len); @@ -1271,11 +1278,33 @@ static void bss_process_ies(DBusMessageIter *iter, void *user_data) SUPPLICANT_DBG("IE: match WPS_OUI"); - if (get_tlv(&ie[6], ie[1], - WPS_VERSION_TLV) == WPS_VERSION && - get_tlv(&ie[6], ie[1], - WPS_STATE_TLV) != 0) + value = get_tlv(&ie[6], ie[1], WPS_STATE_TLV); + if (get_tlv(&ie[6], ie[1], WPS_VERSION_TLV) == WPS_VERSION && + value != 0) { bss->keymgmt |= G_SUPPLICANT_KEYMGMT_WPS; + + if (value == WPS_CONFIGURED) + bss->wps_capabilities |= + G_SUPPLICANT_WPS_CONFIGURED; + } + + value = get_tlv(&ie[6], ie[1], WPS_METHODS_TLV); + if (value != 0) { + if (GUINT16_FROM_BE(value) == WPS_PBC) + bss->wps_capabilities |= G_SUPPLICANT_WPS_PBC; + if (GUINT16_FROM_BE(value) == WPS_PIN) + bss->wps_capabilities |= G_SUPPLICANT_WPS_PIN; + } else + bss->wps_capabilities |= + G_SUPPLICANT_WPS_PBC | G_SUPPLICANT_WPS_PIN; + + /* If the AP sends this it means it's advertizing + * as a registrar and the WPS process is launched + * on its side */ + if (get_tlv(&ie[6], ie[1], WPS_REGISTRAR_TLV) != 0) + bss->wps_capabilities |= G_SUPPLICANT_WPS_REGISTRAR; + + SUPPLICANT_DBG("WPS Methods 0x%x", bss->wps_capabilities); } } |