From: Jouni Malinen Date: Thu, 28 Feb 2013 16:49:33 +0000 (+0200) Subject: Avoid partial BSS entries in control interface X-Git-Tag: aosp-kk-from-upstream~524 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff4869136848d33c3386e312568153b4743ed8b9;p=thirdparty%2Fhostap.git Avoid partial BSS entries in control interface Most of the print_bss_info() cases were already returning zero lenth to avoid returning partial returns to the BSS commands, but the HS 2.0 and Wi-Fi Display entries behaved differently. Make those consistent with rest of the items. Signed-hostap: Jouni Malinen --- diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index f8e0f3e49..06efd2c5a 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -3134,7 +3134,7 @@ static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss, if (wpa_bss_get_vendor_ie(bss, HS20_IE_VENDOR_TYPE)) { ret = os_snprintf(pos, end - pos, "[HS20]"); if (ret < 0 || ret >= end - pos) - return -1; + return 0; pos += ret; } #endif /* CONFIG_HS20 */ @@ -3182,7 +3182,7 @@ static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss, if (wfd) { ret = os_snprintf(pos, end - pos, "wfd_subelems="); if (ret < 0 || ret >= end - pos) - return pos - buf; + return 0; pos += ret; pos += wpa_snprintf_hex(pos, end - pos, @@ -3192,7 +3192,7 @@ static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss, ret = os_snprintf(pos, end - pos, "\n"); if (ret < 0 || ret >= end - pos) - return pos - buf; + return 0; pos += ret; } }