Optimize Extended Capabilities element to be of minimal length

Leave out zero octets from the end of the element.

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/src/ap/ieee802_11_shared.c b/src/ap/ieee802_11_shared.c
index e59ac1322280d976fddb4fc258a50abe1a826b06..c36bbe39916a78ff0494df0b08fe84a7b6d459b4 100644 (file)
--- a/src/ap/ieee802_11_shared.c
+++ b/src/ap/ieee802_11_shared.c
@@ -239,7 +239,14 @@ u8 * hostapd_eid_ext_capab(struct hostapd_data *hapd, u8 *eid)
                }
        }
 
-       return pos;
+       while (len > 0 && eid[1 + len] == 0) {
+               len--;
+               eid[1] = len;
+       }
+       if (len == 0)
+               return eid;
+
+       return eid + 2 + len;
 }
 
 

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index cac824426e33b0d334ab138f753cd9587deb729d..c6b45f3b2df0c5ed8429a0bdb14e6fc988221afc 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1231,7 +1231,14 @@ int wpas_build_ext_capab(struct wpa_supplicant *wpa_s, u8 *buf)
                }
        }
 
-       return pos - buf;
+       while (len > 0 && buf[1 + len] == 0) {
+               len--;
+               buf[1] = len;
+       }
+       if (len == 0)
+               return 0;
+
+       return 2 + len;
 }