From: Dmitry Shmidt <dimitrysh@google.com>
Date: Tue, 19 Apr 2011 23:42:47 +0000 (-0700)
Subject: Add 'get country' command
X-Git-Tag: aosp-jb-start~273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ce937b8cf3012784a172a904ace27bb87cb69f8;p=thirdparty%2Fhostap.git

Add 'get country' command

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 06061090b..b2789bedb 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -142,18 +142,22 @@ static int wpa_supplicant_ctrl_iface_set(struct wpa_supplicant *wpa_s,
 static int wpa_supplicant_ctrl_iface_get(struct wpa_supplicant *wpa_s,
 					 char *cmd, char *buf, size_t buflen)
 {
-	int res;
+	int res = -1;
 
 	wpa_printf(MSG_DEBUG, "CTRL_IFACE GET '%s'", cmd);
 
 	if (os_strcmp(cmd, "version") == 0) {
 		res = os_snprintf(buf, buflen, "%s", VERSION_STR);
-		if (res < 0 || (unsigned int) res >= buflen)
-			return -1;
-		return res;
+	} else if (os_strcasecmp(cmd, "country") == 0) {
+		if (wpa_s->conf->country[0] && wpa_s->conf->country[1])
+			res = os_snprintf(buf, buflen, "%c%c",
+					  wpa_s->conf->country[0],
+					  wpa_s->conf->country[1]);
 	}
 
-	return -1;
+	if (res < 0 || (unsigned int) res >= buflen)
+		return -1;
+	return res;
 }