commit 6f3bdcf8c96ad38245e927ac1afe28b98621a4e5
author Dmitry Shmidt <dimitrysh@google.com> Tue Apr 19 16:42:47 2011 -0700
committer Dmitry Shmidt <dimitrysh@google.com> Mon May 09 14:24:53 2011 -0700
tree 5cfc4690e29646db54cd04d0c36dbc32eabbf99c
parent 696359e14f6a38ce3cecb98021562c0252021960

Add 'get country' command

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

wpa_supplicant/ctrl_iface.c

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index f35d262..82e1c04 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -140,18 +140,22 @@
 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;
 }