Patchwork Add capability flag for IBSS and add get_capabiliy modes

login
register
mail settings
Submitter Bruno Randolf
Date March 11, 2013, 5:57 p.m.
Message ID <1363024651-10370-1-git-send-email-br1@einfach.org>
Download mbox | patch
Permalink /patch/226625/
State Accepted
Commit 65d52fc1034a682e5a344ca410e914c64e7ccb07
Headers show

Comments

Bruno Randolf - March 11, 2013, 5:57 p.m.
Add a driver capability flag for drivers which support IBSS mode and set it for
nl80211 drivers which have set the NL80211_IFTYPE_ADHOC.

Add a new option "modes" to "get_capability" which will return "AP" and "IBSS"
if the corresponding capability flags are set.

The idea is that this can be used for UIs to find out if the driver supports
IBSS mode.

Signed-hostap: Bruno Randolf <br1@einfach.org>
---
 src/drivers/driver.h         |    2 ++
 src/drivers/driver_nl80211.c |    3 +++
 wpa_supplicant/ctrl_iface.c  |   43 ++++++++++++++++++++++++++++++++++++++++++
 wpa_supplicant/wpa_cli.c     |    2 +-
 4 files changed, 49 insertions(+), 1 deletion(-)
Jouni Malinen - March 16, 2013, 10:43 a.m.
On Mon, Mar 11, 2013 at 05:57:31PM +0000, Bruno Randolf wrote:
> Add a driver capability flag for drivers which support IBSS mode and set it for
> nl80211 drivers which have set the NL80211_IFTYPE_ADHOC.
> 
> Add a new option "modes" to "get_capability" which will return "AP" and "IBSS"
> if the corresponding capability flags are set.
> 
> The idea is that this can be used for UIs to find out if the driver supports
> IBSS mode.

Thanks, applied.

Patch

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 1a53db3..ab6907d 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -864,6 +864,8 @@  struct wpa_driver_capa {
 #define WPA_DRIVER_FLAGS_SAE				0x02000000
 /* Driver makes use of OBSS scan mechanism in wpa_supplicant */
 #define WPA_DRIVER_FLAGS_OBSS_SCAN			0x04000000
+/* Driver supports IBSS (Ad-hoc) mode */
+#define WPA_DRIVER_FLAGS_IBSS				0x08000000
 	unsigned int flags;
 
 	int max_scan_ssids;
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 4635d05..46775d1 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -2560,6 +2560,9 @@  static void wiphy_info_supported_iftypes(struct wiphy_info_data *info,
 		case NL80211_IFTYPE_AP:
 			info->capa->flags |= WPA_DRIVER_FLAGS_AP;
 			break;
+		case NL80211_IFTYPE_ADHOC:
+			info->capa->flags |= WPA_DRIVER_FLAGS_IBSS;
+			break;
 		case NL80211_IFTYPE_P2P_GO:
 			info->p2p_go_supported = 1;
 			break;
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index dc44ae4..7c53172 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -2849,6 +2849,45 @@  static int ctrl_iface_get_capability_auth_alg(int res, char *strict,
 	return pos - buf;
 }
 
+static int ctrl_iface_get_capability_modes(int res, char *strict,
+					      struct wpa_driver_capa *capa,
+					      char *buf, size_t buflen)
+{
+	int ret, first = 1;
+	char *pos, *end;
+	size_t len;
+
+	pos = buf;
+	end = pos + buflen;
+
+	if (res < 0) {
+		if (strict)
+			return 0;
+		len = os_strlcpy(buf, "IBSS AP", buflen);
+		if (len >= buflen)
+			return -1;
+		return len;
+	}
+
+	if (capa->flags & (WPA_DRIVER_FLAGS_IBSS)) {
+		ret = os_snprintf(pos, end - pos, "%sIBSS", first ? "" : " ");
+		if (ret < 0 || ret >= end - pos)
+			return pos - buf;
+		pos += ret;
+		first = 0;
+	}
+
+	if (capa->flags & (WPA_DRIVER_FLAGS_AP)) {
+		ret = os_snprintf(pos, end - pos, "%sAP",
+				  first ? "" : " ");
+		if (ret < 0 || ret >= end - pos)
+			return pos - buf;
+		pos += ret;
+		first = 0;
+	}
+
+	return pos - buf;
+}
 
 static int ctrl_iface_get_capability_channels(struct wpa_supplicant *wpa_s,
 					      char *buf, size_t buflen)
@@ -2950,6 +2989,10 @@  static int wpa_supplicant_ctrl_iface_get_capability(
 		return ctrl_iface_get_capability_auth_alg(res, strict, &capa,
 							  buf, buflen);
 
+	if (os_strcmp(field, "modes") == 0)
+		return ctrl_iface_get_capability_modes(res, strict, &capa,
+							  buf, buflen);
+
 	if (os_strcmp(field, "channels") == 0)
 		return ctrl_iface_get_capability_channels(wpa_s, buf, buflen);
 
diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index 133a077..9fb9d0b 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -2439,7 +2439,7 @@  static struct wpa_cli_cmd wpa_cli_commands[] = {
 	  "<<idx> | <bssid>> = get detailed scan result info" },
 	{ "get_capability", wpa_cli_cmd_get_capability, NULL,
 	  cli_cmd_flag_none,
-	  "<eap/pairwise/group/key_mgmt/proto/auth_alg/channels> "
+	  "<eap/pairwise/group/key_mgmt/proto/auth_alg/channels/modes> "
 	  "= get capabilies" },
 	{ "reconfigure", wpa_cli_cmd_reconfigure, NULL,
 	  cli_cmd_flag_none,