OSDN Git Service

Add 'get country' command
authorDmitry Shmidt <dimitrysh@google.com>
Tue, 19 Apr 2011 23:42:47 +0000 (16:42 -0700)
committerDmitry Shmidt <dimitrysh@google.com>
Mon, 9 May 2011 21:24:53 +0000 (14:24 -0700)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
wpa_supplicant/ctrl_iface.c

index f35d262..82e1c04 100644 (file)
@@ -140,18 +140,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;
 }