From c667342933ca3a66305abfd89434292cdb863e51 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Thu, 28 Feb 2013 18:43:05 +0200 Subject: [PATCH] Add WPA_BSS_MASK_DELIM flag to BSS command This flag will add ==== delimiter between to separate bss results. Unlike the other BSS command MASK values, this delimiter is not included by default to avoid issues with existing users of the BSS command. Signed-off-by: Dmitry Shmidt --- src/common/wpa_ctrl.h | 3 ++- wpa_supplicant/ctrl_iface.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/common/wpa_ctrl.h b/src/common/wpa_ctrl.h index 46e8dc75b..ce1c3a6f8 100644 --- a/src/common/wpa_ctrl.h +++ b/src/common/wpa_ctrl.h @@ -151,7 +151,7 @@ extern "C" { /* BSS command information masks */ -#define WPA_BSS_MASK_ALL 0xFFFFFFFF +#define WPA_BSS_MASK_ALL 0xFFFDFFFF #define WPA_BSS_MASK_ID BIT(0) #define WPA_BSS_MASK_BSSID BIT(1) #define WPA_BSS_MASK_FREQ BIT(2) @@ -169,6 +169,7 @@ extern "C" { #define WPA_BSS_MASK_P2P_SCAN BIT(14) #define WPA_BSS_MASK_INTERNETW BIT(15) #define WPA_BSS_MASK_WIFI_DISPLAY BIT(16) +#define WPA_BSS_MASK_DELIM BIT(17) /* wpa_supplicant/hostapd control interface access */ diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 87467b801..65a769e53 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -3225,6 +3225,13 @@ static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss, } #endif /* CONFIG_INTERWORKING */ + if (mask & WPA_BSS_MASK_DELIM) { + ret = os_snprintf(pos, end - pos, "====\n"); + if (ret < 0 || ret >= end - pos) + return 0; + pos += ret; + } + return pos - buf; }