WNM: Additional BSS Transition Management capability

[thirdparty/hostap.git] / src / ap / ieee802_11_shared.c

diff --git a/src/ap/ieee802_11_shared.c b/src/ap/ieee802_11_shared.c
index 0935cd501b4d1085db8ba957b8d63590cc5a5d0c..76f78a7dbd9c1fde8f1eac7bfa2acadb42aef97d 100644 (file)
--- a/src/ap/ieee802_11_shared.c
+++ b/src/ap/ieee802_11_shared.c
@@ -1,6 +1,6 @@
 /*
  * hostapd / IEEE 802.11 Management
- * Copyright (c) 2002-2010, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2002-2012, Jouni Malinen <j@w1.fi>
  *
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
@@ -173,6 +173,14 @@ u8 * hostapd_eid_ext_capab(struct hostapd_data *hapd, u8 *eid)
                len = 5;
        if (len < 4 && hapd->conf->interworking)
                len = 4;
+       if (len < 3 && hapd->conf->wnm_sleep_mode)
+               len = 3;
+       if (len < 7 && hapd->conf->ssid.utf8_ssid)
+               len = 7;
+#ifdef CONFIG_WNM
+       if (len < 4)
+               len = 4;
+#endif /* CONFIG_WNM */
        if (len == 0)
                return eid;
 
@@ -180,9 +188,20 @@ u8 * hostapd_eid_ext_capab(struct hostapd_data *hapd, u8 *eid)
        *pos++ = len;
        *pos++ = 0x00;
        *pos++ = 0x00;
-       *pos++ = 0x00;
 
        *pos = 0x00;
+       if (hapd->conf->wnm_sleep_mode)
+               *pos |= 0x02; /* Bit 17 - WNM-Sleep Mode */
+       if (hapd->conf->bss_transition)
+               *pos |= 0x08; /* Bit 19 - BSS Transition */
+       pos++;
+
+       if (len < 4)
+               return pos;
+       *pos = 0x00;
+#ifdef CONFIG_WNM
+       *pos |= 0x02; /* Bit 25 - SSID List */
+#endif /* CONFIG_WNM */
        if (hapd->conf->time_advertisement == 2)
                *pos |= 0x08; /* Bit 27 - UTC TSF Offset */
        if (hapd->conf->interworking)
@@ -198,6 +217,18 @@ u8 * hostapd_eid_ext_capab(struct hostapd_data *hapd, u8 *eid)
                *pos |= 0x80; /* Bit 39 - TDLS Channel Switching Prohibited */
        pos++;
 
+       if (len < 6)
+               return pos;
+       *pos = 0x00;
+       pos++;
+
+       if (len < 7)
+               return pos;
+       *pos = 0x00;
+       if (hapd->conf->ssid.utf8_ssid)
+               *pos |= 0x01; /* Bit 48 - UTF-8 SSID */
+       pos++;
+
        return pos;
 }
 
@@ -397,3 +428,31 @@ int hostapd_update_time_adv(struct hostapd_data *hapd)
 
        return 0;
 }
+
+
+u8 * hostapd_eid_bss_max_idle_period(struct hostapd_data *hapd, u8 *eid)
+{
+       u8 *pos = eid;
+
+#ifdef CONFIG_WNM
+       if (hapd->conf->ap_max_inactivity > 0) {
+               unsigned int val;
+               *pos++ = WLAN_EID_BSS_MAX_IDLE_PERIOD;
+               *pos++ = 3;
+               val = hapd->conf->ap_max_inactivity;
+               if (val > 68000)
+                       val = 68000;
+               val *= 1000;
+               val /= 1024;
+               if (val == 0)
+                       val = 1;
+               if (val > 65535)
+                       val = 65535;
+               WPA_PUT_LE16(pos, val);
+               pos += 2;
+               *pos++ = 0x00; /* TODO: Protected Keep-Alive Required */
+       }
+#endif /* CONFIG_WNM */
+
+       return pos;
+}