2008-02-27 20:34:43 -05:00
|
|
|
/*
|
|
|
|
* WPA Supplicant / Control interface (shared code for all backends)
|
2015-01-25 16:32:01 -05:00
|
|
|
* Copyright (c) 2004-2015, Jouni Malinen <j@w1.fi>
|
2008-02-27 20:34:43 -05:00
|
|
|
*
|
2012-02-11 09:46:35 -05:00
|
|
|
* This software may be distributed under the terms of the BSD license.
|
|
|
|
* See README for more details.
|
2008-02-27 20:34:43 -05:00
|
|
|
*/
|
|
|
|
|
2009-12-27 17:33:20 -05:00
|
|
|
#include "utils/includes.h"
|
2014-10-19 13:51:45 -04:00
|
|
|
#ifdef CONFIG_TESTING_OPTIONS
|
|
|
|
#include <net/ethernet.h>
|
|
|
|
#include <netinet/ip.h>
|
|
|
|
#endif /* CONFIG_TESTING_OPTIONS */
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2009-12-27 17:33:20 -05:00
|
|
|
#include "utils/common.h"
|
|
|
|
#include "utils/eloop.h"
|
2013-12-28 12:44:49 -05:00
|
|
|
#include "utils/uuid.h"
|
2010-10-31 11:07:31 -04:00
|
|
|
#include "common/version.h"
|
2009-12-27 17:33:20 -05:00
|
|
|
#include "common/ieee802_11_defs.h"
|
2012-03-02 10:26:01 -05:00
|
|
|
#include "common/ieee802_11_common.h"
|
2009-12-27 17:33:20 -05:00
|
|
|
#include "common/wpa_ctrl.h"
|
2015-01-11 08:37:38 -05:00
|
|
|
#include "crypto/tls.h"
|
2014-10-10 11:01:15 -04:00
|
|
|
#include "ap/hostapd.h"
|
2009-12-27 17:33:20 -05:00
|
|
|
#include "eap_peer/eap.h"
|
|
|
|
#include "eapol_supp/eapol_supp_sm.h"
|
2009-11-29 11:28:08 -05:00
|
|
|
#include "rsn_supp/wpa.h"
|
2009-12-27 17:33:20 -05:00
|
|
|
#include "rsn_supp/preauth.h"
|
|
|
|
#include "rsn_supp/pmksa_cache.h"
|
|
|
|
#include "l2_packet/l2_packet.h"
|
|
|
|
#include "wps/wps.h"
|
2008-02-27 20:34:43 -05:00
|
|
|
#include "config.h"
|
|
|
|
#include "wpa_supplicant_i.h"
|
2009-03-26 14:37:05 -04:00
|
|
|
#include "driver_i.h"
|
2008-11-29 13:59:45 -05:00
|
|
|
#include "wps_supplicant.h"
|
2009-01-14 18:21:55 -05:00
|
|
|
#include "ibss_rsn.h"
|
2009-04-21 09:45:16 -04:00
|
|
|
#include "ap.h"
|
2010-07-18 17:30:25 -04:00
|
|
|
#include "p2p_supplicant.h"
|
|
|
|
#include "p2p/p2p.h"
|
2011-09-08 13:52:23 -04:00
|
|
|
#include "hs20_supplicant.h"
|
2012-03-02 10:26:01 -05:00
|
|
|
#include "wifi_display.h"
|
2009-09-13 13:53:32 -04:00
|
|
|
#include "notify.h"
|
2009-12-27 17:33:20 -05:00
|
|
|
#include "bss.h"
|
2010-01-03 11:48:11 -05:00
|
|
|
#include "scan.h"
|
2009-12-27 17:33:20 -05:00
|
|
|
#include "ctrl_iface.h"
|
2011-10-16 15:44:28 -04:00
|
|
|
#include "interworking.h"
|
2011-10-18 13:11:52 -04:00
|
|
|
#include "blacklist.h"
|
2012-06-26 12:09:47 -04:00
|
|
|
#include "autoscan.h"
|
2012-12-16 05:29:10 -05:00
|
|
|
#include "wnm_sta.h"
|
2014-03-08 13:21:21 -05:00
|
|
|
#include "offchannel.h"
|
2014-09-10 13:34:56 -04:00
|
|
|
#include "drivers/driver.h"
|
2014-09-01 00:23:39 -04:00
|
|
|
#include "mesh.h"
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2008-12-24 13:25:19 -05:00
|
|
|
static int wpa_supplicant_global_iface_list(struct wpa_global *global,
|
|
|
|
char *buf, int len);
|
2008-02-27 20:34:43 -05:00
|
|
|
static int wpa_supplicant_global_iface_interfaces(struct wpa_global *global,
|
|
|
|
char *buf, int len);
|
2014-03-14 16:55:25 -04:00
|
|
|
static int * freq_range_to_channel_list(struct wpa_supplicant *wpa_s,
|
|
|
|
char *val);
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2012-02-16 09:30:13 -05:00
|
|
|
static int set_bssid_filter(struct wpa_supplicant *wpa_s, char *val)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
u8 addr[ETH_ALEN], *filter = NULL, *n;
|
|
|
|
size_t count = 0;
|
|
|
|
|
|
|
|
pos = val;
|
|
|
|
while (pos) {
|
|
|
|
if (*pos == '\0')
|
|
|
|
break;
|
2012-02-19 07:28:02 -05:00
|
|
|
if (hwaddr_aton(pos, addr)) {
|
|
|
|
os_free(filter);
|
2012-02-16 09:30:13 -05:00
|
|
|
return -1;
|
2012-02-19 07:28:02 -05:00
|
|
|
}
|
2012-08-13 14:21:23 -04:00
|
|
|
n = os_realloc_array(filter, count + 1, ETH_ALEN);
|
2012-02-16 09:30:13 -05:00
|
|
|
if (n == NULL) {
|
|
|
|
os_free(filter);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
filter = n;
|
|
|
|
os_memcpy(filter + count * ETH_ALEN, addr, ETH_ALEN);
|
|
|
|
count++;
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos)
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_hexdump(MSG_DEBUG, "bssid_filter", filter, count * ETH_ALEN);
|
|
|
|
os_free(wpa_s->bssid_filter);
|
|
|
|
wpa_s->bssid_filter = filter;
|
|
|
|
wpa_s->bssid_filter_count = count;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-09-27 10:36:59 -04:00
|
|
|
static int set_disallow_aps(struct wpa_supplicant *wpa_s, char *val)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
u8 addr[ETH_ALEN], *bssid = NULL, *n;
|
|
|
|
struct wpa_ssid_value *ssid = NULL, *ns;
|
|
|
|
size_t count = 0, ssid_count = 0;
|
|
|
|
struct wpa_ssid *c;
|
|
|
|
|
|
|
|
/*
|
2013-11-02 10:01:32 -04:00
|
|
|
* disallow_list ::= <ssid_spec> | <bssid_spec> | <disallow_list> | ""
|
2012-09-27 10:36:59 -04:00
|
|
|
* SSID_SPEC ::= ssid <SSID_HEX>
|
|
|
|
* BSSID_SPEC ::= bssid <BSSID_HEX>
|
|
|
|
*/
|
|
|
|
|
|
|
|
pos = val;
|
|
|
|
while (pos) {
|
|
|
|
if (*pos == '\0')
|
|
|
|
break;
|
|
|
|
if (os_strncmp(pos, "bssid ", 6) == 0) {
|
|
|
|
int res;
|
|
|
|
pos += 6;
|
|
|
|
res = hwaddr_aton2(pos, addr);
|
|
|
|
if (res < 0) {
|
|
|
|
os_free(ssid);
|
|
|
|
os_free(bssid);
|
|
|
|
wpa_printf(MSG_DEBUG, "Invalid disallow_aps "
|
|
|
|
"BSSID value '%s'", pos);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
pos += res;
|
|
|
|
n = os_realloc_array(bssid, count + 1, ETH_ALEN);
|
|
|
|
if (n == NULL) {
|
|
|
|
os_free(ssid);
|
|
|
|
os_free(bssid);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
bssid = n;
|
|
|
|
os_memcpy(bssid + count * ETH_ALEN, addr, ETH_ALEN);
|
|
|
|
count++;
|
|
|
|
} else if (os_strncmp(pos, "ssid ", 5) == 0) {
|
|
|
|
char *end;
|
|
|
|
pos += 5;
|
|
|
|
|
|
|
|
end = pos;
|
|
|
|
while (*end) {
|
|
|
|
if (*end == '\0' || *end == ' ')
|
|
|
|
break;
|
|
|
|
end++;
|
|
|
|
}
|
|
|
|
|
|
|
|
ns = os_realloc_array(ssid, ssid_count + 1,
|
|
|
|
sizeof(struct wpa_ssid_value));
|
|
|
|
if (ns == NULL) {
|
|
|
|
os_free(ssid);
|
|
|
|
os_free(bssid);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
ssid = ns;
|
|
|
|
|
|
|
|
if ((end - pos) & 0x01 || end - pos > 2 * 32 ||
|
|
|
|
hexstr2bin(pos, ssid[ssid_count].ssid,
|
|
|
|
(end - pos) / 2) < 0) {
|
|
|
|
os_free(ssid);
|
|
|
|
os_free(bssid);
|
|
|
|
wpa_printf(MSG_DEBUG, "Invalid disallow_aps "
|
|
|
|
"SSID value '%s'", pos);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
ssid[ssid_count].ssid_len = (end - pos) / 2;
|
|
|
|
wpa_hexdump_ascii(MSG_DEBUG, "disallow_aps SSID",
|
|
|
|
ssid[ssid_count].ssid,
|
|
|
|
ssid[ssid_count].ssid_len);
|
|
|
|
ssid_count++;
|
|
|
|
pos = end;
|
|
|
|
} else {
|
|
|
|
wpa_printf(MSG_DEBUG, "Unexpected disallow_aps value "
|
|
|
|
"'%s'", pos);
|
|
|
|
os_free(ssid);
|
|
|
|
os_free(bssid);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos)
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_hexdump(MSG_DEBUG, "disallow_aps_bssid", bssid, count * ETH_ALEN);
|
|
|
|
os_free(wpa_s->disallow_aps_bssid);
|
|
|
|
wpa_s->disallow_aps_bssid = bssid;
|
|
|
|
wpa_s->disallow_aps_bssid_count = count;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "disallow_aps_ssid_count %d", (int) ssid_count);
|
|
|
|
os_free(wpa_s->disallow_aps_ssid);
|
|
|
|
wpa_s->disallow_aps_ssid = ssid;
|
|
|
|
wpa_s->disallow_aps_ssid_count = ssid_count;
|
|
|
|
|
|
|
|
if (!wpa_s->current_ssid || wpa_s->wpa_state < WPA_AUTHENTICATING)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
c = wpa_s->current_ssid;
|
|
|
|
if (c->mode != WPAS_MODE_INFRA && c->mode != WPAS_MODE_IBSS)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!disallowed_bssid(wpa_s, wpa_s->bssid) &&
|
|
|
|
!disallowed_ssid(wpa_s, c->ssid, c->ssid_len))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "Disconnect and try to find another network "
|
|
|
|
"because current AP was marked disallowed");
|
|
|
|
|
|
|
|
#ifdef CONFIG_SME
|
|
|
|
wpa_s->sme.prev_bssid_set = 0;
|
|
|
|
#endif /* CONFIG_SME */
|
|
|
|
wpa_s->reassociate = 1;
|
|
|
|
wpa_supplicant_deauthenticate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);
|
|
|
|
wpa_supplicant_req_scan(wpa_s, 0, 0);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-03-15 17:51:37 -04:00
|
|
|
#ifndef CONFIG_NO_CONFIG_BLOBS
|
|
|
|
static int wpas_ctrl_set_blob(struct wpa_supplicant *wpa_s, char *pos)
|
|
|
|
{
|
|
|
|
char *name = pos;
|
|
|
|
struct wpa_config_blob *blob;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
len = os_strlen(pos);
|
|
|
|
if (len & 1)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL: Set blob '%s'", name);
|
|
|
|
blob = os_zalloc(sizeof(*blob));
|
|
|
|
if (blob == NULL)
|
|
|
|
return -1;
|
|
|
|
blob->name = os_strdup(name);
|
|
|
|
blob->data = os_malloc(len / 2);
|
|
|
|
if (blob->name == NULL || blob->data == NULL) {
|
|
|
|
wpa_config_free_blob(blob);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (hexstr2bin(pos, blob->data, len / 2) < 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL: Invalid blob hex data");
|
|
|
|
wpa_config_free_blob(blob);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
blob->len = len / 2;
|
|
|
|
|
|
|
|
wpa_config_set_blob(wpa_s->conf, blob);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_NO_CONFIG_BLOBS */
|
|
|
|
|
2014-03-14 16:55:25 -04:00
|
|
|
|
|
|
|
static int wpas_ctrl_pno(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *params;
|
|
|
|
char *pos;
|
|
|
|
int *freqs = NULL;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (atoi(cmd)) {
|
|
|
|
params = os_strchr(cmd, ' ');
|
|
|
|
os_free(wpa_s->manual_sched_scan_freqs);
|
|
|
|
if (params) {
|
|
|
|
params++;
|
|
|
|
pos = os_strstr(params, "freq=");
|
|
|
|
if (pos)
|
|
|
|
freqs = freq_range_to_channel_list(wpa_s,
|
|
|
|
pos + 5);
|
|
|
|
}
|
|
|
|
wpa_s->manual_sched_scan_freqs = freqs;
|
|
|
|
ret = wpas_start_pno(wpa_s);
|
|
|
|
} else {
|
|
|
|
ret = wpas_stop_pno(wpa_s);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
static int wpa_supplicant_ctrl_iface_set(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
char *value;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
value = os_strchr(cmd, ' ');
|
|
|
|
if (value == NULL)
|
|
|
|
return -1;
|
|
|
|
*value++ = '\0';
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE SET '%s'='%s'", cmd, value);
|
|
|
|
if (os_strcasecmp(cmd, "EAPOL::heldPeriod") == 0) {
|
|
|
|
eapol_sm_configure(wpa_s->eapol,
|
|
|
|
atoi(value), -1, -1, -1);
|
|
|
|
} else if (os_strcasecmp(cmd, "EAPOL::authPeriod") == 0) {
|
|
|
|
eapol_sm_configure(wpa_s->eapol,
|
|
|
|
-1, atoi(value), -1, -1);
|
|
|
|
} else if (os_strcasecmp(cmd, "EAPOL::startPeriod") == 0) {
|
|
|
|
eapol_sm_configure(wpa_s->eapol,
|
|
|
|
-1, -1, atoi(value), -1);
|
|
|
|
} else if (os_strcasecmp(cmd, "EAPOL::maxStart") == 0) {
|
|
|
|
eapol_sm_configure(wpa_s->eapol,
|
|
|
|
-1, -1, -1, atoi(value));
|
|
|
|
} else if (os_strcasecmp(cmd, "dot11RSNAConfigPMKLifetime") == 0) {
|
|
|
|
if (wpa_sm_set_param(wpa_s->wpa, RSNA_PMK_LIFETIME,
|
|
|
|
atoi(value)))
|
|
|
|
ret = -1;
|
|
|
|
} else if (os_strcasecmp(cmd, "dot11RSNAConfigPMKReauthThreshold") ==
|
|
|
|
0) {
|
|
|
|
if (wpa_sm_set_param(wpa_s->wpa, RSNA_PMK_REAUTH_THRESHOLD,
|
|
|
|
atoi(value)))
|
|
|
|
ret = -1;
|
|
|
|
} else if (os_strcasecmp(cmd, "dot11RSNAConfigSATimeout") == 0) {
|
|
|
|
if (wpa_sm_set_param(wpa_s->wpa, RSNA_SA_TIMEOUT, atoi(value)))
|
|
|
|
ret = -1;
|
2010-07-22 13:24:23 -04:00
|
|
|
} else if (os_strcasecmp(cmd, "wps_fragment_size") == 0) {
|
|
|
|
wpa_s->wps_fragment_size = atoi(value);
|
2010-09-21 22:51:23 -04:00
|
|
|
#ifdef CONFIG_WPS_TESTING
|
|
|
|
} else if (os_strcasecmp(cmd, "wps_version_number") == 0) {
|
|
|
|
long int val;
|
|
|
|
val = strtol(value, NULL, 0);
|
|
|
|
if (val < 0 || val > 0xff) {
|
|
|
|
ret = -1;
|
|
|
|
wpa_printf(MSG_DEBUG, "WPS: Invalid "
|
|
|
|
"wps_version_number %ld", val);
|
|
|
|
} else {
|
|
|
|
wps_version_number = val;
|
|
|
|
wpa_printf(MSG_DEBUG, "WPS: Testing - force WPS "
|
|
|
|
"version %u.%u",
|
|
|
|
(wps_version_number & 0xf0) >> 4,
|
|
|
|
wps_version_number & 0x0f);
|
|
|
|
}
|
|
|
|
} else if (os_strcasecmp(cmd, "wps_testing_dummy_cred") == 0) {
|
|
|
|
wps_testing_dummy_cred = atoi(value);
|
|
|
|
wpa_printf(MSG_DEBUG, "WPS: Testing - dummy_cred=%d",
|
|
|
|
wps_testing_dummy_cred);
|
2013-11-28 08:47:19 -05:00
|
|
|
} else if (os_strcasecmp(cmd, "wps_corrupt_pkhash") == 0) {
|
|
|
|
wps_corrupt_pkhash = atoi(value);
|
|
|
|
wpa_printf(MSG_DEBUG, "WPS: Testing - wps_corrupt_pkhash=%d",
|
|
|
|
wps_corrupt_pkhash);
|
2010-09-21 22:51:23 -04:00
|
|
|
#endif /* CONFIG_WPS_TESTING */
|
2010-08-01 19:19:31 -04:00
|
|
|
} else if (os_strcasecmp(cmd, "ampdu") == 0) {
|
|
|
|
if (wpa_drv_ampdu(wpa_s, atoi(value)) < 0)
|
|
|
|
ret = -1;
|
2013-11-28 08:34:24 -05:00
|
|
|
#ifdef CONFIG_TDLS
|
2011-01-14 14:26:25 -05:00
|
|
|
#ifdef CONFIG_TDLS_TESTING
|
|
|
|
} else if (os_strcasecmp(cmd, "tdls_testing") == 0) {
|
|
|
|
extern unsigned int tdls_testing;
|
|
|
|
tdls_testing = strtol(value, NULL, 0);
|
|
|
|
wpa_printf(MSG_DEBUG, "TDLS: tdls_testing=0x%x", tdls_testing);
|
|
|
|
#endif /* CONFIG_TDLS_TESTING */
|
2011-03-24 14:44:17 -04:00
|
|
|
} else if (os_strcasecmp(cmd, "tdls_disabled") == 0) {
|
|
|
|
int disabled = atoi(value);
|
|
|
|
wpa_printf(MSG_DEBUG, "TDLS: tdls_disabled=%d", disabled);
|
|
|
|
if (disabled) {
|
|
|
|
if (wpa_drv_tdls_oper(wpa_s, TDLS_DISABLE, NULL) < 0)
|
|
|
|
ret = -1;
|
|
|
|
} else if (wpa_drv_tdls_oper(wpa_s, TDLS_ENABLE, NULL) < 0)
|
|
|
|
ret = -1;
|
|
|
|
wpa_tdls_enable(wpa_s->wpa, !disabled);
|
|
|
|
#endif /* CONFIG_TDLS */
|
2011-11-28 09:32:44 -05:00
|
|
|
} else if (os_strcasecmp(cmd, "pno") == 0) {
|
2014-03-14 16:55:25 -04:00
|
|
|
ret = wpas_ctrl_pno(wpa_s, value);
|
2012-02-16 09:26:44 -05:00
|
|
|
} else if (os_strcasecmp(cmd, "radio_disabled") == 0) {
|
|
|
|
int disabled = atoi(value);
|
|
|
|
if (wpa_drv_radio_disable(wpa_s, disabled) < 0)
|
|
|
|
ret = -1;
|
|
|
|
else if (disabled)
|
|
|
|
wpa_supplicant_set_state(wpa_s, WPA_INACTIVE);
|
2012-02-16 09:28:31 -05:00
|
|
|
} else if (os_strcasecmp(cmd, "uapsd") == 0) {
|
|
|
|
if (os_strcmp(value, "disable") == 0)
|
|
|
|
wpa_s->set_sta_uapsd = 0;
|
|
|
|
else {
|
|
|
|
int be, bk, vi, vo;
|
|
|
|
char *pos;
|
|
|
|
/* format: BE,BK,VI,VO;max SP Length */
|
|
|
|
be = atoi(value);
|
|
|
|
pos = os_strchr(value, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
bk = atoi(pos);
|
|
|
|
pos = os_strchr(pos, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
vi = atoi(pos);
|
|
|
|
pos = os_strchr(pos, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
vo = atoi(pos);
|
|
|
|
/* ignore max SP Length for now */
|
|
|
|
|
|
|
|
wpa_s->set_sta_uapsd = 1;
|
|
|
|
wpa_s->sta_uapsd = 0;
|
|
|
|
if (be)
|
|
|
|
wpa_s->sta_uapsd |= BIT(0);
|
|
|
|
if (bk)
|
|
|
|
wpa_s->sta_uapsd |= BIT(1);
|
|
|
|
if (vi)
|
|
|
|
wpa_s->sta_uapsd |= BIT(2);
|
|
|
|
if (vo)
|
|
|
|
wpa_s->sta_uapsd |= BIT(3);
|
|
|
|
}
|
2012-02-16 09:29:19 -05:00
|
|
|
} else if (os_strcasecmp(cmd, "ps") == 0) {
|
|
|
|
ret = wpa_drv_set_p2p_powersave(wpa_s, atoi(value), -1, -1);
|
2012-03-02 10:26:01 -05:00
|
|
|
#ifdef CONFIG_WIFI_DISPLAY
|
|
|
|
} else if (os_strcasecmp(cmd, "wifi_display") == 0) {
|
2014-02-06 09:03:42 -05:00
|
|
|
int enabled = !!atoi(value);
|
|
|
|
if (enabled && !wpa_s->global->p2p)
|
|
|
|
ret = -1;
|
|
|
|
else
|
|
|
|
wifi_display_enable(wpa_s->global, enabled);
|
2012-03-02 10:26:01 -05:00
|
|
|
#endif /* CONFIG_WIFI_DISPLAY */
|
2012-02-16 09:30:13 -05:00
|
|
|
} else if (os_strcasecmp(cmd, "bssid_filter") == 0) {
|
|
|
|
ret = set_bssid_filter(wpa_s, value);
|
2012-09-27 10:36:59 -04:00
|
|
|
} else if (os_strcasecmp(cmd, "disallow_aps") == 0) {
|
|
|
|
ret = set_disallow_aps(wpa_s, value);
|
2012-12-18 09:57:52 -05:00
|
|
|
} else if (os_strcasecmp(cmd, "no_keep_alive") == 0) {
|
|
|
|
wpa_s->no_keep_alive = !!atoi(value);
|
2014-03-08 13:21:21 -05:00
|
|
|
#ifdef CONFIG_TESTING_OPTIONS
|
|
|
|
} else if (os_strcasecmp(cmd, "ext_mgmt_frame_handling") == 0) {
|
|
|
|
wpa_s->ext_mgmt_frame_handling = !!atoi(value);
|
2014-10-10 11:01:15 -04:00
|
|
|
} else if (os_strcasecmp(cmd, "ext_eapol_frame_io") == 0) {
|
|
|
|
wpa_s->ext_eapol_frame_io = !!atoi(value);
|
|
|
|
#ifdef CONFIG_AP
|
|
|
|
if (wpa_s->ap_iface) {
|
|
|
|
wpa_s->ap_iface->bss[0]->ext_eapol_frame_io =
|
|
|
|
wpa_s->ext_eapol_frame_io;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_AP */
|
2014-10-25 14:25:00 -04:00
|
|
|
} else if (os_strcasecmp(cmd, "extra_roc_dur") == 0) {
|
|
|
|
wpa_s->extra_roc_dur = atoi(value);
|
2015-01-19 12:34:00 -05:00
|
|
|
} else if (os_strcasecmp(cmd, "test_failure") == 0) {
|
|
|
|
wpa_s->test_failure = atoi(value);
|
2014-03-08 13:21:21 -05:00
|
|
|
#endif /* CONFIG_TESTING_OPTIONS */
|
2014-03-15 17:51:37 -04:00
|
|
|
#ifndef CONFIG_NO_CONFIG_BLOBS
|
|
|
|
} else if (os_strcmp(cmd, "blob") == 0) {
|
|
|
|
ret = wpas_ctrl_set_blob(wpa_s, value);
|
|
|
|
#endif /* CONFIG_NO_CONFIG_BLOBS */
|
2014-12-19 15:56:41 -05:00
|
|
|
} else if (os_strcasecmp(cmd, "setband") == 0) {
|
|
|
|
if (os_strcmp(value, "AUTO") == 0)
|
|
|
|
wpa_s->setband = WPA_SETBAND_AUTO;
|
|
|
|
else if (os_strcmp(value, "5G") == 0)
|
|
|
|
wpa_s->setband = WPA_SETBAND_5G;
|
|
|
|
else if (os_strcmp(value, "2G") == 0)
|
|
|
|
wpa_s->setband = WPA_SETBAND_2G;
|
|
|
|
else
|
|
|
|
ret = -1;
|
2010-07-18 17:30:24 -04:00
|
|
|
} else {
|
|
|
|
value[-1] = '=';
|
|
|
|
ret = wpa_config_process_global(wpa_s->conf, cmd, -1);
|
|
|
|
if (ret == 0)
|
|
|
|
wpa_supplicant_update_config(wpa_s);
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-10-31 11:07:31 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_get(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd, char *buf, size_t buflen)
|
|
|
|
{
|
2011-04-19 19:42:47 -04:00
|
|
|
int res = -1;
|
2010-10-31 11:07:31 -04:00
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE GET '%s'", cmd);
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "version") == 0) {
|
|
|
|
res = os_snprintf(buf, buflen, "%s", VERSION_STR);
|
2011-04-19 19:42:47 -04:00
|
|
|
} 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]);
|
2012-03-02 10:26:01 -05:00
|
|
|
#ifdef CONFIG_WIFI_DISPLAY
|
|
|
|
} else if (os_strcasecmp(cmd, "wifi_display") == 0) {
|
2014-02-06 09:03:42 -05:00
|
|
|
int enabled;
|
|
|
|
if (wpa_s->global->p2p == NULL ||
|
|
|
|
wpa_s->global->p2p_disabled)
|
|
|
|
enabled = 0;
|
|
|
|
else
|
|
|
|
enabled = wpa_s->global->wifi_display;
|
|
|
|
res = os_snprintf(buf, buflen, "%d", enabled);
|
2012-03-02 10:26:01 -05:00
|
|
|
#endif /* CONFIG_WIFI_DISPLAY */
|
2011-10-28 07:39:44 -04:00
|
|
|
#ifdef CONFIG_TESTING_GET_GTK
|
|
|
|
} else if (os_strcmp(cmd, "gtk") == 0) {
|
|
|
|
if (wpa_s->last_gtk_len == 0)
|
|
|
|
return -1;
|
|
|
|
res = wpa_snprintf_hex(buf, buflen, wpa_s->last_gtk,
|
|
|
|
wpa_s->last_gtk_len);
|
|
|
|
return res;
|
|
|
|
#endif /* CONFIG_TESTING_GET_GTK */
|
2015-01-11 08:37:38 -05:00
|
|
|
} else if (os_strcmp(cmd, "tls_library") == 0) {
|
|
|
|
res = tls_get_library_version(buf, buflen);
|
2010-10-31 11:07:31 -04:00
|
|
|
}
|
|
|
|
|
2014-12-07 05:52:59 -05:00
|
|
|
if (os_snprintf_error(buflen, res))
|
2011-04-19 19:42:47 -04:00
|
|
|
return -1;
|
|
|
|
return res;
|
2010-10-31 11:07:31 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-05-30 11:43:06 -04:00
|
|
|
#ifdef IEEE8021X_EAPOL
|
2008-02-27 20:34:43 -05:00
|
|
|
static int wpa_supplicant_ctrl_iface_preauth(struct wpa_supplicant *wpa_s,
|
|
|
|
char *addr)
|
|
|
|
{
|
|
|
|
u8 bssid[ETH_ALEN];
|
|
|
|
struct wpa_ssid *ssid = wpa_s->current_ssid;
|
|
|
|
|
|
|
|
if (hwaddr_aton(addr, bssid)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE PREAUTH: invalid address "
|
|
|
|
"'%s'", addr);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE PREAUTH " MACSTR, MAC2STR(bssid));
|
|
|
|
rsn_preauth_deinit(wpa_s->wpa);
|
|
|
|
if (rsn_preauth_init(wpa_s->wpa, bssid, ssid ? &ssid->eap : NULL))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2008-05-30 11:43:06 -04:00
|
|
|
#endif /* IEEE8021X_EAPOL */
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_PEERKEY
|
|
|
|
/* MLME-STKSTART.request(peer) */
|
|
|
|
static int wpa_supplicant_ctrl_iface_stkstart(
|
|
|
|
struct wpa_supplicant *wpa_s, char *addr)
|
|
|
|
{
|
|
|
|
u8 peer[ETH_ALEN];
|
|
|
|
|
|
|
|
if (hwaddr_aton(addr, peer)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE STKSTART: invalid "
|
2010-04-10 15:46:54 -04:00
|
|
|
"address '%s'", addr);
|
2008-02-27 20:34:43 -05:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE STKSTART " MACSTR,
|
|
|
|
MAC2STR(peer));
|
|
|
|
|
|
|
|
return wpa_sm_stkstart(wpa_s->wpa, peer);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_PEERKEY */
|
|
|
|
|
|
|
|
|
2010-10-07 03:26:56 -04:00
|
|
|
#ifdef CONFIG_TDLS
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_tdls_discover(
|
|
|
|
struct wpa_supplicant *wpa_s, char *addr)
|
|
|
|
{
|
|
|
|
u8 peer[ETH_ALEN];
|
2011-09-26 06:55:33 -04:00
|
|
|
int ret;
|
2010-10-07 03:26:56 -04:00
|
|
|
|
|
|
|
if (hwaddr_aton(addr, peer)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_DISCOVER: invalid "
|
|
|
|
"address '%s'", addr);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_DISCOVER " MACSTR,
|
|
|
|
MAC2STR(peer));
|
|
|
|
|
2011-09-26 06:55:33 -04:00
|
|
|
if (wpa_tdls_is_external_setup(wpa_s->wpa))
|
|
|
|
ret = wpa_tdls_send_discovery_request(wpa_s->wpa, peer);
|
|
|
|
else
|
|
|
|
ret = wpa_drv_tdls_oper(wpa_s, TDLS_DISCOVERY_REQ, peer);
|
|
|
|
|
|
|
|
return ret;
|
2010-10-07 03:26:56 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_tdls_setup(
|
|
|
|
struct wpa_supplicant *wpa_s, char *addr)
|
|
|
|
{
|
|
|
|
u8 peer[ETH_ALEN];
|
2011-01-27 18:24:24 -05:00
|
|
|
int ret;
|
2010-10-07 03:26:56 -04:00
|
|
|
|
|
|
|
if (hwaddr_aton(addr, peer)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_SETUP: invalid "
|
|
|
|
"address '%s'", addr);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_SETUP " MACSTR,
|
|
|
|
MAC2STR(peer));
|
|
|
|
|
2013-11-13 06:35:44 -05:00
|
|
|
if ((wpa_s->conf->tdls_external_control) &&
|
|
|
|
wpa_tdls_is_external_setup(wpa_s->wpa))
|
|
|
|
return wpa_drv_tdls_oper(wpa_s, TDLS_SETUP, peer);
|
|
|
|
|
2013-02-05 06:27:56 -05:00
|
|
|
wpa_tdls_remove(wpa_s->wpa, peer);
|
|
|
|
|
|
|
|
if (wpa_tdls_is_external_setup(wpa_s->wpa))
|
|
|
|
ret = wpa_tdls_start(wpa_s->wpa, peer);
|
|
|
|
else
|
|
|
|
ret = wpa_drv_tdls_oper(wpa_s, TDLS_SETUP, peer);
|
2011-09-26 06:55:33 -04:00
|
|
|
|
2011-01-27 18:24:24 -05:00
|
|
|
return ret;
|
2010-10-07 03:26:56 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_tdls_teardown(
|
|
|
|
struct wpa_supplicant *wpa_s, char *addr)
|
|
|
|
{
|
|
|
|
u8 peer[ETH_ALEN];
|
2013-07-20 10:52:32 -04:00
|
|
|
int ret;
|
2010-10-07 03:26:56 -04:00
|
|
|
|
2014-06-10 14:19:08 -04:00
|
|
|
if (os_strcmp(addr, "*") == 0) {
|
|
|
|
/* remove everyone */
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_TEARDOWN *");
|
|
|
|
wpa_tdls_teardown_peers(wpa_s->wpa);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-10-07 03:26:56 -04:00
|
|
|
if (hwaddr_aton(addr, peer)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_TEARDOWN: invalid "
|
|
|
|
"address '%s'", addr);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_TEARDOWN " MACSTR,
|
|
|
|
MAC2STR(peer));
|
|
|
|
|
2013-11-13 06:35:44 -05:00
|
|
|
if ((wpa_s->conf->tdls_external_control) &&
|
|
|
|
wpa_tdls_is_external_setup(wpa_s->wpa))
|
|
|
|
return wpa_drv_tdls_oper(wpa_s, TDLS_TEARDOWN, peer);
|
|
|
|
|
2013-07-20 10:52:32 -04:00
|
|
|
if (wpa_tdls_is_external_setup(wpa_s->wpa))
|
|
|
|
ret = wpa_tdls_teardown_link(
|
|
|
|
wpa_s->wpa, peer,
|
|
|
|
WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED);
|
|
|
|
else
|
|
|
|
ret = wpa_drv_tdls_oper(wpa_s, TDLS_TEARDOWN, peer);
|
|
|
|
|
|
|
|
return ret;
|
2010-10-07 03:26:56 -04:00
|
|
|
}
|
|
|
|
|
2014-03-13 18:12:38 -04:00
|
|
|
|
|
|
|
static int ctrl_iface_get_capability_tdls(
|
|
|
|
struct wpa_supplicant *wpa_s, char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = os_snprintf(buf, buflen, "%s\n",
|
|
|
|
wpa_s->drv_flags & WPA_DRIVER_FLAGS_TDLS_SUPPORT ?
|
|
|
|
(wpa_s->drv_flags &
|
|
|
|
WPA_DRIVER_FLAGS_TDLS_EXTERNAL_SETUP ?
|
|
|
|
"EXTERNAL" : "INTERNAL") : "UNSUPPORTED");
|
Check os_snprintf() result more consistently - automatic 2
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the comparison was 'res > size' instead of
'res >= size'. These changes were done automatically with spatch using
the following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 > E3 \| (size_t) E1 > E3 \| E1 > (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:18:39 -05:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2014-03-13 18:12:38 -04:00
|
|
|
return -1;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-12-29 00:20:51 -05:00
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_tdls_chan_switch(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
u8 peer[ETH_ALEN];
|
|
|
|
struct hostapd_freq_params freq_params;
|
|
|
|
u8 oper_class;
|
|
|
|
char *pos, *end;
|
|
|
|
|
|
|
|
if (!wpa_tdls_is_external_setup(wpa_s->wpa)) {
|
|
|
|
wpa_printf(MSG_INFO,
|
|
|
|
"tdls_chanswitch: Only supported with external setup");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_memset(&freq_params, 0, sizeof(freq_params));
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
oper_class = strtol(pos, &end, 10);
|
|
|
|
if (pos == end) {
|
|
|
|
wpa_printf(MSG_INFO,
|
|
|
|
"tdls_chanswitch: Invalid op class provided");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
pos = end;
|
|
|
|
freq_params.freq = atoi(pos);
|
|
|
|
if (freq_params.freq == 0) {
|
|
|
|
wpa_printf(MSG_INFO, "tdls_chanswitch: Invalid freq provided");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define SET_FREQ_SETTING(str) \
|
|
|
|
do { \
|
|
|
|
const char *pos2 = os_strstr(pos, " " #str "="); \
|
|
|
|
if (pos2) { \
|
|
|
|
pos2 += sizeof(" " #str "=") - 1; \
|
|
|
|
freq_params.str = atoi(pos2); \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
SET_FREQ_SETTING(center_freq1);
|
|
|
|
SET_FREQ_SETTING(center_freq2);
|
|
|
|
SET_FREQ_SETTING(bandwidth);
|
|
|
|
SET_FREQ_SETTING(sec_channel_offset);
|
|
|
|
#undef SET_FREQ_SETTING
|
|
|
|
|
|
|
|
freq_params.ht_enabled = !!os_strstr(pos, " ht");
|
|
|
|
freq_params.vht_enabled = !!os_strstr(pos, " vht");
|
|
|
|
|
|
|
|
if (hwaddr_aton(cmd, peer)) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"CTRL_IFACE TDLS_CHAN_SWITCH: Invalid address '%s'",
|
|
|
|
cmd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_CHAN_SWITCH " MACSTR
|
|
|
|
" OP CLASS %d FREQ %d CENTER1 %d CENTER2 %d BW %d SEC_OFFSET %d%s%s",
|
|
|
|
MAC2STR(peer), oper_class, freq_params.freq,
|
|
|
|
freq_params.center_freq1, freq_params.center_freq2,
|
|
|
|
freq_params.bandwidth, freq_params.sec_channel_offset,
|
|
|
|
freq_params.ht_enabled ? " HT" : "",
|
|
|
|
freq_params.vht_enabled ? " VHT" : "");
|
|
|
|
|
|
|
|
return wpa_tdls_enable_chan_switch(wpa_s->wpa, peer, oper_class,
|
|
|
|
&freq_params);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_tdls_cancel_chan_switch(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
u8 peer[ETH_ALEN];
|
|
|
|
|
|
|
|
if (!wpa_tdls_is_external_setup(wpa_s->wpa)) {
|
|
|
|
wpa_printf(MSG_INFO,
|
|
|
|
"tdls_chanswitch: Only supported with external setup");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (hwaddr_aton(cmd, peer)) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"CTRL_IFACE TDLS_CANCEL_CHAN_SWITCH: Invalid address '%s'",
|
|
|
|
cmd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE TDLS_CANCEL_CHAN_SWITCH " MACSTR,
|
|
|
|
MAC2STR(peer));
|
|
|
|
|
|
|
|
return wpa_tdls_disable_chan_switch(wpa_s->wpa, peer);
|
|
|
|
}
|
|
|
|
|
2010-10-07 03:26:56 -04:00
|
|
|
#endif /* CONFIG_TDLS */
|
|
|
|
|
|
|
|
|
2014-10-22 08:03:59 -04:00
|
|
|
static int wmm_ac_ctrl_addts(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *token, *context = NULL;
|
|
|
|
struct wmm_ac_ts_setup_params params = {
|
|
|
|
.tsid = 0xff,
|
|
|
|
.direction = 0xff,
|
|
|
|
};
|
|
|
|
|
|
|
|
while ((token = str_token(cmd, " ", &context))) {
|
|
|
|
if (sscanf(token, "tsid=%i", ¶ms.tsid) == 1 ||
|
|
|
|
sscanf(token, "up=%i", ¶ms.user_priority) == 1 ||
|
|
|
|
sscanf(token, "nominal_msdu_size=%i",
|
|
|
|
¶ms.nominal_msdu_size) == 1 ||
|
|
|
|
sscanf(token, "mean_data_rate=%i",
|
|
|
|
¶ms.mean_data_rate) == 1 ||
|
|
|
|
sscanf(token, "min_phy_rate=%i",
|
|
|
|
¶ms.minimum_phy_rate) == 1 ||
|
|
|
|
sscanf(token, "sba=%i",
|
|
|
|
¶ms.surplus_bandwidth_allowance) == 1)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (os_strcasecmp(token, "downlink") == 0) {
|
|
|
|
params.direction = WMM_TSPEC_DIRECTION_DOWNLINK;
|
|
|
|
} else if (os_strcasecmp(token, "uplink") == 0) {
|
|
|
|
params.direction = WMM_TSPEC_DIRECTION_UPLINK;
|
|
|
|
} else if (os_strcasecmp(token, "bidi") == 0) {
|
|
|
|
params.direction = WMM_TSPEC_DIRECTION_BI_DIRECTIONAL;
|
|
|
|
} else if (os_strcasecmp(token, "fixed_nominal_msdu") == 0) {
|
|
|
|
params.fixed_nominal_msdu = 1;
|
|
|
|
} else {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"CTRL: Invalid WMM_AC_ADDTS parameter: '%s'",
|
|
|
|
token);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return wpas_wmm_ac_addts(wpa_s, ¶ms);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wmm_ac_ctrl_delts(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
u8 tsid = atoi(cmd);
|
|
|
|
|
|
|
|
return wpas_wmm_ac_delts(wpa_s, tsid);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
#ifdef CONFIG_IEEE80211R
|
|
|
|
static int wpa_supplicant_ctrl_iface_ft_ds(
|
|
|
|
struct wpa_supplicant *wpa_s, char *addr)
|
|
|
|
{
|
|
|
|
u8 target_ap[ETH_ALEN];
|
2010-04-09 09:26:20 -04:00
|
|
|
struct wpa_bss *bss;
|
|
|
|
const u8 *mdie;
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
if (hwaddr_aton(addr, target_ap)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE FT_DS: invalid "
|
2010-04-10 15:46:54 -04:00
|
|
|
"address '%s'", addr);
|
2008-02-27 20:34:43 -05:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE FT_DS " MACSTR, MAC2STR(target_ap));
|
|
|
|
|
2010-04-09 09:26:20 -04:00
|
|
|
bss = wpa_bss_get_bssid(wpa_s, target_ap);
|
|
|
|
if (bss)
|
|
|
|
mdie = wpa_bss_get_ie(bss, WLAN_EID_MOBILITY_DOMAIN);
|
|
|
|
else
|
|
|
|
mdie = NULL;
|
|
|
|
|
|
|
|
return wpa_ft_start_over_ds(wpa_s->wpa, target_ap, mdie);
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
|
|
|
#endif /* CONFIG_IEEE80211R */
|
|
|
|
|
|
|
|
|
2008-11-29 13:59:45 -05:00
|
|
|
#ifdef CONFIG_WPS
|
|
|
|
static int wpa_supplicant_ctrl_iface_wps_pbc(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
2009-04-21 09:45:16 -04:00
|
|
|
u8 bssid[ETH_ALEN], *_bssid = bssid;
|
2011-05-27 12:06:05 -04:00
|
|
|
#ifdef CONFIG_P2P
|
2011-06-20 01:58:32 -04:00
|
|
|
u8 p2p_dev_addr[ETH_ALEN];
|
2011-05-27 12:06:05 -04:00
|
|
|
#endif /* CONFIG_P2P */
|
2011-06-20 01:58:32 -04:00
|
|
|
#ifdef CONFIG_AP
|
|
|
|
u8 *_p2p_dev_addr = NULL;
|
|
|
|
#endif /* CONFIG_AP */
|
2008-11-29 13:59:45 -05:00
|
|
|
|
2011-02-07 11:28:36 -05:00
|
|
|
if (cmd == NULL || os_strcmp(cmd, "any") == 0) {
|
2009-04-21 09:45:16 -04:00
|
|
|
_bssid = NULL;
|
2011-02-07 11:28:36 -05:00
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
} else if (os_strncmp(cmd, "p2p_dev_addr=", 13) == 0) {
|
|
|
|
if (hwaddr_aton(cmd + 13, p2p_dev_addr)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE WPS_PBC: invalid "
|
|
|
|
"P2P Device Address '%s'",
|
|
|
|
cmd + 13);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
_p2p_dev_addr = p2p_dev_addr;
|
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
} else if (hwaddr_aton(cmd, bssid)) {
|
2008-11-29 13:59:45 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE WPS_PBC: invalid BSSID '%s'",
|
|
|
|
cmd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-04-21 09:45:16 -04:00
|
|
|
#ifdef CONFIG_AP
|
|
|
|
if (wpa_s->ap_iface)
|
2011-02-07 11:28:36 -05:00
|
|
|
return wpa_supplicant_ap_wps_pbc(wpa_s, _bssid, _p2p_dev_addr);
|
2009-04-21 09:45:16 -04:00
|
|
|
#endif /* CONFIG_AP */
|
|
|
|
|
2010-07-18 17:30:24 -04:00
|
|
|
return wpas_wps_start_pbc(wpa_s, _bssid, 0);
|
2008-11-29 13:59:45 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_wps_pin(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd, char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
u8 bssid[ETH_ALEN], *_bssid = bssid;
|
|
|
|
char *pin;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
pin = os_strchr(cmd, ' ');
|
|
|
|
if (pin)
|
|
|
|
*pin++ = '\0';
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "any") == 0)
|
|
|
|
_bssid = NULL;
|
2011-09-02 14:29:06 -04:00
|
|
|
else if (os_strcmp(cmd, "get") == 0) {
|
|
|
|
ret = wps_generate_pin();
|
|
|
|
goto done;
|
|
|
|
} else if (hwaddr_aton(cmd, bssid)) {
|
2008-12-20 14:51:34 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE WPS_PIN: invalid BSSID '%s'",
|
2008-11-29 13:59:45 -05:00
|
|
|
cmd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-04-21 09:45:16 -04:00
|
|
|
#ifdef CONFIG_AP
|
2012-10-10 10:22:35 -04:00
|
|
|
if (wpa_s->ap_iface) {
|
|
|
|
int timeout = 0;
|
|
|
|
char *pos;
|
|
|
|
|
|
|
|
if (pin) {
|
|
|
|
pos = os_strchr(pin, ' ');
|
|
|
|
if (pos) {
|
|
|
|
*pos++ = '\0';
|
|
|
|
timeout = atoi(pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-04-21 09:45:16 -04:00
|
|
|
return wpa_supplicant_ap_wps_pin(wpa_s, _bssid, pin,
|
2012-10-10 10:22:35 -04:00
|
|
|
buf, buflen, timeout);
|
|
|
|
}
|
2009-04-21 09:45:16 -04:00
|
|
|
#endif /* CONFIG_AP */
|
|
|
|
|
2008-11-29 13:59:45 -05:00
|
|
|
if (pin) {
|
2010-06-27 01:49:41 -04:00
|
|
|
ret = wpas_wps_start_pin(wpa_s, _bssid, pin, 0,
|
|
|
|
DEV_PW_DEFAULT);
|
2008-11-29 13:59:45 -05:00
|
|
|
if (ret < 0)
|
|
|
|
return -1;
|
|
|
|
ret = os_snprintf(buf, buflen, "%s", pin);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2008-11-29 13:59:45 -05:00
|
|
|
return -1;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-06-27 01:49:41 -04:00
|
|
|
ret = wpas_wps_start_pin(wpa_s, _bssid, NULL, 0, DEV_PW_DEFAULT);
|
2008-11-29 13:59:45 -05:00
|
|
|
if (ret < 0)
|
|
|
|
return -1;
|
|
|
|
|
2011-09-02 14:29:06 -04:00
|
|
|
done:
|
2008-11-29 13:59:45 -05:00
|
|
|
/* Return the generated PIN */
|
|
|
|
ret = os_snprintf(buf, buflen, "%08d", ret);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2008-11-29 13:59:45 -05:00
|
|
|
return -1;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-09-23 13:30:52 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_wps_check_pin(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd, char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
char pin[9];
|
|
|
|
size_t len;
|
|
|
|
char *pos;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
wpa_hexdump_ascii_key(MSG_DEBUG, "WPS_CHECK_PIN",
|
|
|
|
(u8 *) cmd, os_strlen(cmd));
|
|
|
|
for (pos = cmd, len = 0; *pos != '\0'; pos++) {
|
|
|
|
if (*pos < '0' || *pos > '9')
|
|
|
|
continue;
|
|
|
|
pin[len++] = *pos;
|
|
|
|
if (len == 9) {
|
|
|
|
wpa_printf(MSG_DEBUG, "WPS: Too long PIN");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (len != 4 && len != 8) {
|
|
|
|
wpa_printf(MSG_DEBUG, "WPS: Invalid PIN length %d", (int) len);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
pin[len] = '\0';
|
|
|
|
|
|
|
|
if (len == 8) {
|
|
|
|
unsigned int pin_val;
|
|
|
|
pin_val = atoi(pin);
|
|
|
|
if (!wps_pin_valid(pin_val)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "WPS: Invalid checksum digit");
|
|
|
|
ret = os_snprintf(buf, buflen, "FAIL-CHECKSUM\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2010-09-23 13:30:52 -04:00
|
|
|
return -1;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = os_snprintf(buf, buflen, "%s", pin);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2010-09-23 13:30:52 -04:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-06-28 07:05:13 -04:00
|
|
|
#ifdef CONFIG_WPS_NFC
|
2012-06-27 11:56:41 -04:00
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_wps_nfc(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
u8 bssid[ETH_ALEN], *_bssid = bssid;
|
|
|
|
|
|
|
|
if (cmd == NULL || cmd[0] == '\0')
|
|
|
|
_bssid = NULL;
|
|
|
|
else if (hwaddr_aton(cmd, bssid))
|
|
|
|
return -1;
|
|
|
|
|
2013-09-07 18:44:29 -04:00
|
|
|
return wpas_wps_start_nfc(wpa_s, NULL, _bssid, NULL, 0, 0, NULL, NULL,
|
2013-11-28 10:48:35 -05:00
|
|
|
0, 0);
|
2012-06-27 11:56:41 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-02-15 04:45:29 -05:00
|
|
|
static int wpa_supplicant_ctrl_iface_wps_nfc_config_token(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd, char *reply, size_t max_len)
|
|
|
|
{
|
|
|
|
int ndef;
|
|
|
|
struct wpabuf *buf;
|
|
|
|
int res;
|
2013-04-01 14:28:57 -04:00
|
|
|
char *pos;
|
2013-02-15 04:45:29 -05:00
|
|
|
|
2013-04-01 14:28:57 -04:00
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos)
|
|
|
|
*pos++ = '\0';
|
2013-02-15 04:45:29 -05:00
|
|
|
if (os_strcmp(cmd, "WPS") == 0)
|
|
|
|
ndef = 0;
|
|
|
|
else if (os_strcmp(cmd, "NDEF") == 0)
|
|
|
|
ndef = 1;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
|
2013-04-01 14:28:57 -04:00
|
|
|
buf = wpas_wps_nfc_config_token(wpa_s, ndef, pos);
|
2013-02-15 04:45:29 -05:00
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
res = wpa_snprintf_hex_uppercase(reply, max_len, wpabuf_head(buf),
|
|
|
|
wpabuf_len(buf));
|
|
|
|
reply[res++] = '\n';
|
|
|
|
reply[res] = '\0';
|
|
|
|
|
|
|
|
wpabuf_free(buf);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-06-27 11:56:41 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_wps_nfc_token(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd, char *reply, size_t max_len)
|
|
|
|
{
|
|
|
|
int ndef;
|
|
|
|
struct wpabuf *buf;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "WPS") == 0)
|
|
|
|
ndef = 0;
|
|
|
|
else if (os_strcmp(cmd, "NDEF") == 0)
|
|
|
|
ndef = 1;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
buf = wpas_wps_nfc_token(wpa_s, ndef);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
res = wpa_snprintf_hex_uppercase(reply, max_len, wpabuf_head(buf),
|
|
|
|
wpabuf_len(buf));
|
|
|
|
reply[res++] = '\n';
|
|
|
|
reply[res] = '\0';
|
|
|
|
|
|
|
|
wpabuf_free(buf);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
2012-06-28 06:59:29 -04:00
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_wps_nfc_tag_read(
|
|
|
|
struct wpa_supplicant *wpa_s, char *pos)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
struct wpabuf *buf;
|
|
|
|
int ret;
|
2013-12-03 22:44:56 -05:00
|
|
|
char *freq;
|
|
|
|
int forced_freq = 0;
|
|
|
|
|
|
|
|
freq = strstr(pos, " freq=");
|
|
|
|
if (freq) {
|
|
|
|
*freq = '\0';
|
|
|
|
freq += 6;
|
|
|
|
forced_freq = atoi(freq);
|
|
|
|
}
|
2012-06-28 06:59:29 -04:00
|
|
|
|
|
|
|
len = os_strlen(pos);
|
|
|
|
if (len & 0x01)
|
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
|
|
|
|
buf = wpabuf_alloc(len);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
if (hexstr2bin(pos, wpabuf_put(buf, len), len) < 0) {
|
|
|
|
wpabuf_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-12-03 22:44:56 -05:00
|
|
|
ret = wpas_wps_nfc_tag_read(wpa_s, buf, forced_freq);
|
2012-06-28 06:59:29 -04:00
|
|
|
wpabuf_free(buf);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2012-06-28 07:05:13 -04:00
|
|
|
|
2012-10-28 11:39:46 -04:00
|
|
|
|
|
|
|
static int wpas_ctrl_nfc_get_handover_req_wps(struct wpa_supplicant *wpa_s,
|
2013-02-10 11:19:59 -05:00
|
|
|
char *reply, size_t max_len,
|
2013-04-02 11:30:58 -04:00
|
|
|
int ndef)
|
2012-10-28 11:39:46 -04:00
|
|
|
{
|
|
|
|
struct wpabuf *buf;
|
|
|
|
int res;
|
|
|
|
|
2013-04-02 11:30:58 -04:00
|
|
|
buf = wpas_wps_nfc_handover_req(wpa_s, ndef);
|
2012-10-28 11:39:46 -04:00
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
res = wpa_snprintf_hex_uppercase(reply, max_len, wpabuf_head(buf),
|
|
|
|
wpabuf_len(buf));
|
|
|
|
reply[res++] = '\n';
|
|
|
|
reply[res] = '\0';
|
|
|
|
|
|
|
|
wpabuf_free(buf);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-02-13 08:29:09 -05:00
|
|
|
#ifdef CONFIG_P2P
|
2013-02-15 10:07:28 -05:00
|
|
|
static int wpas_ctrl_nfc_get_handover_req_p2p(struct wpa_supplicant *wpa_s,
|
|
|
|
char *reply, size_t max_len,
|
|
|
|
int ndef)
|
|
|
|
{
|
|
|
|
struct wpabuf *buf;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
buf = wpas_p2p_nfc_handover_req(wpa_s, ndef);
|
|
|
|
if (buf == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "P2P: Could not generate NFC handover request");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
res = wpa_snprintf_hex_uppercase(reply, max_len, wpabuf_head(buf),
|
|
|
|
wpabuf_len(buf));
|
|
|
|
reply[res++] = '\n';
|
|
|
|
reply[res] = '\0';
|
|
|
|
|
|
|
|
wpabuf_free(buf);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
2014-02-13 08:29:09 -05:00
|
|
|
#endif /* CONFIG_P2P */
|
2013-02-15 10:07:28 -05:00
|
|
|
|
|
|
|
|
2012-10-28 11:39:46 -04:00
|
|
|
static int wpas_ctrl_nfc_get_handover_req(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd, char *reply,
|
|
|
|
size_t max_len)
|
|
|
|
{
|
|
|
|
char *pos;
|
2013-04-02 11:30:58 -04:00
|
|
|
int ndef;
|
2012-10-28 11:39:46 -04:00
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
2013-04-02 11:30:58 -04:00
|
|
|
if (os_strcmp(cmd, "WPS") == 0)
|
|
|
|
ndef = 0;
|
|
|
|
else if (os_strcmp(cmd, "NDEF") == 0)
|
|
|
|
ndef = 1;
|
|
|
|
else
|
2012-10-28 11:39:46 -04:00
|
|
|
return -1;
|
|
|
|
|
2013-02-10 11:19:59 -05:00
|
|
|
if (os_strcmp(pos, "WPS") == 0 || os_strcmp(pos, "WPS-CR") == 0) {
|
2013-04-02 11:30:58 -04:00
|
|
|
if (!ndef)
|
|
|
|
return -1;
|
2013-02-10 11:19:59 -05:00
|
|
|
return wpas_ctrl_nfc_get_handover_req_wps(
|
2013-04-02 11:30:58 -04:00
|
|
|
wpa_s, reply, max_len, ndef);
|
2012-10-28 11:39:46 -04:00
|
|
|
}
|
|
|
|
|
2014-02-13 08:29:09 -05:00
|
|
|
#ifdef CONFIG_P2P
|
2013-02-15 10:07:28 -05:00
|
|
|
if (os_strcmp(pos, "P2P-CR") == 0) {
|
|
|
|
return wpas_ctrl_nfc_get_handover_req_p2p(
|
|
|
|
wpa_s, reply, max_len, ndef);
|
|
|
|
}
|
2014-02-13 08:29:09 -05:00
|
|
|
#endif /* CONFIG_P2P */
|
2013-02-15 10:07:28 -05:00
|
|
|
|
2012-10-28 11:39:46 -04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpas_ctrl_nfc_get_handover_sel_wps(struct wpa_supplicant *wpa_s,
|
2013-02-15 05:34:55 -05:00
|
|
|
char *reply, size_t max_len,
|
2013-02-24 03:56:29 -05:00
|
|
|
int ndef, int cr, char *uuid)
|
2012-10-28 11:39:46 -04:00
|
|
|
{
|
|
|
|
struct wpabuf *buf;
|
|
|
|
int res;
|
|
|
|
|
2013-02-24 03:56:29 -05:00
|
|
|
buf = wpas_wps_nfc_handover_sel(wpa_s, ndef, cr, uuid);
|
2012-10-28 11:39:46 -04:00
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
res = wpa_snprintf_hex_uppercase(reply, max_len, wpabuf_head(buf),
|
|
|
|
wpabuf_len(buf));
|
|
|
|
reply[res++] = '\n';
|
|
|
|
reply[res] = '\0';
|
|
|
|
|
|
|
|
wpabuf_free(buf);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-02-13 08:29:09 -05:00
|
|
|
#ifdef CONFIG_P2P
|
2013-02-15 10:07:28 -05:00
|
|
|
static int wpas_ctrl_nfc_get_handover_sel_p2p(struct wpa_supplicant *wpa_s,
|
|
|
|
char *reply, size_t max_len,
|
|
|
|
int ndef, int tag)
|
|
|
|
{
|
|
|
|
struct wpabuf *buf;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
buf = wpas_p2p_nfc_handover_sel(wpa_s, ndef, tag);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
res = wpa_snprintf_hex_uppercase(reply, max_len, wpabuf_head(buf),
|
|
|
|
wpabuf_len(buf));
|
|
|
|
reply[res++] = '\n';
|
|
|
|
reply[res] = '\0';
|
|
|
|
|
|
|
|
wpabuf_free(buf);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
2014-02-13 08:29:09 -05:00
|
|
|
#endif /* CONFIG_P2P */
|
2013-02-15 10:07:28 -05:00
|
|
|
|
|
|
|
|
2012-10-28 11:39:46 -04:00
|
|
|
static int wpas_ctrl_nfc_get_handover_sel(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd, char *reply,
|
|
|
|
size_t max_len)
|
|
|
|
{
|
2013-02-24 03:56:29 -05:00
|
|
|
char *pos, *pos2;
|
2013-02-15 05:34:55 -05:00
|
|
|
int ndef;
|
2012-10-28 11:39:46 -04:00
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
2013-02-15 05:34:55 -05:00
|
|
|
if (os_strcmp(cmd, "WPS") == 0)
|
|
|
|
ndef = 0;
|
|
|
|
else if (os_strcmp(cmd, "NDEF") == 0)
|
|
|
|
ndef = 1;
|
|
|
|
else
|
2012-10-28 11:39:46 -04:00
|
|
|
return -1;
|
|
|
|
|
2013-02-24 03:56:29 -05:00
|
|
|
pos2 = os_strchr(pos, ' ');
|
|
|
|
if (pos2)
|
|
|
|
*pos2++ = '\0';
|
2013-02-15 05:34:55 -05:00
|
|
|
if (os_strcmp(pos, "WPS") == 0 || os_strcmp(pos, "WPS-CR") == 0) {
|
2013-02-15 10:07:28 -05:00
|
|
|
if (!ndef)
|
|
|
|
return -1;
|
2013-02-15 05:34:55 -05:00
|
|
|
return wpas_ctrl_nfc_get_handover_sel_wps(
|
|
|
|
wpa_s, reply, max_len, ndef,
|
2013-02-24 03:56:29 -05:00
|
|
|
os_strcmp(pos, "WPS-CR") == 0, pos2);
|
2012-10-28 11:39:46 -04:00
|
|
|
}
|
|
|
|
|
2014-02-13 08:29:09 -05:00
|
|
|
#ifdef CONFIG_P2P
|
2013-02-15 10:07:28 -05:00
|
|
|
if (os_strcmp(pos, "P2P-CR") == 0) {
|
|
|
|
return wpas_ctrl_nfc_get_handover_sel_p2p(
|
|
|
|
wpa_s, reply, max_len, ndef, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(pos, "P2P-CR-TAG") == 0) {
|
|
|
|
return wpas_ctrl_nfc_get_handover_sel_p2p(
|
|
|
|
wpa_s, reply, max_len, ndef, 1);
|
|
|
|
}
|
2014-02-13 08:29:09 -05:00
|
|
|
#endif /* CONFIG_P2P */
|
2013-02-15 10:07:28 -05:00
|
|
|
|
2012-10-28 11:39:46 -04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-02-11 11:43:46 -05:00
|
|
|
static int wpas_ctrl_nfc_report_handover(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
struct wpabuf *req, *sel;
|
|
|
|
int ret;
|
|
|
|
char *pos, *role, *type, *pos2;
|
2014-02-13 08:29:09 -05:00
|
|
|
#ifdef CONFIG_P2P
|
2013-12-03 22:44:56 -05:00
|
|
|
char *freq;
|
|
|
|
int forced_freq = 0;
|
|
|
|
|
|
|
|
freq = strstr(cmd, " freq=");
|
|
|
|
if (freq) {
|
|
|
|
*freq = '\0';
|
|
|
|
freq += 6;
|
|
|
|
forced_freq = atoi(freq);
|
|
|
|
}
|
2014-02-13 08:29:09 -05:00
|
|
|
#endif /* CONFIG_P2P */
|
2013-02-11 11:43:46 -05:00
|
|
|
|
|
|
|
role = cmd;
|
|
|
|
pos = os_strchr(role, ' ');
|
2013-11-28 06:47:32 -05:00
|
|
|
if (pos == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "NFC: Missing type in handover report");
|
2013-02-11 11:43:46 -05:00
|
|
|
return -1;
|
2013-11-28 06:47:32 -05:00
|
|
|
}
|
2013-02-11 11:43:46 -05:00
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
type = pos;
|
|
|
|
pos = os_strchr(type, ' ');
|
2013-11-28 06:47:32 -05:00
|
|
|
if (pos == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "NFC: Missing request message in handover report");
|
2013-02-11 11:43:46 -05:00
|
|
|
return -1;
|
2013-11-28 06:47:32 -05:00
|
|
|
}
|
2013-02-11 11:43:46 -05:00
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
pos2 = os_strchr(pos, ' ');
|
2013-11-28 06:47:32 -05:00
|
|
|
if (pos2 == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "NFC: Missing select message in handover report");
|
2013-02-11 11:43:46 -05:00
|
|
|
return -1;
|
2013-11-28 06:47:32 -05:00
|
|
|
}
|
2013-02-11 11:43:46 -05:00
|
|
|
*pos2++ = '\0';
|
|
|
|
|
|
|
|
len = os_strlen(pos);
|
2013-11-28 06:47:32 -05:00
|
|
|
if (len & 0x01) {
|
|
|
|
wpa_printf(MSG_DEBUG, "NFC: Invalid request message length in handover report");
|
2013-02-11 11:43:46 -05:00
|
|
|
return -1;
|
2013-11-28 06:47:32 -05:00
|
|
|
}
|
2013-02-11 11:43:46 -05:00
|
|
|
len /= 2;
|
|
|
|
|
|
|
|
req = wpabuf_alloc(len);
|
2013-11-28 06:47:32 -05:00
|
|
|
if (req == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "NFC: Failed to allocate memory for request message");
|
2013-02-11 11:43:46 -05:00
|
|
|
return -1;
|
2013-11-28 06:47:32 -05:00
|
|
|
}
|
2013-02-11 11:43:46 -05:00
|
|
|
if (hexstr2bin(pos, wpabuf_put(req, len), len) < 0) {
|
2013-11-28 06:47:32 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "NFC: Invalid request message hexdump in handover report");
|
2013-02-11 11:43:46 -05:00
|
|
|
wpabuf_free(req);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
len = os_strlen(pos2);
|
|
|
|
if (len & 0x01) {
|
2013-11-28 06:47:32 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "NFC: Invalid select message length in handover report");
|
2013-02-11 11:43:46 -05:00
|
|
|
wpabuf_free(req);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
len /= 2;
|
|
|
|
|
|
|
|
sel = wpabuf_alloc(len);
|
|
|
|
if (sel == NULL) {
|
2013-11-28 06:47:32 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "NFC: Failed to allocate memory for select message");
|
2013-02-11 11:43:46 -05:00
|
|
|
wpabuf_free(req);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (hexstr2bin(pos2, wpabuf_put(sel, len), len) < 0) {
|
2013-11-28 06:47:32 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "NFC: Invalid select message hexdump in handover report");
|
2013-02-11 11:43:46 -05:00
|
|
|
wpabuf_free(req);
|
|
|
|
wpabuf_free(sel);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-11-28 06:47:32 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "NFC: Connection handover reported - role=%s type=%s req_len=%d sel_len=%d",
|
|
|
|
role, type, (int) wpabuf_len(req), (int) wpabuf_len(sel));
|
|
|
|
|
2013-02-11 11:43:46 -05:00
|
|
|
if (os_strcmp(role, "INIT") == 0 && os_strcmp(type, "WPS") == 0) {
|
|
|
|
ret = wpas_wps_nfc_report_handover(wpa_s, req, sel);
|
2014-02-13 08:29:09 -05:00
|
|
|
#ifdef CONFIG_AP
|
2013-04-04 09:43:12 -04:00
|
|
|
} else if (os_strcmp(role, "RESP") == 0 && os_strcmp(type, "WPS") == 0)
|
|
|
|
{
|
|
|
|
ret = wpas_ap_wps_nfc_report_handover(wpa_s, req, sel);
|
2013-04-12 00:37:41 -04:00
|
|
|
if (ret < 0)
|
|
|
|
ret = wpas_er_wps_nfc_report_handover(wpa_s, req, sel);
|
2014-02-13 08:29:09 -05:00
|
|
|
#endif /* CONFIG_AP */
|
|
|
|
#ifdef CONFIG_P2P
|
2013-04-27 11:50:14 -04:00
|
|
|
} else if (os_strcmp(role, "INIT") == 0 && os_strcmp(type, "P2P") == 0)
|
|
|
|
{
|
2013-12-03 22:44:56 -05:00
|
|
|
ret = wpas_p2p_nfc_report_handover(wpa_s, 1, req, sel, 0);
|
2013-04-27 11:50:14 -04:00
|
|
|
} else if (os_strcmp(role, "RESP") == 0 && os_strcmp(type, "P2P") == 0)
|
|
|
|
{
|
2013-12-03 22:44:56 -05:00
|
|
|
ret = wpas_p2p_nfc_report_handover(wpa_s, 0, req, sel,
|
|
|
|
forced_freq);
|
2014-02-13 08:29:09 -05:00
|
|
|
#endif /* CONFIG_P2P */
|
2013-02-11 11:43:46 -05:00
|
|
|
} else {
|
|
|
|
wpa_printf(MSG_DEBUG, "NFC: Unsupported connection handover "
|
|
|
|
"reported: role=%s type=%s", role, type);
|
|
|
|
ret = -1;
|
|
|
|
}
|
|
|
|
wpabuf_free(req);
|
|
|
|
wpabuf_free(sel);
|
|
|
|
|
2013-11-28 06:47:32 -05:00
|
|
|
if (ret)
|
|
|
|
wpa_printf(MSG_DEBUG, "NFC: Failed to process reported handover messages");
|
|
|
|
|
2013-02-11 11:43:46 -05:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-06-28 07:05:13 -04:00
|
|
|
#endif /* CONFIG_WPS_NFC */
|
2009-02-26 14:57:38 -05:00
|
|
|
|
|
|
|
|
2008-11-29 13:59:45 -05:00
|
|
|
static int wpa_supplicant_ctrl_iface_wps_reg(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
2010-10-25 11:56:49 -04:00
|
|
|
u8 bssid[ETH_ALEN];
|
2008-11-29 13:59:45 -05:00
|
|
|
char *pin;
|
2009-09-06 06:58:15 -04:00
|
|
|
char *new_ssid;
|
|
|
|
char *new_auth;
|
|
|
|
char *new_encr;
|
|
|
|
char *new_key;
|
|
|
|
struct wps_new_ap_settings ap;
|
2008-11-29 13:59:45 -05:00
|
|
|
|
|
|
|
pin = os_strchr(cmd, ' ');
|
|
|
|
if (pin == NULL)
|
|
|
|
return -1;
|
|
|
|
*pin++ = '\0';
|
|
|
|
|
2010-10-25 11:56:49 -04:00
|
|
|
if (hwaddr_aton(cmd, bssid)) {
|
2008-11-29 13:59:45 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE WPS_REG: invalid BSSID '%s'",
|
|
|
|
cmd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-09-06 06:58:15 -04:00
|
|
|
new_ssid = os_strchr(pin, ' ');
|
|
|
|
if (new_ssid == NULL)
|
2010-10-25 11:56:49 -04:00
|
|
|
return wpas_wps_start_reg(wpa_s, bssid, pin, NULL);
|
2009-09-06 06:58:15 -04:00
|
|
|
*new_ssid++ = '\0';
|
|
|
|
|
|
|
|
new_auth = os_strchr(new_ssid, ' ');
|
|
|
|
if (new_auth == NULL)
|
|
|
|
return -1;
|
|
|
|
*new_auth++ = '\0';
|
|
|
|
|
|
|
|
new_encr = os_strchr(new_auth, ' ');
|
|
|
|
if (new_encr == NULL)
|
|
|
|
return -1;
|
|
|
|
*new_encr++ = '\0';
|
|
|
|
|
|
|
|
new_key = os_strchr(new_encr, ' ');
|
|
|
|
if (new_key == NULL)
|
|
|
|
return -1;
|
|
|
|
*new_key++ = '\0';
|
|
|
|
|
|
|
|
os_memset(&ap, 0, sizeof(ap));
|
|
|
|
ap.ssid_hex = new_ssid;
|
|
|
|
ap.auth = new_auth;
|
|
|
|
ap.encr = new_encr;
|
|
|
|
ap.key_hex = new_key;
|
2010-10-25 11:56:49 -04:00
|
|
|
return wpas_wps_start_reg(wpa_s, bssid, pin, &ap);
|
2008-11-29 13:59:45 -05:00
|
|
|
}
|
2009-11-13 15:07:11 -05:00
|
|
|
|
|
|
|
|
2010-11-17 09:46:55 -05:00
|
|
|
#ifdef CONFIG_AP
|
|
|
|
static int wpa_supplicant_ctrl_iface_wps_ap_pin(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd, char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
int timeout = 300;
|
|
|
|
char *pos;
|
|
|
|
const char *pin_txt;
|
|
|
|
|
|
|
|
if (!wpa_s->ap_iface)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos)
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "disable") == 0) {
|
|
|
|
wpas_wps_ap_pin_disable(wpa_s);
|
|
|
|
return os_snprintf(buf, buflen, "OK\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "random") == 0) {
|
|
|
|
if (pos)
|
|
|
|
timeout = atoi(pos);
|
|
|
|
pin_txt = wpas_wps_ap_pin_random(wpa_s, timeout);
|
|
|
|
if (pin_txt == NULL)
|
|
|
|
return -1;
|
|
|
|
return os_snprintf(buf, buflen, "%s", pin_txt);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "get") == 0) {
|
|
|
|
pin_txt = wpas_wps_ap_pin_get(wpa_s);
|
|
|
|
if (pin_txt == NULL)
|
|
|
|
return -1;
|
|
|
|
return os_snprintf(buf, buflen, "%s", pin_txt);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "set") == 0) {
|
|
|
|
char *pin;
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
pin = pos;
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos) {
|
|
|
|
*pos++ = '\0';
|
|
|
|
timeout = atoi(pos);
|
|
|
|
}
|
|
|
|
if (os_strlen(pin) > buflen)
|
|
|
|
return -1;
|
|
|
|
if (wpas_wps_ap_pin_set(wpa_s, pin, timeout) < 0)
|
|
|
|
return -1;
|
|
|
|
return os_snprintf(buf, buflen, "%s", pin);
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_AP */
|
|
|
|
|
|
|
|
|
2009-11-13 15:07:11 -05:00
|
|
|
#ifdef CONFIG_WPS_ER
|
|
|
|
static int wpa_supplicant_ctrl_iface_wps_er_pin(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
2009-12-12 09:40:10 -05:00
|
|
|
char *uuid = cmd, *pin, *pos;
|
|
|
|
u8 addr_buf[ETH_ALEN], *addr = NULL;
|
2009-11-13 15:07:11 -05:00
|
|
|
pin = os_strchr(uuid, ' ');
|
|
|
|
if (pin == NULL)
|
|
|
|
return -1;
|
|
|
|
*pin++ = '\0';
|
2009-12-12 09:40:10 -05:00
|
|
|
pos = os_strchr(pin, ' ');
|
|
|
|
if (pos) {
|
|
|
|
*pos++ = '\0';
|
|
|
|
if (hwaddr_aton(pos, addr_buf) == 0)
|
|
|
|
addr = addr_buf;
|
|
|
|
}
|
|
|
|
return wpas_wps_er_add_pin(wpa_s, addr, uuid, pin);
|
2009-11-13 15:07:11 -05:00
|
|
|
}
|
2009-11-15 15:27:06 -05:00
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_wps_er_learn(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
char *uuid = cmd, *pin;
|
|
|
|
pin = os_strchr(uuid, ' ');
|
|
|
|
if (pin == NULL)
|
|
|
|
return -1;
|
|
|
|
*pin++ = '\0';
|
|
|
|
return wpas_wps_er_learn(wpa_s, uuid, pin);
|
|
|
|
}
|
2010-05-27 17:01:48 -04:00
|
|
|
|
|
|
|
|
2010-10-20 06:37:01 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_wps_er_set_config(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *uuid = cmd, *id;
|
|
|
|
id = os_strchr(uuid, ' ');
|
|
|
|
if (id == NULL)
|
|
|
|
return -1;
|
|
|
|
*id++ = '\0';
|
|
|
|
return wpas_wps_er_set_config(wpa_s, uuid, atoi(id));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-05-27 17:01:48 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_wps_er_config(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pin;
|
|
|
|
char *new_ssid;
|
|
|
|
char *new_auth;
|
|
|
|
char *new_encr;
|
|
|
|
char *new_key;
|
|
|
|
struct wps_new_ap_settings ap;
|
|
|
|
|
|
|
|
pin = os_strchr(cmd, ' ');
|
|
|
|
if (pin == NULL)
|
|
|
|
return -1;
|
|
|
|
*pin++ = '\0';
|
|
|
|
|
|
|
|
new_ssid = os_strchr(pin, ' ');
|
|
|
|
if (new_ssid == NULL)
|
|
|
|
return -1;
|
|
|
|
*new_ssid++ = '\0';
|
|
|
|
|
|
|
|
new_auth = os_strchr(new_ssid, ' ');
|
|
|
|
if (new_auth == NULL)
|
|
|
|
return -1;
|
|
|
|
*new_auth++ = '\0';
|
|
|
|
|
|
|
|
new_encr = os_strchr(new_auth, ' ');
|
|
|
|
if (new_encr == NULL)
|
|
|
|
return -1;
|
|
|
|
*new_encr++ = '\0';
|
|
|
|
|
|
|
|
new_key = os_strchr(new_encr, ' ');
|
|
|
|
if (new_key == NULL)
|
|
|
|
return -1;
|
|
|
|
*new_key++ = '\0';
|
|
|
|
|
|
|
|
os_memset(&ap, 0, sizeof(ap));
|
|
|
|
ap.ssid_hex = new_ssid;
|
|
|
|
ap.auth = new_auth;
|
|
|
|
ap.encr = new_encr;
|
|
|
|
ap.key_hex = new_key;
|
|
|
|
return wpas_wps_er_config(wpa_s, cmd, pin, &ap);
|
|
|
|
}
|
2012-06-28 09:35:51 -04:00
|
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_WPS_NFC
|
|
|
|
static int wpa_supplicant_ctrl_iface_wps_er_nfc_config_token(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd, char *reply, size_t max_len)
|
|
|
|
{
|
|
|
|
int ndef;
|
|
|
|
struct wpabuf *buf;
|
|
|
|
int res;
|
|
|
|
char *uuid;
|
|
|
|
|
|
|
|
uuid = os_strchr(cmd, ' ');
|
|
|
|
if (uuid == NULL)
|
|
|
|
return -1;
|
|
|
|
*uuid++ = '\0';
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "WPS") == 0)
|
|
|
|
ndef = 0;
|
|
|
|
else if (os_strcmp(cmd, "NDEF") == 0)
|
|
|
|
ndef = 1;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
buf = wpas_wps_er_nfc_config_token(wpa_s, ndef, uuid);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
res = wpa_snprintf_hex_uppercase(reply, max_len, wpabuf_head(buf),
|
|
|
|
wpabuf_len(buf));
|
|
|
|
reply[res++] = '\n';
|
|
|
|
reply[res] = '\0';
|
|
|
|
|
|
|
|
wpabuf_free(buf);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_WPS_NFC */
|
2009-11-13 15:07:11 -05:00
|
|
|
#endif /* CONFIG_WPS_ER */
|
|
|
|
|
2008-11-29 13:59:45 -05:00
|
|
|
#endif /* CONFIG_WPS */
|
|
|
|
|
|
|
|
|
2009-01-14 18:21:55 -05:00
|
|
|
#ifdef CONFIG_IBSS_RSN
|
|
|
|
static int wpa_supplicant_ctrl_iface_ibss_rsn(
|
|
|
|
struct wpa_supplicant *wpa_s, char *addr)
|
|
|
|
{
|
|
|
|
u8 peer[ETH_ALEN];
|
|
|
|
|
|
|
|
if (hwaddr_aton(addr, peer)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE IBSS_RSN: invalid "
|
2010-04-10 15:46:54 -04:00
|
|
|
"address '%s'", addr);
|
2009-01-14 18:21:55 -05:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE IBSS_RSN " MACSTR,
|
|
|
|
MAC2STR(peer));
|
|
|
|
|
|
|
|
return ibss_rsn_start(wpa_s->ibss_rsn, peer);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_IBSS_RSN */
|
|
|
|
|
|
|
|
|
2011-10-24 12:07:02 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_ctrl_rsp(struct wpa_supplicant *wpa_s,
|
|
|
|
char *rsp)
|
|
|
|
{
|
|
|
|
#ifdef IEEE8021X_EAPOL
|
|
|
|
char *pos, *id_pos;
|
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
|
|
|
|
pos = os_strchr(rsp, '-');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
id_pos = pos;
|
|
|
|
pos = os_strchr(pos, ':');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
id = atoi(id_pos);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: field=%s id=%d", rsp, id);
|
|
|
|
wpa_hexdump_ascii_key(MSG_DEBUG, "CTRL_IFACE: value",
|
|
|
|
(u8 *) pos, os_strlen(pos));
|
|
|
|
|
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find SSID id=%d "
|
|
|
|
"to update", id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return wpa_supplicant_ctrl_iface_ctrl_rsp_handle(wpa_s, ssid, rsp,
|
|
|
|
pos);
|
2008-02-27 20:34:43 -05:00
|
|
|
#else /* IEEE8021X_EAPOL */
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: 802.1X not included");
|
|
|
|
return -1;
|
|
|
|
#endif /* IEEE8021X_EAPOL */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s,
|
|
|
|
const char *params,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
char *pos, *end, tmp[30];
|
2011-12-01 15:12:03 -05:00
|
|
|
int res, verbose, wps, ret;
|
2012-11-02 06:08:11 -04:00
|
|
|
#ifdef CONFIG_HS20
|
|
|
|
const u8 *hs20;
|
|
|
|
#endif /* CONFIG_HS20 */
|
2015-01-27 09:14:40 -05:00
|
|
|
const u8 *sess_id;
|
|
|
|
size_t sess_id_len;
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2013-09-28 10:19:30 -04:00
|
|
|
if (os_strcmp(params, "-DRIVER") == 0)
|
|
|
|
return wpa_drv_status(wpa_s, buf, buflen);
|
2008-02-27 20:34:43 -05:00
|
|
|
verbose = os_strcmp(params, "-VERBOSE") == 0;
|
2011-12-01 15:12:03 -05:00
|
|
|
wps = os_strcmp(params, "-WPS") == 0;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos = buf;
|
|
|
|
end = buf + buflen;
|
|
|
|
if (wpa_s->wpa_state >= WPA_ASSOCIATED) {
|
|
|
|
struct wpa_ssid *ssid = wpa_s->current_ssid;
|
|
|
|
ret = os_snprintf(pos, end - pos, "bssid=" MACSTR "\n",
|
|
|
|
MAC2STR(wpa_s->bssid));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
2014-09-13 12:24:04 -04:00
|
|
|
ret = os_snprintf(pos, end - pos, "freq=%u\n",
|
|
|
|
wpa_s->assoc_freq);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-09-13 12:24:04 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
2008-02-27 20:34:43 -05:00
|
|
|
if (ssid) {
|
|
|
|
u8 *_ssid = ssid->ssid;
|
|
|
|
size_t ssid_len = ssid->ssid_len;
|
|
|
|
u8 ssid_buf[MAX_SSID_LEN];
|
|
|
|
if (ssid_len == 0) {
|
|
|
|
int _res = wpa_drv_get_ssid(wpa_s, ssid_buf);
|
|
|
|
if (_res < 0)
|
|
|
|
ssid_len = 0;
|
|
|
|
else
|
|
|
|
ssid_len = _res;
|
|
|
|
_ssid = ssid_buf;
|
|
|
|
}
|
|
|
|
ret = os_snprintf(pos, end - pos, "ssid=%s\nid=%d\n",
|
|
|
|
wpa_ssid_txt(_ssid, ssid_len),
|
|
|
|
ssid->id);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
|
2011-12-01 15:12:03 -05:00
|
|
|
if (wps && ssid->passphrase &&
|
|
|
|
wpa_key_mgmt_wpa_psk(ssid->key_mgmt) &&
|
|
|
|
(ssid->mode == WPAS_MODE_AP ||
|
|
|
|
ssid->mode == WPAS_MODE_P2P_GO)) {
|
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"passphrase=%s\n",
|
|
|
|
ssid->passphrase);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-12-01 15:12:03 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
if (ssid->id_str) {
|
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"id_str=%s\n",
|
|
|
|
ssid->id_str);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2009-12-16 09:02:38 -05:00
|
|
|
|
|
|
|
switch (ssid->mode) {
|
2009-12-28 09:00:36 -05:00
|
|
|
case WPAS_MODE_INFRA:
|
2009-12-16 09:02:38 -05:00
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"mode=station\n");
|
|
|
|
break;
|
2009-12-28 09:00:36 -05:00
|
|
|
case WPAS_MODE_IBSS:
|
2009-12-16 09:02:38 -05:00
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"mode=IBSS\n");
|
|
|
|
break;
|
2009-12-28 09:00:36 -05:00
|
|
|
case WPAS_MODE_AP:
|
2009-12-16 09:02:38 -05:00
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"mode=AP\n");
|
|
|
|
break;
|
2010-07-18 17:30:24 -04:00
|
|
|
case WPAS_MODE_P2P_GO:
|
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"mode=P2P GO\n");
|
|
|
|
break;
|
|
|
|
case WPAS_MODE_P2P_GROUP_FORMATION:
|
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"mode=P2P GO - group "
|
|
|
|
"formation\n");
|
|
|
|
break;
|
2009-12-16 09:02:38 -05:00
|
|
|
default:
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
}
|
2014-12-07 05:52:59 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2009-12-16 09:02:38 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
|
|
|
|
2009-10-16 11:35:45 -04:00
|
|
|
#ifdef CONFIG_AP
|
|
|
|
if (wpa_s->ap_iface) {
|
|
|
|
pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos,
|
|
|
|
end - pos,
|
|
|
|
verbose);
|
|
|
|
} else
|
|
|
|
#endif /* CONFIG_AP */
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += wpa_sm_get_status(wpa_s->wpa, pos, end - pos, verbose);
|
|
|
|
}
|
2013-01-01 09:33:25 -05:00
|
|
|
#ifdef CONFIG_SAE
|
|
|
|
if (wpa_s->wpa_state >= WPA_ASSOCIATED &&
|
2013-09-03 04:25:29 -04:00
|
|
|
#ifdef CONFIG_AP
|
|
|
|
!wpa_s->ap_iface &&
|
|
|
|
#endif /* CONFIG_AP */
|
|
|
|
wpa_s->sme.sae.state == SAE_ACCEPTED) {
|
2013-01-01 09:33:25 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "sae_group=%d\n",
|
|
|
|
wpa_s->sme.sae.group);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-01-01 09:33:25 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_SAE */
|
2008-02-27 20:34:43 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "wpa_state=%s\n",
|
|
|
|
wpa_supplicant_state_txt(wpa_s->wpa_state));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
if (wpa_s->l2 &&
|
|
|
|
l2_packet_get_ip_addr(wpa_s->l2, tmp, sizeof(tmp)) >= 0) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "ip_address=%s\n", tmp);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
if (wpa_s->global->p2p) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "p2p_device_address=" MACSTR
|
|
|
|
"\n", MAC2STR(wpa_s->global->p2p_dev_addr));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2010-07-18 17:30:25 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2010-11-21 05:35:49 -05:00
|
|
|
#endif /* CONFIG_P2P */
|
2010-06-30 10:39:29 -04:00
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "address=" MACSTR "\n",
|
|
|
|
MAC2STR(wpa_s->own_addr));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2010-06-30 10:39:29 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
2010-07-18 17:30:25 -04:00
|
|
|
|
2011-10-03 11:23:01 -04:00
|
|
|
#ifdef CONFIG_HS20
|
|
|
|
if (wpa_s->current_bss &&
|
2012-11-02 06:08:11 -04:00
|
|
|
(hs20 = wpa_bss_get_vendor_ie(wpa_s->current_bss,
|
|
|
|
HS20_IE_VENDOR_TYPE)) &&
|
2012-08-19 05:34:14 -04:00
|
|
|
wpa_s->wpa_proto == WPA_PROTO_RSN &&
|
|
|
|
wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) {
|
2012-11-02 06:08:11 -04:00
|
|
|
int release = 1;
|
|
|
|
if (hs20[1] >= 5) {
|
|
|
|
u8 rel_num = (hs20[6] & 0xf0) >> 4;
|
|
|
|
release = rel_num + 1;
|
|
|
|
}
|
|
|
|
ret = os_snprintf(pos, end - pos, "hs20=%d\n", release);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-10-03 11:23:01 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2012-11-22 13:51:49 -05:00
|
|
|
|
|
|
|
if (wpa_s->current_ssid) {
|
|
|
|
struct wpa_cred *cred;
|
|
|
|
char *type;
|
|
|
|
|
|
|
|
for (cred = wpa_s->conf->cred; cred; cred = cred->next) {
|
2013-08-02 11:42:54 -04:00
|
|
|
size_t i;
|
|
|
|
|
2012-11-22 13:51:49 -05:00
|
|
|
if (wpa_s->current_ssid->parent_cred != cred)
|
|
|
|
continue;
|
|
|
|
|
2013-08-02 12:09:11 -04:00
|
|
|
if (cred->provisioning_sp) {
|
2013-08-02 11:42:54 -04:00
|
|
|
ret = os_snprintf(pos, end - pos,
|
2013-08-02 12:09:11 -04:00
|
|
|
"provisioning_sp=%s\n",
|
|
|
|
cred->provisioning_sp);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-08-02 11:42:54 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2012-11-22 13:51:49 -05:00
|
|
|
|
2013-08-02 12:09:11 -04:00
|
|
|
if (!cred->domain)
|
|
|
|
goto no_domain;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
if (wpa_s->current_bss && wpa_s->current_bss->anqp) {
|
|
|
|
struct wpabuf *names =
|
|
|
|
wpa_s->current_bss->anqp->domain_name;
|
|
|
|
for (i = 0; names && i < cred->num_domain; i++)
|
|
|
|
{
|
|
|
|
if (domain_name_list_contains(
|
|
|
|
names, cred->domain[i], 1))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (i == cred->num_domain)
|
|
|
|
i = 0; /* show first entry by default */
|
|
|
|
}
|
|
|
|
ret = os_snprintf(pos, end - pos, "home_sp=%s\n",
|
|
|
|
cred->domain[i]);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-08-02 12:09:11 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
no_domain:
|
2012-11-22 13:51:49 -05:00
|
|
|
if (wpa_s->current_bss == NULL ||
|
|
|
|
wpa_s->current_bss->anqp == NULL)
|
|
|
|
res = -1;
|
|
|
|
else
|
|
|
|
res = interworking_home_sp_cred(
|
|
|
|
wpa_s, cred,
|
|
|
|
wpa_s->current_bss->anqp->domain_name);
|
|
|
|
if (res > 0)
|
|
|
|
type = "home";
|
|
|
|
else if (res == 0)
|
|
|
|
type = "roaming";
|
|
|
|
else
|
|
|
|
type = "unknown";
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "sp_type=%s\n", type);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-11-22 13:51:49 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2011-10-03 11:23:01 -04:00
|
|
|
#endif /* CONFIG_HS20 */
|
|
|
|
|
2008-08-31 15:57:28 -04:00
|
|
|
if (wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt) ||
|
|
|
|
wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
|
2008-02-27 20:34:43 -05:00
|
|
|
res = eapol_sm_get_status(wpa_s->eapol, pos, end - pos,
|
|
|
|
verbose);
|
|
|
|
if (res >= 0)
|
|
|
|
pos += res;
|
|
|
|
}
|
|
|
|
|
2015-01-27 09:14:40 -05:00
|
|
|
sess_id = eapol_sm_get_session_id(wpa_s->eapol, &sess_id_len);
|
|
|
|
if (sess_id) {
|
|
|
|
char *start = pos;
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "eap_session_id=");
|
|
|
|
if (os_snprintf_error(end - pos, ret))
|
|
|
|
return start - buf;
|
|
|
|
pos += ret;
|
|
|
|
ret = wpa_snprintf_hex(pos, end - pos, sess_id, sess_id_len);
|
|
|
|
if (ret <= 0)
|
|
|
|
return start - buf;
|
|
|
|
pos += ret;
|
|
|
|
ret = os_snprintf(pos, end - pos, "\n");
|
|
|
|
if (os_snprintf_error(end - pos, ret))
|
|
|
|
return start - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
res = rsn_preauth_get_status(wpa_s->wpa, pos, end - pos, verbose);
|
|
|
|
if (res >= 0)
|
|
|
|
pos += res;
|
|
|
|
|
2013-12-28 12:44:49 -05:00
|
|
|
#ifdef CONFIG_WPS
|
|
|
|
{
|
|
|
|
char uuid_str[100];
|
|
|
|
uuid_bin2str(wpa_s->wps->uuid, uuid_str, sizeof(uuid_str));
|
|
|
|
ret = os_snprintf(pos, end - pos, "uuid=%s\n", uuid_str);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-12-28 12:44:49 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_WPS */
|
|
|
|
|
2013-11-11 15:52:59 -05:00
|
|
|
#ifdef ANDROID
|
2014-09-11 14:40:14 -04:00
|
|
|
/*
|
|
|
|
* Allow using the STATUS command with default behavior, say for debug,
|
|
|
|
* i.e., don't generate a "fake" CONNECTION and SUPPLICANT_STATE_CHANGE
|
|
|
|
* events with STATUS-NO_EVENTS.
|
|
|
|
*/
|
|
|
|
if (os_strcmp(params, "-NO_EVENTS")) {
|
|
|
|
wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_STATE_CHANGE
|
|
|
|
"id=%d state=%d BSSID=" MACSTR " SSID=%s",
|
|
|
|
wpa_s->current_ssid ? wpa_s->current_ssid->id : -1,
|
|
|
|
wpa_s->wpa_state,
|
|
|
|
MAC2STR(wpa_s->bssid),
|
|
|
|
wpa_s->current_ssid && wpa_s->current_ssid->ssid ?
|
|
|
|
wpa_ssid_txt(wpa_s->current_ssid->ssid,
|
|
|
|
wpa_s->current_ssid->ssid_len) : "");
|
|
|
|
if (wpa_s->wpa_state == WPA_COMPLETED) {
|
|
|
|
struct wpa_ssid *ssid = wpa_s->current_ssid;
|
|
|
|
wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_CONNECTED
|
|
|
|
"- connection to " MACSTR
|
|
|
|
" completed %s [id=%d id_str=%s]",
|
|
|
|
MAC2STR(wpa_s->bssid), "(auth)",
|
|
|
|
ssid ? ssid->id : -1,
|
|
|
|
ssid && ssid->id_str ? ssid->id_str : "");
|
|
|
|
}
|
2013-11-11 15:52:59 -05:00
|
|
|
}
|
|
|
|
#endif /* ANDROID */
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_bssid(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
u8 bssid[ETH_ALEN];
|
|
|
|
|
|
|
|
/* cmd: "<network id> <BSSID>" */
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
id = atoi(cmd);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: id=%d bssid='%s'", id, pos);
|
|
|
|
if (hwaddr_aton(pos, bssid)) {
|
|
|
|
wpa_printf(MSG_DEBUG ,"CTRL_IFACE: invalid BSSID '%s'", pos);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find SSID id=%d "
|
|
|
|
"to update", id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_memcpy(ssid->bssid, bssid, ETH_ALEN);
|
2008-06-03 11:08:48 -04:00
|
|
|
ssid->bssid_set = !is_zero_ether_addr(bssid);
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-10-18 13:11:52 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_blacklist(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd, char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
u8 bssid[ETH_ALEN];
|
|
|
|
struct wpa_blacklist *e;
|
|
|
|
char *pos, *end;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* cmd: "BLACKLIST [<BSSID>]" */
|
|
|
|
if (*cmd == '\0') {
|
|
|
|
pos = buf;
|
|
|
|
end = buf + buflen;
|
|
|
|
e = wpa_s->blacklist;
|
|
|
|
while (e) {
|
|
|
|
ret = os_snprintf(pos, end - pos, MACSTR "\n",
|
|
|
|
MAC2STR(e->bssid));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-10-18 13:11:52 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
e = e->next;
|
|
|
|
}
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
cmd++;
|
|
|
|
if (os_strncmp(cmd, "clear", 5) == 0) {
|
|
|
|
wpa_blacklist_clear(wpa_s);
|
|
|
|
os_memcpy(buf, "OK\n", 3);
|
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: BLACKLIST bssid='%s'", cmd);
|
|
|
|
if (hwaddr_aton(cmd, bssid)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: invalid BSSID '%s'", cmd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add the BSSID twice, so its count will be 2, causing it to be
|
|
|
|
* skipped when processing scan results.
|
|
|
|
*/
|
|
|
|
ret = wpa_blacklist_add(wpa_s, bssid);
|
2014-04-11 16:47:46 -04:00
|
|
|
if (ret < 0)
|
2011-10-18 13:11:52 -04:00
|
|
|
return -1;
|
|
|
|
ret = wpa_blacklist_add(wpa_s, bssid);
|
2014-04-11 16:47:46 -04:00
|
|
|
if (ret < 0)
|
2011-10-18 13:11:52 -04:00
|
|
|
return -1;
|
|
|
|
os_memcpy(buf, "OK\n", 3);
|
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-10-18 13:16:38 -04:00
|
|
|
static const char * debug_level_str(int level)
|
|
|
|
{
|
|
|
|
switch (level) {
|
|
|
|
case MSG_EXCESSIVE:
|
|
|
|
return "EXCESSIVE";
|
|
|
|
case MSG_MSGDUMP:
|
|
|
|
return "MSGDUMP";
|
|
|
|
case MSG_DEBUG:
|
|
|
|
return "DEBUG";
|
|
|
|
case MSG_INFO:
|
|
|
|
return "INFO";
|
|
|
|
case MSG_WARNING:
|
|
|
|
return "WARNING";
|
|
|
|
case MSG_ERROR:
|
|
|
|
return "ERROR";
|
|
|
|
default:
|
|
|
|
return "?";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int str_to_debug_level(const char *s)
|
|
|
|
{
|
|
|
|
if (os_strcasecmp(s, "EXCESSIVE") == 0)
|
|
|
|
return MSG_EXCESSIVE;
|
|
|
|
if (os_strcasecmp(s, "MSGDUMP") == 0)
|
|
|
|
return MSG_MSGDUMP;
|
|
|
|
if (os_strcasecmp(s, "DEBUG") == 0)
|
|
|
|
return MSG_DEBUG;
|
|
|
|
if (os_strcasecmp(s, "INFO") == 0)
|
|
|
|
return MSG_INFO;
|
|
|
|
if (os_strcasecmp(s, "WARNING") == 0)
|
|
|
|
return MSG_WARNING;
|
|
|
|
if (os_strcasecmp(s, "ERROR") == 0)
|
|
|
|
return MSG_ERROR;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_log_level(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd, char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
char *pos, *end, *stamp;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* cmd: "LOG_LEVEL [<level>]" */
|
|
|
|
if (*cmd == '\0') {
|
|
|
|
pos = buf;
|
|
|
|
end = buf + buflen;
|
|
|
|
ret = os_snprintf(pos, end - pos, "Current level: %s\n"
|
|
|
|
"Timestamp: %d\n",
|
|
|
|
debug_level_str(wpa_debug_level),
|
|
|
|
wpa_debug_timestamp);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-10-18 13:16:38 -04:00
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (*cmd == ' ')
|
|
|
|
cmd++;
|
|
|
|
|
|
|
|
stamp = os_strchr(cmd, ' ');
|
|
|
|
if (stamp) {
|
|
|
|
*stamp++ = '\0';
|
|
|
|
while (*stamp == ' ') {
|
|
|
|
stamp++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cmd && os_strlen(cmd)) {
|
|
|
|
int level = str_to_debug_level(cmd);
|
|
|
|
if (level < 0)
|
|
|
|
return -1;
|
|
|
|
wpa_debug_level = level;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stamp && os_strlen(stamp))
|
|
|
|
wpa_debug_timestamp = atoi(stamp);
|
|
|
|
|
|
|
|
os_memcpy(buf, "OK\n", 3);
|
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
static int wpa_supplicant_ctrl_iface_list_networks(
|
2014-12-02 13:59:29 -05:00
|
|
|
struct wpa_supplicant *wpa_s, char *cmd, char *buf, size_t buflen)
|
2008-02-27 20:34:43 -05:00
|
|
|
{
|
2014-12-03 14:48:46 -05:00
|
|
|
char *pos, *end, *prev;
|
2008-02-27 20:34:43 -05:00
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = buf + buflen;
|
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"network id / ssid / bssid / flags\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
ssid = wpa_s->conf->ssid;
|
2014-12-02 13:59:29 -05:00
|
|
|
|
|
|
|
/* skip over ssids until we find next one */
|
|
|
|
if (cmd != NULL && os_strncmp(cmd, "LAST_ID=", 8) == 0) {
|
|
|
|
int last_id = atoi(cmd + 8);
|
|
|
|
if (last_id != -1) {
|
|
|
|
while (ssid != NULL && ssid->id <= last_id) {
|
|
|
|
ssid = ssid->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
while (ssid) {
|
2014-12-03 14:48:46 -05:00
|
|
|
prev = pos;
|
2008-02-27 20:34:43 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "%d\t%s",
|
|
|
|
ssid->id,
|
|
|
|
wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-12-03 14:48:46 -05:00
|
|
|
return prev - buf;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += ret;
|
|
|
|
if (ssid->bssid_set) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "\t" MACSTR,
|
|
|
|
MAC2STR(ssid->bssid));
|
|
|
|
} else {
|
|
|
|
ret = os_snprintf(pos, end - pos, "\tany");
|
|
|
|
}
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-12-03 14:48:46 -05:00
|
|
|
return prev - buf;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += ret;
|
2012-08-26 16:01:26 -04:00
|
|
|
ret = os_snprintf(pos, end - pos, "\t%s%s%s%s",
|
2008-02-27 20:34:43 -05:00
|
|
|
ssid == wpa_s->current_ssid ?
|
|
|
|
"[CURRENT]" : "",
|
2010-07-18 17:30:25 -04:00
|
|
|
ssid->disabled ? "[DISABLED]" : "",
|
2012-08-26 16:01:26 -04:00
|
|
|
ssid->disabled_until.sec ?
|
|
|
|
"[TEMP-DISABLED]" : "",
|
2010-07-18 17:30:25 -04:00
|
|
|
ssid->disabled == 2 ? "[P2P-PERSISTENT]" :
|
|
|
|
"");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-12-03 14:48:46 -05:00
|
|
|
return prev - buf;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += ret;
|
|
|
|
ret = os_snprintf(pos, end - pos, "\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-12-03 14:48:46 -05:00
|
|
|
return prev - buf;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
ssid = ssid->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char * wpa_supplicant_cipher_txt(char *pos, char *end, int cipher)
|
|
|
|
{
|
2013-01-13 10:31:36 -05:00
|
|
|
int ret;
|
2008-02-27 20:34:43 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "-");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
2013-01-13 10:31:36 -05:00
|
|
|
ret = wpa_write_ciphers(pos, end, cipher, "+");
|
|
|
|
if (ret < 0)
|
|
|
|
return pos;
|
|
|
|
pos += ret;
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char * wpa_supplicant_ie_txt(char *pos, char *end, const char *proto,
|
|
|
|
const u8 *ie, size_t ie_len)
|
|
|
|
{
|
|
|
|
struct wpa_ie_data data;
|
2014-03-02 09:14:09 -05:00
|
|
|
char *start;
|
|
|
|
int ret;
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "[%s-", proto);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
if (wpa_parse_wpa_ie(ie, ie_len, &data) < 0) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "?]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
2014-03-02 09:14:09 -05:00
|
|
|
start = pos;
|
2008-02-27 20:34:43 -05:00
|
|
|
if (data.key_mgmt & WPA_KEY_MGMT_IEEE8021X) {
|
2014-03-02 09:14:09 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "%sEAP",
|
|
|
|
pos == start ? "" : "+");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
if (data.key_mgmt & WPA_KEY_MGMT_PSK) {
|
2014-03-02 09:14:09 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "%sPSK",
|
|
|
|
pos == start ? "" : "+");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
if (data.key_mgmt & WPA_KEY_MGMT_WPA_NONE) {
|
2014-03-02 09:14:09 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "%sNone",
|
|
|
|
pos == start ? "" : "+");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2014-09-01 00:23:32 -04:00
|
|
|
if (data.key_mgmt & WPA_KEY_MGMT_SAE) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sSAE",
|
|
|
|
pos == start ? "" : "+");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-09-01 00:23:32 -04:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
#ifdef CONFIG_IEEE80211R
|
|
|
|
if (data.key_mgmt & WPA_KEY_MGMT_FT_IEEE8021X) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sFT/EAP",
|
2014-03-02 09:14:09 -05:00
|
|
|
pos == start ? "" : "+");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
if (data.key_mgmt & WPA_KEY_MGMT_FT_PSK) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sFT/PSK",
|
2014-03-02 09:14:09 -05:00
|
|
|
pos == start ? "" : "+");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2014-09-01 00:23:32 -04:00
|
|
|
if (data.key_mgmt & WPA_KEY_MGMT_FT_SAE) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sFT/SAE",
|
|
|
|
pos == start ? "" : "+");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-09-01 00:23:32 -04:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
#endif /* CONFIG_IEEE80211R */
|
2008-08-31 15:57:28 -04:00
|
|
|
#ifdef CONFIG_IEEE80211W
|
|
|
|
if (data.key_mgmt & WPA_KEY_MGMT_IEEE8021X_SHA256) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sEAP-SHA256",
|
2014-03-02 09:14:09 -05:00
|
|
|
pos == start ? "" : "+");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-08-31 15:57:28 -04:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
if (data.key_mgmt & WPA_KEY_MGMT_PSK_SHA256) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sPSK-SHA256",
|
2014-03-02 09:14:09 -05:00
|
|
|
pos == start ? "" : "+");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-08-31 15:57:28 -04:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_IEEE80211W */
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2015-01-25 16:32:01 -05:00
|
|
|
#ifdef CONFIG_SUITEB
|
2014-11-16 06:20:51 -05:00
|
|
|
if (data.key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sEAP-SUITE-B",
|
|
|
|
pos == start ? "" : "+");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-11-16 06:20:51 -05:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2015-01-25 16:32:01 -05:00
|
|
|
#endif /* CONFIG_SUITEB */
|
|
|
|
|
|
|
|
#ifdef CONFIG_SUITEB192
|
|
|
|
if (data.key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sEAP-SUITE-B-192",
|
|
|
|
pos == start ? "" : "+");
|
|
|
|
if (os_snprintf_error(end - pos, ret))
|
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_SUITEB192 */
|
2014-11-16 06:20:51 -05:00
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
pos = wpa_supplicant_cipher_txt(pos, end, data.pairwise_cipher);
|
|
|
|
|
|
|
|
if (data.capabilities & WPA_CAPABILITY_PREAUTH) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "-preauth");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
|
2009-12-27 17:33:20 -05:00
|
|
|
|
2008-12-08 13:57:59 -05:00
|
|
|
#ifdef CONFIG_WPS
|
2009-12-12 09:40:10 -05:00
|
|
|
static char * wpa_supplicant_wps_ie_txt_buf(struct wpa_supplicant *wpa_s,
|
|
|
|
char *pos, char *end,
|
2009-12-27 17:33:20 -05:00
|
|
|
struct wpabuf *wps_ie)
|
|
|
|
{
|
2008-12-08 13:57:59 -05:00
|
|
|
int ret;
|
|
|
|
const char *txt;
|
|
|
|
|
|
|
|
if (wps_ie == NULL)
|
|
|
|
return pos;
|
|
|
|
if (wps_is_selected_pbc_registrar(wps_ie))
|
|
|
|
txt = "[WPS-PBC]";
|
2009-12-12 09:40:10 -05:00
|
|
|
else if (wps_is_addr_authorized(wps_ie, wpa_s->own_addr, 0))
|
|
|
|
txt = "[WPS-AUTH]";
|
2008-12-08 13:57:59 -05:00
|
|
|
else if (wps_is_selected_pin_registrar(wps_ie))
|
|
|
|
txt = "[WPS-PIN]";
|
|
|
|
else
|
|
|
|
txt = "[WPS]";
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s", txt);
|
2014-12-07 05:15:34 -05:00
|
|
|
if (!os_snprintf_error(end - pos, ret))
|
2008-12-08 13:57:59 -05:00
|
|
|
pos += ret;
|
|
|
|
wpabuf_free(wps_ie);
|
2009-12-27 17:33:20 -05:00
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_WPS */
|
|
|
|
|
|
|
|
|
2009-12-12 09:40:10 -05:00
|
|
|
static char * wpa_supplicant_wps_ie_txt(struct wpa_supplicant *wpa_s,
|
|
|
|
char *pos, char *end,
|
2010-01-02 08:19:35 -05:00
|
|
|
const struct wpa_bss *bss)
|
2009-12-27 17:33:20 -05:00
|
|
|
{
|
|
|
|
#ifdef CONFIG_WPS
|
|
|
|
struct wpabuf *wps_ie;
|
|
|
|
wps_ie = wpa_bss_get_vendor_ie_multi(bss, WPS_IE_VENDOR_TYPE);
|
2009-12-12 09:40:10 -05:00
|
|
|
return wpa_supplicant_wps_ie_txt_buf(wpa_s, pos, end, wps_ie);
|
2009-12-27 17:33:20 -05:00
|
|
|
#else /* CONFIG_WPS */
|
2008-12-08 13:57:59 -05:00
|
|
|
return pos;
|
2009-12-27 17:33:20 -05:00
|
|
|
#endif /* CONFIG_WPS */
|
2008-12-08 13:57:59 -05:00
|
|
|
}
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
/* Format one result on one text line into a buffer. */
|
|
|
|
static int wpa_supplicant_ctrl_iface_scan_result(
|
2009-12-12 09:40:10 -05:00
|
|
|
struct wpa_supplicant *wpa_s,
|
2010-01-02 08:19:35 -05:00
|
|
|
const struct wpa_bss *bss, char *buf, size_t buflen)
|
2008-02-27 20:34:43 -05:00
|
|
|
{
|
|
|
|
char *pos, *end;
|
|
|
|
int ret;
|
2014-09-01 00:23:32 -04:00
|
|
|
const u8 *ie, *ie2, *p2p, *mesh;
|
2010-07-18 17:30:25 -04:00
|
|
|
|
2014-09-01 00:23:32 -04:00
|
|
|
mesh = wpa_bss_get_ie(bss, WLAN_EID_MESH_ID);
|
2010-07-18 17:30:25 -04:00
|
|
|
p2p = wpa_bss_get_vendor_ie(bss, P2P_IE_VENDOR_TYPE);
|
2013-10-14 12:22:09 -04:00
|
|
|
if (!p2p)
|
|
|
|
p2p = wpa_bss_get_vendor_ie_beacon(bss, P2P_IE_VENDOR_TYPE);
|
2010-07-18 17:30:25 -04:00
|
|
|
if (p2p && bss->ssid_len == P2P_WILDCARD_SSID_LEN &&
|
|
|
|
os_memcmp(bss->ssid, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN) ==
|
|
|
|
0)
|
|
|
|
return 0; /* Do not show P2P listen discovery results here */
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = buf + buflen;
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, MACSTR "\t%d\t%d\t",
|
2010-01-02 08:19:35 -05:00
|
|
|
MAC2STR(bss->bssid), bss->freq, bss->level);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-02-26 06:16:04 -05:00
|
|
|
return -1;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += ret;
|
2010-01-02 08:19:35 -05:00
|
|
|
ie = wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE);
|
2008-02-27 20:34:43 -05:00
|
|
|
if (ie)
|
|
|
|
pos = wpa_supplicant_ie_txt(pos, end, "WPA", ie, 2 + ie[1]);
|
2010-01-02 08:19:35 -05:00
|
|
|
ie2 = wpa_bss_get_ie(bss, WLAN_EID_RSN);
|
2014-09-01 00:23:32 -04:00
|
|
|
if (ie2) {
|
|
|
|
pos = wpa_supplicant_ie_txt(pos, end, mesh ? "RSN" : "WPA2",
|
|
|
|
ie2, 2 + ie2[1]);
|
|
|
|
}
|
2009-12-12 09:40:10 -05:00
|
|
|
pos = wpa_supplicant_wps_ie_txt(wpa_s, pos, end, bss);
|
2010-01-02 08:19:35 -05:00
|
|
|
if (!ie && !ie2 && bss->caps & IEEE80211_CAP_PRIVACY) {
|
2008-02-27 20:34:43 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "[WEP]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-02-26 06:16:04 -05:00
|
|
|
return -1;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += ret;
|
|
|
|
}
|
2014-09-01 00:23:32 -04:00
|
|
|
if (mesh) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "[MESH]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-09-01 00:23:32 -04:00
|
|
|
return -1;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2014-05-12 03:35:41 -04:00
|
|
|
if (bss_is_dmg(bss)) {
|
|
|
|
const char *s;
|
|
|
|
ret = os_snprintf(pos, end - pos, "[DMG]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-02-26 06:16:04 -05:00
|
|
|
return -1;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += ret;
|
2014-05-12 03:35:41 -04:00
|
|
|
switch (bss->caps & IEEE80211_CAP_DMG_MASK) {
|
|
|
|
case IEEE80211_CAP_DMG_IBSS:
|
|
|
|
s = "[IBSS]";
|
|
|
|
break;
|
|
|
|
case IEEE80211_CAP_DMG_AP:
|
|
|
|
s = "[ESS]";
|
|
|
|
break;
|
|
|
|
case IEEE80211_CAP_DMG_PBSS:
|
|
|
|
s = "[PBSS]";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
s = "";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s", s);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-02-26 06:16:04 -05:00
|
|
|
return -1;
|
2009-12-28 06:35:51 -05:00
|
|
|
pos += ret;
|
2014-05-12 03:35:41 -04:00
|
|
|
} else {
|
|
|
|
if (bss->caps & IEEE80211_CAP_IBSS) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "[IBSS]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-05-12 03:35:41 -04:00
|
|
|
return -1;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
if (bss->caps & IEEE80211_CAP_ESS) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "[ESS]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-05-12 03:35:41 -04:00
|
|
|
return -1;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2009-12-28 06:35:51 -05:00
|
|
|
}
|
2010-07-18 17:30:25 -04:00
|
|
|
if (p2p) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "[P2P]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-02-26 06:16:04 -05:00
|
|
|
return -1;
|
2010-07-18 17:30:25 -04:00
|
|
|
pos += ret;
|
|
|
|
}
|
2011-10-03 11:23:01 -04:00
|
|
|
#ifdef CONFIG_HS20
|
2012-08-19 05:34:14 -04:00
|
|
|
if (wpa_bss_get_vendor_ie(bss, HS20_IE_VENDOR_TYPE) && ie2) {
|
2011-10-03 11:23:01 -04:00
|
|
|
ret = os_snprintf(pos, end - pos, "[HS20]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-10-03 11:23:01 -04:00
|
|
|
return -1;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_HS20 */
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "\t%s",
|
2010-01-02 08:19:35 -05:00
|
|
|
wpa_ssid_txt(bss->ssid, bss->ssid_len));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-02-26 06:16:04 -05:00
|
|
|
return -1;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-02-26 06:16:04 -05:00
|
|
|
return -1;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_scan_results(
|
|
|
|
struct wpa_supplicant *wpa_s, char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
char *pos, *end;
|
2010-01-02 08:19:35 -05:00
|
|
|
struct wpa_bss *bss;
|
2008-02-27 20:34:43 -05:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = buf + buflen;
|
|
|
|
ret = os_snprintf(pos, end - pos, "bssid / frequency / signal level / "
|
|
|
|
"flags / ssid\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
|
2010-01-02 08:19:35 -05:00
|
|
|
dl_list_for_each(bss, &wpa_s->bss_id, struct wpa_bss, list_id) {
|
2009-12-12 09:40:10 -05:00
|
|
|
ret = wpa_supplicant_ctrl_iface_scan_result(wpa_s, bss, pos,
|
2008-02-27 20:34:43 -05:00
|
|
|
end - pos);
|
|
|
|
if (ret < 0 || ret >= end - pos)
|
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-09-01 00:23:33 -04:00
|
|
|
#ifdef CONFIG_MESH
|
|
|
|
|
2014-11-14 20:35:23 -05:00
|
|
|
static int wpa_supplicant_ctrl_iface_mesh_interface_add(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd, char *reply, size_t max_len)
|
|
|
|
{
|
|
|
|
char *pos, ifname[IFNAMSIZ + 1];
|
|
|
|
|
|
|
|
ifname[0] = '\0';
|
|
|
|
|
|
|
|
pos = os_strstr(cmd, "ifname=");
|
|
|
|
if (pos) {
|
|
|
|
pos += 7;
|
|
|
|
os_strlcpy(ifname, pos, sizeof(ifname));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpas_mesh_add_interface(wpa_s, ifname, sizeof(ifname)) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
os_strlcpy(reply, ifname, max_len);
|
|
|
|
return os_strlen(ifname);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-09-01 00:23:33 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_mesh_group_add(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
|
|
|
|
id = atoi(cmd);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: MESH_GROUP_ADD id=%d", id);
|
|
|
|
|
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"CTRL_IFACE: Could not find network id=%d", id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (ssid->mode != WPAS_MODE_MESH) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"CTRL_IFACE: Cannot use MESH_GROUP_ADD on a non mesh network");
|
|
|
|
return -1;
|
|
|
|
}
|
2014-11-14 20:35:28 -05:00
|
|
|
if (ssid->key_mgmt != WPA_KEY_MGMT_NONE &&
|
|
|
|
ssid->key_mgmt != WPA_KEY_MGMT_SAE) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
|
|
|
"CTRL_IFACE: key_mgmt for mesh network should be open or SAE");
|
|
|
|
return -1;
|
|
|
|
}
|
2014-09-01 00:23:33 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* TODO: If necessary write our own group_add function,
|
|
|
|
* for now we can reuse select_network
|
|
|
|
*/
|
|
|
|
wpa_supplicant_select_network(wpa_s, ssid);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_mesh_group_remove(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
2014-11-14 20:35:23 -05:00
|
|
|
struct wpa_supplicant *orig;
|
|
|
|
struct wpa_global *global;
|
|
|
|
int found = 0;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: MESH_GROUP_REMOVE ifname=%s", cmd);
|
|
|
|
|
|
|
|
global = wpa_s->global;
|
|
|
|
orig = wpa_s;
|
|
|
|
|
|
|
|
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
|
|
|
|
if (os_strcmp(wpa_s->ifname, cmd) == 0) {
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!found) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
|
|
|
"CTRL_IFACE: MESH_GROUP_REMOVE ifname=%s not found",
|
2014-09-01 00:23:33 -04:00
|
|
|
cmd);
|
|
|
|
return -1;
|
|
|
|
}
|
2014-11-14 20:35:23 -05:00
|
|
|
if (wpa_s->mesh_if_created && wpa_s == orig) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
|
|
|
"CTRL_IFACE: MESH_GROUP_REMOVE can't remove itself");
|
|
|
|
return -1;
|
|
|
|
}
|
2014-09-01 00:23:33 -04:00
|
|
|
|
|
|
|
wpa_s->reassociate = 0;
|
|
|
|
wpa_s->disconnected = 1;
|
|
|
|
wpa_supplicant_cancel_sched_scan(wpa_s);
|
|
|
|
wpa_supplicant_cancel_scan(wpa_s);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* TODO: If necessary write our own group_remove function,
|
|
|
|
* for now we can reuse deauthenticate
|
|
|
|
*/
|
|
|
|
wpa_supplicant_deauthenticate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);
|
|
|
|
|
2014-11-14 20:35:23 -05:00
|
|
|
if (wpa_s->mesh_if_created)
|
|
|
|
wpa_supplicant_remove_iface(global, wpa_s, 0);
|
|
|
|
|
2014-09-01 00:23:33 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* CONFIG_MESH */
|
|
|
|
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
static int wpa_supplicant_ctrl_iface_select_network(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid;
|
2014-04-03 16:40:52 -04:00
|
|
|
char *pos;
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
/* cmd: "<network id>" or "any" */
|
2014-04-03 16:40:52 -04:00
|
|
|
if (os_strncmp(cmd, "any", 3) == 0) {
|
2008-02-27 20:34:43 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: SELECT_NETWORK any");
|
2009-09-13 14:16:43 -04:00
|
|
|
ssid = NULL;
|
|
|
|
} else {
|
|
|
|
id = atoi(cmd);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: SELECT_NETWORK id=%d", id);
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2009-09-13 14:16:43 -04:00
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find "
|
|
|
|
"network id=%d", id);
|
|
|
|
return -1;
|
|
|
|
}
|
2010-07-18 17:30:25 -04:00
|
|
|
if (ssid->disabled == 2) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Cannot use "
|
|
|
|
"SELECT_NETWORK with persistent P2P group");
|
|
|
|
return -1;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
|
|
|
|
2014-04-03 16:40:52 -04:00
|
|
|
pos = os_strstr(cmd, " freq=");
|
|
|
|
if (pos) {
|
|
|
|
int *freqs = freq_range_to_channel_list(wpa_s, pos + 6);
|
|
|
|
if (freqs) {
|
|
|
|
wpa_s->scan_req = MANUAL_SCAN_REQ;
|
|
|
|
os_free(wpa_s->manual_scan_freqs);
|
|
|
|
wpa_s->manual_scan_freqs = freqs;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-13 14:16:43 -04:00
|
|
|
wpa_supplicant_select_network(wpa_s, ssid);
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_enable_network(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
|
|
|
|
/* cmd: "<network id>" or "all" */
|
|
|
|
if (os_strcmp(cmd, "all") == 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: ENABLE_NETWORK all");
|
2009-09-13 14:16:43 -04:00
|
|
|
ssid = NULL;
|
|
|
|
} else {
|
|
|
|
id = atoi(cmd);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: ENABLE_NETWORK id=%d", id);
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2009-09-13 14:16:43 -04:00
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find "
|
|
|
|
"network id=%d", id);
|
|
|
|
return -1;
|
|
|
|
}
|
2010-07-18 17:30:25 -04:00
|
|
|
if (ssid->disabled == 2) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Cannot use "
|
|
|
|
"ENABLE_NETWORK with persistent P2P group");
|
|
|
|
return -1;
|
|
|
|
}
|
2012-02-16 09:27:41 -05:00
|
|
|
|
|
|
|
if (os_strstr(cmd, " no-connect")) {
|
|
|
|
ssid->disabled = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
2009-09-13 14:16:43 -04:00
|
|
|
wpa_supplicant_enable_network(wpa_s, ssid);
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_disable_network(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
|
|
|
|
/* cmd: "<network id>" or "all" */
|
|
|
|
if (os_strcmp(cmd, "all") == 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: DISABLE_NETWORK all");
|
2009-09-13 14:16:43 -04:00
|
|
|
ssid = NULL;
|
|
|
|
} else {
|
|
|
|
id = atoi(cmd);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: DISABLE_NETWORK id=%d", id);
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2009-09-13 14:16:43 -04:00
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find "
|
|
|
|
"network id=%d", id);
|
|
|
|
return -1;
|
|
|
|
}
|
2010-07-18 17:30:25 -04:00
|
|
|
if (ssid->disabled == 2) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Cannot use "
|
|
|
|
"DISABLE_NETWORK with persistent P2P "
|
|
|
|
"group");
|
|
|
|
return -1;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
2009-09-13 14:16:43 -04:00
|
|
|
wpa_supplicant_disable_network(wpa_s, ssid);
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_add_network(
|
|
|
|
struct wpa_supplicant *wpa_s, char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: ADD_NETWORK");
|
|
|
|
|
|
|
|
ssid = wpa_config_add_network(wpa_s->conf);
|
|
|
|
if (ssid == NULL)
|
|
|
|
return -1;
|
2009-09-13 13:53:32 -04:00
|
|
|
|
|
|
|
wpas_notify_network_added(wpa_s, ssid);
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
ssid->disabled = 1;
|
|
|
|
wpa_config_set_network_defaults(ssid);
|
|
|
|
|
|
|
|
ret = os_snprintf(buf, buflen, "%d\n", ssid->id);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return -1;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_remove_network(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid;
|
2013-03-10 11:51:13 -04:00
|
|
|
int was_disabled;
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
/* cmd: "<network id>" or "all" */
|
|
|
|
if (os_strcmp(cmd, "all") == 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: REMOVE_NETWORK all");
|
2013-03-10 11:51:13 -04:00
|
|
|
if (wpa_s->sched_scanning)
|
|
|
|
wpa_supplicant_cancel_sched_scan(wpa_s);
|
|
|
|
|
2011-09-07 10:46:00 -04:00
|
|
|
eapol_sm_invalidate_cached_session(wpa_s->eapol);
|
2008-02-27 20:34:43 -05:00
|
|
|
if (wpa_s->current_ssid) {
|
2012-03-23 19:12:07 -04:00
|
|
|
#ifdef CONFIG_SME
|
|
|
|
wpa_s->sme.prev_bssid_set = 0;
|
|
|
|
#endif /* CONFIG_SME */
|
2011-06-27 12:02:24 -04:00
|
|
|
wpa_sm_set_config(wpa_s->wpa, NULL);
|
|
|
|
eapol_sm_notify_config(wpa_s->eapol, NULL, NULL);
|
2012-11-05 09:55:30 -05:00
|
|
|
wpa_supplicant_deauthenticate(
|
|
|
|
wpa_s, WLAN_REASON_DEAUTH_LEAVING);
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
2013-02-03 14:22:59 -05:00
|
|
|
ssid = wpa_s->conf->ssid;
|
|
|
|
while (ssid) {
|
|
|
|
struct wpa_ssid *remove_ssid = ssid;
|
|
|
|
id = ssid->id;
|
|
|
|
ssid = ssid->next;
|
2014-09-27 12:12:41 -04:00
|
|
|
if (wpa_s->last_ssid == remove_ssid)
|
|
|
|
wpa_s->last_ssid = NULL;
|
2013-02-03 14:22:59 -05:00
|
|
|
wpas_notify_network_removed(wpa_s, remove_ssid);
|
|
|
|
wpa_config_remove_network(wpa_s->conf, id);
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
id = atoi(cmd);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: REMOVE_NETWORK id=%d", id);
|
|
|
|
|
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
2011-09-07 10:44:00 -04:00
|
|
|
if (ssid)
|
|
|
|
wpas_notify_network_removed(wpa_s, ssid);
|
2012-09-03 04:55:38 -04:00
|
|
|
if (ssid == NULL) {
|
2008-02-27 20:34:43 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find network "
|
|
|
|
"id=%d", id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-09-27 12:12:41 -04:00
|
|
|
if (wpa_s->last_ssid == ssid)
|
|
|
|
wpa_s->last_ssid = NULL;
|
|
|
|
|
2011-09-07 10:46:00 -04:00
|
|
|
if (ssid == wpa_s->current_ssid || wpa_s->current_ssid == NULL) {
|
2012-03-23 19:12:07 -04:00
|
|
|
#ifdef CONFIG_SME
|
|
|
|
wpa_s->sme.prev_bssid_set = 0;
|
|
|
|
#endif /* CONFIG_SME */
|
2008-02-27 20:34:43 -05:00
|
|
|
/*
|
2011-09-07 10:46:00 -04:00
|
|
|
* Invalidate the EAP session cache if the current or
|
|
|
|
* previously used network is removed.
|
2008-02-27 20:34:43 -05:00
|
|
|
*/
|
|
|
|
eapol_sm_invalidate_cached_session(wpa_s->eapol);
|
2011-09-07 10:46:00 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ssid == wpa_s->current_ssid) {
|
2011-06-27 12:02:24 -04:00
|
|
|
wpa_sm_set_config(wpa_s->wpa, NULL);
|
|
|
|
eapol_sm_notify_config(wpa_s->eapol, NULL, NULL);
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2012-11-05 09:55:30 -05:00
|
|
|
wpa_supplicant_deauthenticate(wpa_s,
|
|
|
|
WLAN_REASON_DEAUTH_LEAVING);
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
|
|
|
|
2013-03-10 11:51:13 -04:00
|
|
|
was_disabled = ssid->disabled;
|
|
|
|
|
2012-09-03 04:55:38 -04:00
|
|
|
if (wpa_config_remove_network(wpa_s->conf, id) < 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Not able to remove the "
|
|
|
|
"network id=%d", id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-03-10 11:51:13 -04:00
|
|
|
if (!was_disabled && wpa_s->sched_scanning) {
|
|
|
|
wpa_printf(MSG_DEBUG, "Stop ongoing sched_scan to remove "
|
|
|
|
"network from filters");
|
|
|
|
wpa_supplicant_cancel_sched_scan(wpa_s);
|
|
|
|
wpa_supplicant_req_scan(wpa_s, 0, 0);
|
|
|
|
}
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-04-29 16:41:47 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_update_network(
|
|
|
|
struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
|
|
|
|
char *name, char *value)
|
|
|
|
{
|
|
|
|
if (wpa_config_set(ssid, name, value, 0) < 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Failed to set network "
|
|
|
|
"variable '%s'", name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(name, "bssid") != 0 &&
|
|
|
|
os_strcmp(name, "priority") != 0)
|
|
|
|
wpa_sm_pmksa_cache_flush(wpa_s->wpa, ssid);
|
|
|
|
|
|
|
|
if (wpa_s->current_ssid == ssid || wpa_s->current_ssid == NULL) {
|
|
|
|
/*
|
|
|
|
* Invalidate the EAP session cache if anything in the current
|
|
|
|
* or previously used configuration changes.
|
|
|
|
*/
|
|
|
|
eapol_sm_invalidate_cached_session(wpa_s->eapol);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((os_strcmp(name, "psk") == 0 &&
|
|
|
|
value[0] == '"' && ssid->ssid_len) ||
|
|
|
|
(os_strcmp(name, "ssid") == 0 && ssid->passphrase))
|
|
|
|
wpa_config_update_psk(ssid);
|
|
|
|
else if (os_strcmp(name, "priority") == 0)
|
|
|
|
wpa_config_update_prio_list(wpa_s->conf);
|
2014-09-01 00:23:26 -04:00
|
|
|
else if (os_strcmp(name, "no_auto_peer") == 0)
|
|
|
|
ssid->no_auto_peer = atoi(value);
|
2014-04-29 16:41:47 -04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
static int wpa_supplicant_ctrl_iface_set_network(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
2014-09-11 08:52:37 -04:00
|
|
|
int id, ret, prev_bssid_set;
|
2008-02-27 20:34:43 -05:00
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
char *name, *value;
|
2014-09-11 08:52:37 -04:00
|
|
|
u8 prev_bssid[ETH_ALEN];
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
/* cmd: "<network id> <variable name> <value>" */
|
|
|
|
name = os_strchr(cmd, ' ');
|
|
|
|
if (name == NULL)
|
|
|
|
return -1;
|
|
|
|
*name++ = '\0';
|
|
|
|
|
|
|
|
value = os_strchr(name, ' ');
|
|
|
|
if (value == NULL)
|
|
|
|
return -1;
|
|
|
|
*value++ = '\0';
|
|
|
|
|
|
|
|
id = atoi(cmd);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: SET_NETWORK id=%d name='%s'",
|
|
|
|
id, name);
|
|
|
|
wpa_hexdump_ascii_key(MSG_DEBUG, "CTRL_IFACE: value",
|
|
|
|
(u8 *) value, os_strlen(value));
|
|
|
|
|
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find network "
|
|
|
|
"id=%d", id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-09-11 08:52:37 -04:00
|
|
|
prev_bssid_set = ssid->bssid_set;
|
|
|
|
os_memcpy(prev_bssid, ssid->bssid, ETH_ALEN);
|
|
|
|
ret = wpa_supplicant_ctrl_iface_update_network(wpa_s, ssid, name,
|
|
|
|
value);
|
|
|
|
if (ret == 0 &&
|
|
|
|
(ssid->bssid_set != prev_bssid_set ||
|
|
|
|
os_memcmp(ssid->bssid, prev_bssid, ETH_ALEN) != 0))
|
|
|
|
wpas_notify_network_bssid_set_changed(wpa_s, ssid);
|
|
|
|
return ret;
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_get_network(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd, char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
int id;
|
|
|
|
size_t res;
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
char *name, *value;
|
|
|
|
|
|
|
|
/* cmd: "<network id> <variable name>" */
|
|
|
|
name = os_strchr(cmd, ' ');
|
|
|
|
if (name == NULL || buflen == 0)
|
|
|
|
return -1;
|
|
|
|
*name++ = '\0';
|
|
|
|
|
|
|
|
id = atoi(cmd);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: GET_NETWORK id=%d name='%s'",
|
|
|
|
id, name);
|
|
|
|
|
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find network "
|
|
|
|
"id=%d", id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
value = wpa_config_get_no_key(ssid, name);
|
|
|
|
if (value == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Failed to get network "
|
|
|
|
"variable '%s'", name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
res = os_strlcpy(buf, value, buflen);
|
|
|
|
if (res >= buflen) {
|
|
|
|
os_free(value);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_free(value);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-04-29 16:41:47 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_dup_network(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
struct wpa_ssid *ssid_s, *ssid_d;
|
|
|
|
char *name, *id, *value;
|
|
|
|
int id_s, id_d, ret;
|
|
|
|
|
|
|
|
/* cmd: "<src network id> <dst network id> <variable name>" */
|
|
|
|
id = os_strchr(cmd, ' ');
|
|
|
|
if (id == NULL)
|
|
|
|
return -1;
|
|
|
|
*id++ = '\0';
|
|
|
|
|
|
|
|
name = os_strchr(id, ' ');
|
|
|
|
if (name == NULL)
|
|
|
|
return -1;
|
|
|
|
*name++ = '\0';
|
|
|
|
|
|
|
|
id_s = atoi(cmd);
|
|
|
|
id_d = atoi(id);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: DUP_NETWORK id=%d -> %d name='%s'",
|
|
|
|
id_s, id_d, name);
|
|
|
|
|
|
|
|
ssid_s = wpa_config_get_network(wpa_s->conf, id_s);
|
|
|
|
if (ssid_s == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find "
|
|
|
|
"network id=%d", id_s);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ssid_d = wpa_config_get_network(wpa_s->conf, id_d);
|
|
|
|
if (ssid_d == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find "
|
2014-12-07 16:58:06 -05:00
|
|
|
"network id=%d", id_d);
|
2014-04-29 16:41:47 -04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
value = wpa_config_get(ssid_s, name);
|
|
|
|
if (value == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Failed to get network "
|
|
|
|
"variable '%s'", name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = wpa_supplicant_ctrl_iface_update_network(wpa_s, ssid_d, name,
|
|
|
|
value);
|
|
|
|
|
|
|
|
os_free(value);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-02-16 09:36:00 -05:00
|
|
|
static int wpa_supplicant_ctrl_iface_list_creds(struct wpa_supplicant *wpa_s,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
char *pos, *end;
|
|
|
|
struct wpa_cred *cred;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = buf + buflen;
|
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"cred id / realm / username / domain / imsi\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-02-16 09:36:00 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
cred = wpa_s->conf->cred;
|
|
|
|
while (cred) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%d\t%s\t%s\t%s\t%s\n",
|
|
|
|
cred->id, cred->realm ? cred->realm : "",
|
|
|
|
cred->username ? cred->username : "",
|
2013-08-02 11:42:54 -04:00
|
|
|
cred->domain ? cred->domain[0] : "",
|
2012-02-16 09:36:00 -05:00
|
|
|
cred->imsi ? cred->imsi : "");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-02-16 09:36:00 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
cred = cred->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_add_cred(struct wpa_supplicant *wpa_s,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
struct wpa_cred *cred;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: ADD_CRED");
|
|
|
|
|
|
|
|
cred = wpa_config_add_cred(wpa_s->conf);
|
|
|
|
if (cred == NULL)
|
|
|
|
return -1;
|
|
|
|
|
2014-04-04 12:10:47 -04:00
|
|
|
wpa_msg(wpa_s, MSG_INFO, CRED_ADDED "%d", cred->id);
|
|
|
|
|
2012-02-16 09:36:00 -05:00
|
|
|
ret = os_snprintf(buf, buflen, "%d\n", cred->id);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2012-02-16 09:36:00 -05:00
|
|
|
return -1;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-11-22 10:53:27 -05:00
|
|
|
static int wpas_ctrl_remove_cred(struct wpa_supplicant *wpa_s,
|
|
|
|
struct wpa_cred *cred)
|
|
|
|
{
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
char str[20];
|
2014-04-04 12:10:47 -04:00
|
|
|
int id;
|
2012-11-22 10:53:27 -05:00
|
|
|
|
2014-04-04 12:10:47 -04:00
|
|
|
if (cred == NULL) {
|
2012-11-22 10:53:27 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find cred");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-04-04 12:10:47 -04:00
|
|
|
id = cred->id;
|
|
|
|
if (wpa_config_remove_cred(wpa_s->conf, id) < 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find cred");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_msg(wpa_s, MSG_INFO, CRED_REMOVED "%d", id);
|
|
|
|
|
2012-11-22 10:53:27 -05:00
|
|
|
/* Remove any network entry created based on the removed credential */
|
|
|
|
ssid = wpa_s->conf->ssid;
|
|
|
|
while (ssid) {
|
|
|
|
if (ssid->parent_cred == cred) {
|
2014-12-06 14:40:31 -05:00
|
|
|
int res;
|
|
|
|
|
2012-11-22 10:53:27 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "Remove network id %d since it "
|
|
|
|
"used the removed credential", ssid->id);
|
2014-12-06 14:40:31 -05:00
|
|
|
res = os_snprintf(str, sizeof(str), "%d", ssid->id);
|
|
|
|
if (os_snprintf_error(sizeof(str), res))
|
|
|
|
str[sizeof(str) - 1] = '\0';
|
2012-11-22 10:53:27 -05:00
|
|
|
ssid = ssid->next;
|
|
|
|
wpa_supplicant_ctrl_iface_remove_network(wpa_s, str);
|
|
|
|
} else
|
|
|
|
ssid = ssid->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-02-16 09:36:00 -05:00
|
|
|
static int wpa_supplicant_ctrl_iface_remove_cred(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
int id;
|
2012-11-22 10:53:27 -05:00
|
|
|
struct wpa_cred *cred, *prev;
|
2012-02-16 09:36:00 -05:00
|
|
|
|
2013-08-02 12:09:11 -04:00
|
|
|
/* cmd: "<cred id>", "all", "sp_fqdn=<FQDN>", or
|
|
|
|
* "provisioning_sp=<FQDN> */
|
2012-02-16 09:36:00 -05:00
|
|
|
if (os_strcmp(cmd, "all") == 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: REMOVE_CRED all");
|
|
|
|
cred = wpa_s->conf->cred;
|
|
|
|
while (cred) {
|
2012-11-22 10:53:27 -05:00
|
|
|
prev = cred;
|
2012-02-16 09:36:00 -05:00
|
|
|
cred = cred->next;
|
2012-11-22 10:53:27 -05:00
|
|
|
wpas_ctrl_remove_cred(wpa_s, prev);
|
2012-02-16 09:36:00 -05:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-11-22 11:04:57 -05:00
|
|
|
if (os_strncmp(cmd, "sp_fqdn=", 8) == 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: REMOVE_CRED SP FQDN '%s'",
|
|
|
|
cmd + 8);
|
|
|
|
cred = wpa_s->conf->cred;
|
|
|
|
while (cred) {
|
|
|
|
prev = cred;
|
|
|
|
cred = cred->next;
|
2013-08-02 11:42:54 -04:00
|
|
|
if (prev->domain) {
|
|
|
|
size_t i;
|
|
|
|
for (i = 0; i < prev->num_domain; i++) {
|
|
|
|
if (os_strcmp(prev->domain[i], cmd + 8)
|
|
|
|
!= 0)
|
|
|
|
continue;
|
|
|
|
wpas_ctrl_remove_cred(wpa_s, prev);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2012-11-22 11:04:57 -05:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-08-02 12:09:11 -04:00
|
|
|
if (os_strncmp(cmd, "provisioning_sp=", 16) == 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: REMOVE_CRED provisioning SP FQDN '%s'",
|
|
|
|
cmd + 16);
|
|
|
|
cred = wpa_s->conf->cred;
|
|
|
|
while (cred) {
|
|
|
|
prev = cred;
|
|
|
|
cred = cred->next;
|
|
|
|
if (prev->provisioning_sp &&
|
|
|
|
os_strcmp(prev->provisioning_sp, cmd + 16) == 0)
|
|
|
|
wpas_ctrl_remove_cred(wpa_s, prev);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-02-16 09:36:00 -05:00
|
|
|
id = atoi(cmd);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: REMOVE_CRED id=%d", id);
|
|
|
|
|
|
|
|
cred = wpa_config_get_cred(wpa_s->conf, id);
|
2012-11-22 10:53:27 -05:00
|
|
|
return wpas_ctrl_remove_cred(wpa_s, cred);
|
2012-02-16 09:36:00 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_set_cred(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
int id;
|
|
|
|
struct wpa_cred *cred;
|
|
|
|
char *name, *value;
|
|
|
|
|
|
|
|
/* cmd: "<cred id> <variable name> <value>" */
|
|
|
|
name = os_strchr(cmd, ' ');
|
|
|
|
if (name == NULL)
|
|
|
|
return -1;
|
|
|
|
*name++ = '\0';
|
|
|
|
|
|
|
|
value = os_strchr(name, ' ');
|
|
|
|
if (value == NULL)
|
|
|
|
return -1;
|
|
|
|
*value++ = '\0';
|
|
|
|
|
|
|
|
id = atoi(cmd);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: SET_CRED id=%d name='%s'",
|
|
|
|
id, name);
|
|
|
|
wpa_hexdump_ascii_key(MSG_DEBUG, "CTRL_IFACE: value",
|
|
|
|
(u8 *) value, os_strlen(value));
|
|
|
|
|
|
|
|
cred = wpa_config_get_cred(wpa_s->conf, id);
|
|
|
|
if (cred == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find cred id=%d",
|
|
|
|
id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa_config_set_cred(cred, name, value, 0) < 0) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Failed to set cred "
|
|
|
|
"variable '%s'", name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-04-04 12:10:47 -04:00
|
|
|
wpa_msg(wpa_s, MSG_INFO, CRED_MODIFIED "%d %s", cred->id, name);
|
|
|
|
|
2012-02-16 09:36:00 -05:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-04-04 13:10:49 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_get_cred(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd, char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
int id;
|
|
|
|
size_t res;
|
|
|
|
struct wpa_cred *cred;
|
|
|
|
char *name, *value;
|
|
|
|
|
|
|
|
/* cmd: "<cred id> <variable name>" */
|
|
|
|
name = os_strchr(cmd, ' ');
|
|
|
|
if (name == NULL)
|
|
|
|
return -1;
|
|
|
|
*name++ = '\0';
|
|
|
|
|
|
|
|
id = atoi(cmd);
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: GET_CRED id=%d name='%s'",
|
|
|
|
id, name);
|
|
|
|
|
|
|
|
cred = wpa_config_get_cred(wpa_s->conf, id);
|
|
|
|
if (cred == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find cred id=%d",
|
|
|
|
id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
value = wpa_config_get_cred_no_key(cred, name);
|
|
|
|
if (value == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Failed to get cred variable '%s'",
|
|
|
|
name);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
res = os_strlcpy(buf, value, buflen);
|
|
|
|
if (res >= buflen) {
|
|
|
|
os_free(value);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_free(value);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
#ifndef CONFIG_NO_CONFIG_WRITE
|
|
|
|
static int wpa_supplicant_ctrl_iface_save_config(struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!wpa_s->conf->update_config) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: SAVE_CONFIG - Not allowed "
|
|
|
|
"to update configuration (update_config=0)");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = wpa_config_write(wpa_s->confname, wpa_s->conf);
|
|
|
|
if (ret) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: SAVE_CONFIG - Failed to "
|
|
|
|
"update configuration");
|
|
|
|
} else {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: SAVE_CONFIG - Configuration"
|
|
|
|
" updated");
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
2013-12-25 03:44:06 -05:00
|
|
|
struct cipher_info {
|
|
|
|
unsigned int capa;
|
|
|
|
const char *name;
|
|
|
|
int group_only;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct cipher_info ciphers[] = {
|
|
|
|
{ WPA_DRIVER_CAPA_ENC_CCMP_256, "CCMP-256", 0 },
|
|
|
|
{ WPA_DRIVER_CAPA_ENC_GCMP_256, "GCMP-256", 0 },
|
|
|
|
{ WPA_DRIVER_CAPA_ENC_CCMP, "CCMP", 0 },
|
|
|
|
{ WPA_DRIVER_CAPA_ENC_GCMP, "GCMP", 0 },
|
|
|
|
{ WPA_DRIVER_CAPA_ENC_TKIP, "TKIP", 0 },
|
|
|
|
{ WPA_DRIVER_CAPA_KEY_MGMT_WPA_NONE, "NONE", 0 },
|
|
|
|
{ WPA_DRIVER_CAPA_ENC_WEP104, "WEP104", 1 },
|
|
|
|
{ WPA_DRIVER_CAPA_ENC_WEP40, "WEP40", 1 }
|
|
|
|
};
|
|
|
|
|
2015-01-23 08:57:05 -05:00
|
|
|
static const struct cipher_info ciphers_group_mgmt[] = {
|
|
|
|
{ WPA_DRIVER_CAPA_ENC_BIP, "AES-128-CMAC", 1 },
|
|
|
|
{ WPA_DRIVER_CAPA_ENC_BIP_GMAC_128, "BIP-GMAC-128", 1 },
|
|
|
|
{ WPA_DRIVER_CAPA_ENC_BIP_GMAC_256, "BIP-GMAC-256", 1 },
|
|
|
|
{ WPA_DRIVER_CAPA_ENC_BIP_CMAC_256, "BIP-CMAC-256", 1 },
|
|
|
|
};
|
|
|
|
|
2013-12-25 03:44:06 -05:00
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
static int ctrl_iface_get_capability_pairwise(int res, char *strict,
|
|
|
|
struct wpa_driver_capa *capa,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
2014-03-02 09:14:09 -05:00
|
|
|
int ret;
|
2008-02-27 20:34:43 -05:00
|
|
|
char *pos, *end;
|
|
|
|
size_t len;
|
2013-12-25 03:44:06 -05:00
|
|
|
unsigned int i;
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = pos + buflen;
|
|
|
|
|
|
|
|
if (res < 0) {
|
|
|
|
if (strict)
|
|
|
|
return 0;
|
|
|
|
len = os_strlcpy(buf, "CCMP TKIP NONE", buflen);
|
|
|
|
if (len >= buflen)
|
|
|
|
return -1;
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2013-12-25 03:44:06 -05:00
|
|
|
for (i = 0; i < ARRAY_SIZE(ciphers); i++) {
|
|
|
|
if (!ciphers[i].group_only && capa->enc & ciphers[i].capa) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s%s",
|
2014-03-02 09:14:09 -05:00
|
|
|
pos == buf ? "" : " ",
|
|
|
|
ciphers[i].name);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-12-25 03:44:06 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int ctrl_iface_get_capability_group(int res, char *strict,
|
|
|
|
struct wpa_driver_capa *capa,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
2014-03-02 09:14:09 -05:00
|
|
|
int ret;
|
2008-02-27 20:34:43 -05:00
|
|
|
char *pos, *end;
|
|
|
|
size_t len;
|
2013-12-25 03:44:06 -05:00
|
|
|
unsigned int i;
|
2008-02-27 20:34:43 -05:00
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = pos + buflen;
|
|
|
|
|
|
|
|
if (res < 0) {
|
|
|
|
if (strict)
|
|
|
|
return 0;
|
|
|
|
len = os_strlcpy(buf, "CCMP TKIP WEP104 WEP40", buflen);
|
|
|
|
if (len >= buflen)
|
|
|
|
return -1;
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2013-12-25 03:44:06 -05:00
|
|
|
for (i = 0; i < ARRAY_SIZE(ciphers); i++) {
|
|
|
|
if (capa->enc & ciphers[i].capa) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s%s",
|
2014-03-02 09:14:09 -05:00
|
|
|
pos == buf ? "" : " ",
|
|
|
|
ciphers[i].name);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-12-25 03:44:06 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-01-23 08:57:05 -05:00
|
|
|
static int ctrl_iface_get_capability_group_mgmt(int res, char *strict,
|
|
|
|
struct wpa_driver_capa *capa,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
char *pos, *end;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = pos + buflen;
|
|
|
|
|
|
|
|
if (res < 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(ciphers_group_mgmt); i++) {
|
|
|
|
if (capa->enc & ciphers_group_mgmt[i].capa) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s%s",
|
|
|
|
pos == buf ? "" : " ",
|
|
|
|
ciphers_group_mgmt[i].name);
|
|
|
|
if (os_snprintf_error(end - pos, ret))
|
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
static int ctrl_iface_get_capability_key_mgmt(int res, char *strict,
|
|
|
|
struct wpa_driver_capa *capa,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
char *pos, *end;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = pos + buflen;
|
|
|
|
|
|
|
|
if (res < 0) {
|
|
|
|
if (strict)
|
|
|
|
return 0;
|
|
|
|
len = os_strlcpy(buf, "WPA-PSK WPA-EAP IEEE8021X WPA-NONE "
|
|
|
|
"NONE", buflen);
|
|
|
|
if (len >= buflen)
|
|
|
|
return -1;
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "NONE IEEE8021X");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
if (capa->key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA |
|
|
|
|
WPA_DRIVER_CAPA_KEY_MGMT_WPA2)) {
|
|
|
|
ret = os_snprintf(pos, end - pos, " WPA-EAP");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (capa->key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK |
|
|
|
|
WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK)) {
|
|
|
|
ret = os_snprintf(pos, end - pos, " WPA-PSK");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (capa->key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_WPA_NONE) {
|
|
|
|
ret = os_snprintf(pos, end - pos, " WPA-NONE");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
2015-01-25 19:00:18 -05:00
|
|
|
#ifdef CONFIG_SUITEB
|
|
|
|
if (capa->key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_SUITE_B) {
|
|
|
|
ret = os_snprintf(pos, end - pos, " WPA-EAP-SUITE-B");
|
|
|
|
if (os_snprintf_error(end - pos, ret))
|
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_SUITEB */
|
|
|
|
#ifdef CONFIG_SUITEB192
|
|
|
|
if (capa->key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_SUITE_B_192) {
|
|
|
|
ret = os_snprintf(pos, end - pos, " WPA-EAP-SUITE-B-192");
|
|
|
|
if (os_snprintf_error(end - pos, ret))
|
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_SUITEB192 */
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int ctrl_iface_get_capability_proto(int res, char *strict,
|
|
|
|
struct wpa_driver_capa *capa,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
2014-03-02 09:14:09 -05:00
|
|
|
int ret;
|
2008-02-27 20:34:43 -05:00
|
|
|
char *pos, *end;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = pos + buflen;
|
|
|
|
|
|
|
|
if (res < 0) {
|
|
|
|
if (strict)
|
|
|
|
return 0;
|
|
|
|
len = os_strlcpy(buf, "RSN WPA", buflen);
|
|
|
|
if (len >= buflen)
|
|
|
|
return -1;
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (capa->key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA2 |
|
|
|
|
WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK)) {
|
2014-03-02 09:14:09 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "%sRSN",
|
|
|
|
pos == buf ? "" : " ");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (capa->key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA |
|
|
|
|
WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK)) {
|
2014-03-02 09:14:09 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "%sWPA",
|
|
|
|
pos == buf ? "" : " ");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2015-01-11 12:41:01 -05:00
|
|
|
static int ctrl_iface_get_capability_auth_alg(struct wpa_supplicant *wpa_s,
|
|
|
|
int res, char *strict,
|
2008-02-27 20:34:43 -05:00
|
|
|
struct wpa_driver_capa *capa,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
2014-03-02 09:14:09 -05:00
|
|
|
int ret;
|
2008-02-27 20:34:43 -05:00
|
|
|
char *pos, *end;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = pos + buflen;
|
|
|
|
|
|
|
|
if (res < 0) {
|
|
|
|
if (strict)
|
|
|
|
return 0;
|
|
|
|
len = os_strlcpy(buf, "OPEN SHARED LEAP", buflen);
|
|
|
|
if (len >= buflen)
|
|
|
|
return -1;
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (capa->auth & (WPA_DRIVER_AUTH_OPEN)) {
|
2014-03-02 09:14:09 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "%sOPEN",
|
|
|
|
pos == buf ? "" : " ");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (capa->auth & (WPA_DRIVER_AUTH_SHARED)) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sSHARED",
|
2014-03-02 09:14:09 -05:00
|
|
|
pos == buf ? "" : " ");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (capa->auth & (WPA_DRIVER_AUTH_LEAP)) {
|
2014-03-02 09:14:09 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "%sLEAP",
|
|
|
|
pos == buf ? "" : " ");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
2015-01-11 12:41:01 -05:00
|
|
|
#ifdef CONFIG_SAE
|
|
|
|
if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SAE) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sSAE",
|
|
|
|
pos == buf ? "" : " ");
|
|
|
|
if (os_snprintf_error(end - pos, ret))
|
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_SAE */
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-03-16 06:42:15 -04:00
|
|
|
static int ctrl_iface_get_capability_modes(int res, char *strict,
|
|
|
|
struct wpa_driver_capa *capa,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
2014-03-02 09:14:09 -05:00
|
|
|
int ret;
|
2013-03-16 06:42:15 -04:00
|
|
|
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) {
|
2014-03-02 09:14:09 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "%sIBSS",
|
|
|
|
pos == buf ? "" : " ");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-03-16 06:42:15 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (capa->flags & WPA_DRIVER_FLAGS_AP) {
|
2014-03-02 09:14:09 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, "%sAP",
|
|
|
|
pos == buf ? "" : " ");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-03-16 06:42:15 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
2015-01-11 12:44:23 -05:00
|
|
|
#ifdef CONFIG_MESH
|
|
|
|
if (capa->flags & WPA_DRIVER_FLAGS_MESH) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%sMESH",
|
|
|
|
pos == buf ? "" : " ");
|
|
|
|
if (os_snprintf_error(end - pos, ret))
|
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_MESH */
|
|
|
|
|
2013-03-16 06:42:15 -04:00
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-08-04 14:17:04 -04:00
|
|
|
static int ctrl_iface_get_capability_channels(struct wpa_supplicant *wpa_s,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
struct hostapd_channel_data *chnl;
|
|
|
|
int ret, i, j;
|
|
|
|
char *pos, *end, *hmode;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = pos + buflen;
|
|
|
|
|
|
|
|
for (j = 0; j < wpa_s->hw.num_modes; j++) {
|
|
|
|
switch (wpa_s->hw.modes[j].mode) {
|
|
|
|
case HOSTAPD_MODE_IEEE80211B:
|
|
|
|
hmode = "B";
|
|
|
|
break;
|
|
|
|
case HOSTAPD_MODE_IEEE80211G:
|
|
|
|
hmode = "G";
|
|
|
|
break;
|
|
|
|
case HOSTAPD_MODE_IEEE80211A:
|
|
|
|
hmode = "A";
|
|
|
|
break;
|
2012-12-18 04:50:35 -05:00
|
|
|
case HOSTAPD_MODE_IEEE80211AD:
|
|
|
|
hmode = "AD";
|
|
|
|
break;
|
2012-08-04 14:17:04 -04:00
|
|
|
default:
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
ret = os_snprintf(pos, end - pos, "Mode[%s] Channels:", hmode);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-08-04 14:17:04 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
chnl = wpa_s->hw.modes[j].channels;
|
|
|
|
for (i = 0; i < wpa_s->hw.modes[j].num_channels; i++) {
|
|
|
|
if (chnl[i].flag & HOSTAPD_CHAN_DISABLED)
|
|
|
|
continue;
|
|
|
|
ret = os_snprintf(pos, end - pos, " %d", chnl[i].chan);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-08-04 14:17:04 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
ret = os_snprintf(pos, end - pos, "\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-08-04 14:17:04 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-04-23 09:55:54 -04:00
|
|
|
static int ctrl_iface_get_capability_freq(struct wpa_supplicant *wpa_s,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
struct hostapd_channel_data *chnl;
|
|
|
|
int ret, i, j;
|
|
|
|
char *pos, *end, *hmode;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = pos + buflen;
|
|
|
|
|
|
|
|
for (j = 0; j < wpa_s->hw.num_modes; j++) {
|
|
|
|
switch (wpa_s->hw.modes[j].mode) {
|
|
|
|
case HOSTAPD_MODE_IEEE80211B:
|
|
|
|
hmode = "B";
|
|
|
|
break;
|
|
|
|
case HOSTAPD_MODE_IEEE80211G:
|
|
|
|
hmode = "G";
|
|
|
|
break;
|
|
|
|
case HOSTAPD_MODE_IEEE80211A:
|
|
|
|
hmode = "A";
|
|
|
|
break;
|
|
|
|
case HOSTAPD_MODE_IEEE80211AD:
|
|
|
|
hmode = "AD";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
ret = os_snprintf(pos, end - pos, "Mode[%s] Channels:\n",
|
|
|
|
hmode);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-04-23 09:55:54 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
chnl = wpa_s->hw.modes[j].channels;
|
|
|
|
for (i = 0; i < wpa_s->hw.modes[j].num_channels; i++) {
|
|
|
|
if (chnl[i].flag & HOSTAPD_CHAN_DISABLED)
|
|
|
|
continue;
|
2014-02-03 16:30:46 -05:00
|
|
|
ret = os_snprintf(pos, end - pos, " %d = %d MHz%s%s\n",
|
2013-04-23 09:55:54 -04:00
|
|
|
chnl[i].chan, chnl[i].freq,
|
2014-07-07 07:20:54 -04:00
|
|
|
chnl[i].flag & HOSTAPD_CHAN_NO_IR ?
|
|
|
|
" (NO_IR)" : "",
|
2014-02-03 16:30:46 -05:00
|
|
|
chnl[i].flag & HOSTAPD_CHAN_RADAR ?
|
|
|
|
" (DFS)" : "");
|
|
|
|
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-04-23 09:55:54 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
ret = os_snprintf(pos, end - pos, "\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-04-23 09:55:54 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
static int wpa_supplicant_ctrl_iface_get_capability(
|
|
|
|
struct wpa_supplicant *wpa_s, const char *_field, char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
struct wpa_driver_capa capa;
|
|
|
|
int res;
|
|
|
|
char *strict;
|
|
|
|
char field[30];
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
/* Determine whether or not strict checking was requested */
|
|
|
|
len = os_strlcpy(field, _field, sizeof(field));
|
|
|
|
if (len >= sizeof(field))
|
|
|
|
return -1;
|
|
|
|
strict = os_strchr(field, ' ');
|
|
|
|
if (strict != NULL) {
|
|
|
|
*strict++ = '\0';
|
|
|
|
if (os_strcmp(strict, "strict") != 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: GET_CAPABILITY '%s' %s",
|
|
|
|
field, strict ? strict : "");
|
|
|
|
|
|
|
|
if (os_strcmp(field, "eap") == 0) {
|
|
|
|
return eap_get_names(buf, buflen);
|
|
|
|
}
|
|
|
|
|
|
|
|
res = wpa_drv_get_capa(wpa_s, &capa);
|
|
|
|
|
|
|
|
if (os_strcmp(field, "pairwise") == 0)
|
|
|
|
return ctrl_iface_get_capability_pairwise(res, strict, &capa,
|
|
|
|
buf, buflen);
|
|
|
|
|
|
|
|
if (os_strcmp(field, "group") == 0)
|
|
|
|
return ctrl_iface_get_capability_group(res, strict, &capa,
|
|
|
|
buf, buflen);
|
|
|
|
|
2015-01-23 08:57:05 -05:00
|
|
|
if (os_strcmp(field, "group_mgmt") == 0)
|
|
|
|
return ctrl_iface_get_capability_group_mgmt(res, strict, &capa,
|
|
|
|
buf, buflen);
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
if (os_strcmp(field, "key_mgmt") == 0)
|
|
|
|
return ctrl_iface_get_capability_key_mgmt(res, strict, &capa,
|
|
|
|
buf, buflen);
|
|
|
|
|
|
|
|
if (os_strcmp(field, "proto") == 0)
|
|
|
|
return ctrl_iface_get_capability_proto(res, strict, &capa,
|
|
|
|
buf, buflen);
|
|
|
|
|
|
|
|
if (os_strcmp(field, "auth_alg") == 0)
|
2015-01-11 12:41:01 -05:00
|
|
|
return ctrl_iface_get_capability_auth_alg(wpa_s, res, strict,
|
|
|
|
&capa, buf, buflen);
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2013-03-16 06:42:15 -04:00
|
|
|
if (os_strcmp(field, "modes") == 0)
|
|
|
|
return ctrl_iface_get_capability_modes(res, strict, &capa,
|
|
|
|
buf, buflen);
|
|
|
|
|
2012-08-04 14:17:04 -04:00
|
|
|
if (os_strcmp(field, "channels") == 0)
|
|
|
|
return ctrl_iface_get_capability_channels(wpa_s, buf, buflen);
|
|
|
|
|
2013-04-23 09:55:54 -04:00
|
|
|
if (os_strcmp(field, "freq") == 0)
|
|
|
|
return ctrl_iface_get_capability_freq(wpa_s, buf, buflen);
|
|
|
|
|
2014-03-13 18:12:38 -04:00
|
|
|
#ifdef CONFIG_TDLS
|
|
|
|
if (os_strcmp(field, "tdls") == 0)
|
|
|
|
return ctrl_iface_get_capability_tdls(wpa_s, buf, buflen);
|
|
|
|
#endif /* CONFIG_TDLS */
|
|
|
|
|
2014-11-29 16:14:40 -05:00
|
|
|
#ifdef CONFIG_ERP
|
|
|
|
if (os_strcmp(field, "erp") == 0) {
|
|
|
|
res = os_snprintf(buf, buflen, "ERP");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(buflen, res))
|
2014-11-29 16:14:40 -05:00
|
|
|
return -1;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_EPR */
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Unknown GET_CAPABILITY field '%s'",
|
|
|
|
field);
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-10-16 15:44:28 -04:00
|
|
|
#ifdef CONFIG_INTERWORKING
|
|
|
|
static char * anqp_add_hex(char *pos, char *end, const char *title,
|
|
|
|
struct wpabuf *data)
|
|
|
|
{
|
|
|
|
char *start = pos;
|
|
|
|
size_t i;
|
|
|
|
int ret;
|
|
|
|
const u8 *d;
|
|
|
|
|
|
|
|
if (data == NULL)
|
|
|
|
return start;
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s=", title);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-10-16 15:44:28 -04:00
|
|
|
return start;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
d = wpabuf_head_u8(data);
|
|
|
|
for (i = 0; i < wpabuf_len(data); i++) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%02x", *d++);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-10-16 15:44:28 -04:00
|
|
|
return start;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-10-16 15:44:28 -04:00
|
|
|
return start;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_INTERWORKING */
|
|
|
|
|
|
|
|
|
2012-04-07 05:06:35 -04:00
|
|
|
static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
|
2012-04-07 05:23:21 -04:00
|
|
|
unsigned long mask, char *buf, size_t buflen)
|
2008-02-27 20:34:43 -05:00
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
int ret;
|
|
|
|
char *pos, *end;
|
|
|
|
const u8 *ie, *ie2;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = buf + buflen;
|
|
|
|
|
2012-04-07 05:23:21 -04:00
|
|
|
if (mask & WPA_BSS_MASK_ID) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "id=%u\n", bss->id);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
2012-04-07 05:23:21 -04:00
|
|
|
if (mask & WPA_BSS_MASK_BSSID) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "bssid=" MACSTR "\n",
|
|
|
|
MAC2STR(bss->bssid));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2012-04-07 05:23:21 -04:00
|
|
|
if (mask & WPA_BSS_MASK_FREQ) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "freq=%d\n", bss->freq);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2012-04-07 05:23:21 -04:00
|
|
|
if (mask & WPA_BSS_MASK_BEACON_INT) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "beacon_int=%d\n",
|
|
|
|
bss->beacon_int);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += ret;
|
|
|
|
}
|
2012-04-07 05:23:21 -04:00
|
|
|
|
|
|
|
if (mask & WPA_BSS_MASK_CAPABILITIES) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "capabilities=0x%04x\n",
|
|
|
|
bss->caps);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
2008-02-27 20:34:43 -05:00
|
|
|
pos += ret;
|
|
|
|
}
|
2012-04-07 05:23:21 -04:00
|
|
|
|
|
|
|
if (mask & WPA_BSS_MASK_QUAL) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "qual=%d\n", bss->qual);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
2009-12-28 06:35:51 -05:00
|
|
|
pos += ret;
|
|
|
|
}
|
2012-04-07 05:23:21 -04:00
|
|
|
|
|
|
|
if (mask & WPA_BSS_MASK_NOISE) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "noise=%d\n", bss->noise);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
2011-10-03 11:19:24 -04:00
|
|
|
pos += ret;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2012-04-07 05:23:21 -04:00
|
|
|
if (mask & WPA_BSS_MASK_LEVEL) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "level=%d\n", bss->level);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2012-04-07 05:23:21 -04:00
|
|
|
if (mask & WPA_BSS_MASK_TSF) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "tsf=%016llu\n",
|
|
|
|
(unsigned long long) bss->tsf);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mask & WPA_BSS_MASK_AGE) {
|
2013-12-16 15:08:28 -05:00
|
|
|
struct os_reltime now;
|
2012-04-07 05:23:21 -04:00
|
|
|
|
2013-12-16 15:08:28 -05:00
|
|
|
os_get_reltime(&now);
|
2012-04-07 05:23:21 -04:00
|
|
|
ret = os_snprintf(pos, end - pos, "age=%d\n",
|
|
|
|
(int) (now.sec - bss->last_update.sec));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mask & WPA_BSS_MASK_IE) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "ie=");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
ie = (const u8 *) (bss + 1);
|
|
|
|
for (i = 0; i < bss->ie_len; i++) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "%02x", *ie++);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mask & WPA_BSS_MASK_FLAGS) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "flags=");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
ie = wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE);
|
|
|
|
if (ie)
|
|
|
|
pos = wpa_supplicant_ie_txt(pos, end, "WPA", ie,
|
|
|
|
2 + ie[1]);
|
|
|
|
ie2 = wpa_bss_get_ie(bss, WLAN_EID_RSN);
|
|
|
|
if (ie2)
|
|
|
|
pos = wpa_supplicant_ie_txt(pos, end, "WPA2", ie2,
|
|
|
|
2 + ie2[1]);
|
|
|
|
pos = wpa_supplicant_wps_ie_txt(wpa_s, pos, end, bss);
|
|
|
|
if (!ie && !ie2 && bss->caps & IEEE80211_CAP_PRIVACY) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "[WEP]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2014-05-12 03:35:41 -04:00
|
|
|
if (bss_is_dmg(bss)) {
|
|
|
|
const char *s;
|
|
|
|
ret = os_snprintf(pos, end - pos, "[DMG]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
2014-05-12 03:35:41 -04:00
|
|
|
switch (bss->caps & IEEE80211_CAP_DMG_MASK) {
|
|
|
|
case IEEE80211_CAP_DMG_IBSS:
|
|
|
|
s = "[IBSS]";
|
|
|
|
break;
|
|
|
|
case IEEE80211_CAP_DMG_AP:
|
|
|
|
s = "[ESS]";
|
|
|
|
break;
|
|
|
|
case IEEE80211_CAP_DMG_PBSS:
|
|
|
|
s = "[PBSS]";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
s = "";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s", s);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
2014-05-12 03:35:41 -04:00
|
|
|
} else {
|
|
|
|
if (bss->caps & IEEE80211_CAP_IBSS) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "[IBSS]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-05-12 03:35:41 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
if (bss->caps & IEEE80211_CAP_ESS) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "[ESS]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-05-12 03:35:41 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2012-04-07 05:23:21 -04:00
|
|
|
}
|
2013-10-14 12:22:09 -04:00
|
|
|
if (wpa_bss_get_vendor_ie(bss, P2P_IE_VENDOR_TYPE) ||
|
|
|
|
wpa_bss_get_vendor_ie_beacon(bss, P2P_IE_VENDOR_TYPE)) {
|
2012-04-07 05:23:21 -04:00
|
|
|
ret = os_snprintf(pos, end - pos, "[P2P]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2011-10-03 11:23:01 -04:00
|
|
|
#ifdef CONFIG_HS20
|
|
|
|
if (wpa_bss_get_vendor_ie(bss, HS20_IE_VENDOR_TYPE)) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "[HS20]");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-02-28 11:49:33 -05:00
|
|
|
return 0;
|
2011-10-03 11:23:01 -04:00
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_HS20 */
|
2012-04-07 05:23:21 -04:00
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mask & WPA_BSS_MASK_SSID) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "ssid=%s\n",
|
|
|
|
wpa_ssid_txt(bss->ssid, bss->ssid_len));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2012-04-07 05:23:21 -04:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2009-09-11 10:14:49 -04:00
|
|
|
#ifdef CONFIG_WPS
|
2012-04-07 05:23:21 -04:00
|
|
|
if (mask & WPA_BSS_MASK_WPS_SCAN) {
|
|
|
|
ie = (const u8 *) (bss + 1);
|
|
|
|
ret = wpas_wps_scan_result_text(ie, bss->ie_len, pos, end);
|
|
|
|
if (ret < 0 || ret >= end - pos)
|
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2009-09-11 10:14:49 -04:00
|
|
|
#endif /* CONFIG_WPS */
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
#ifdef CONFIG_P2P
|
2012-04-07 05:23:21 -04:00
|
|
|
if (mask & WPA_BSS_MASK_P2P_SCAN) {
|
|
|
|
ie = (const u8 *) (bss + 1);
|
|
|
|
ret = wpas_p2p_scan_result_text(ie, bss->ie_len, pos, end);
|
|
|
|
if (ret < 0 || ret >= end - pos)
|
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
2010-07-18 17:30:25 -04:00
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
|
2012-03-02 10:26:01 -05:00
|
|
|
#ifdef CONFIG_WIFI_DISPLAY
|
|
|
|
if (mask & WPA_BSS_MASK_WIFI_DISPLAY) {
|
|
|
|
struct wpabuf *wfd;
|
|
|
|
ie = (const u8 *) (bss + 1);
|
|
|
|
wfd = ieee802_11_vendor_ie_concat(ie, bss->ie_len,
|
|
|
|
WFD_IE_VENDOR_TYPE);
|
|
|
|
if (wfd) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "wfd_subelems=");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret)) {
|
2014-02-10 05:55:03 -05:00
|
|
|
wpabuf_free(wfd);
|
2013-02-28 11:49:33 -05:00
|
|
|
return 0;
|
2014-02-10 05:55:03 -05:00
|
|
|
}
|
2012-03-02 10:26:01 -05:00
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
pos += wpa_snprintf_hex(pos, end - pos,
|
|
|
|
wpabuf_head(wfd),
|
|
|
|
wpabuf_len(wfd));
|
|
|
|
wpabuf_free(wfd);
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-02-28 11:49:33 -05:00
|
|
|
return 0;
|
2012-03-02 10:26:01 -05:00
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_WIFI_DISPLAY */
|
|
|
|
|
2011-10-16 15:44:28 -04:00
|
|
|
#ifdef CONFIG_INTERWORKING
|
2012-09-04 09:02:29 -04:00
|
|
|
if ((mask & WPA_BSS_MASK_INTERNETW) && bss->anqp) {
|
|
|
|
struct wpa_bss_anqp *anqp = bss->anqp;
|
2012-04-07 05:23:21 -04:00
|
|
|
pos = anqp_add_hex(pos, end, "anqp_venue_name",
|
2012-09-04 09:02:29 -04:00
|
|
|
anqp->venue_name);
|
2012-04-07 05:23:21 -04:00
|
|
|
pos = anqp_add_hex(pos, end, "anqp_network_auth_type",
|
2012-09-04 09:02:29 -04:00
|
|
|
anqp->network_auth_type);
|
2012-04-07 05:23:21 -04:00
|
|
|
pos = anqp_add_hex(pos, end, "anqp_roaming_consortium",
|
2012-09-04 09:02:29 -04:00
|
|
|
anqp->roaming_consortium);
|
2012-04-07 05:23:21 -04:00
|
|
|
pos = anqp_add_hex(pos, end, "anqp_ip_addr_type_availability",
|
2012-09-04 09:02:29 -04:00
|
|
|
anqp->ip_addr_type_availability);
|
2012-04-07 05:23:21 -04:00
|
|
|
pos = anqp_add_hex(pos, end, "anqp_nai_realm",
|
2012-09-04 09:02:29 -04:00
|
|
|
anqp->nai_realm);
|
|
|
|
pos = anqp_add_hex(pos, end, "anqp_3gpp", anqp->anqp_3gpp);
|
2012-04-07 05:23:21 -04:00
|
|
|
pos = anqp_add_hex(pos, end, "anqp_domain_name",
|
2012-09-04 09:02:29 -04:00
|
|
|
anqp->domain_name);
|
2011-09-08 13:52:23 -04:00
|
|
|
#ifdef CONFIG_HS20
|
|
|
|
pos = anqp_add_hex(pos, end, "hs20_operator_friendly_name",
|
2012-09-04 09:02:29 -04:00
|
|
|
anqp->hs20_operator_friendly_name);
|
2011-09-08 13:52:23 -04:00
|
|
|
pos = anqp_add_hex(pos, end, "hs20_wan_metrics",
|
2012-09-04 09:02:29 -04:00
|
|
|
anqp->hs20_wan_metrics);
|
2011-09-08 13:52:23 -04:00
|
|
|
pos = anqp_add_hex(pos, end, "hs20_connection_capability",
|
2012-09-04 09:02:29 -04:00
|
|
|
anqp->hs20_connection_capability);
|
2013-01-08 16:51:16 -05:00
|
|
|
pos = anqp_add_hex(pos, end, "hs20_operating_class",
|
|
|
|
anqp->hs20_operating_class);
|
|
|
|
pos = anqp_add_hex(pos, end, "hs20_osu_providers_list",
|
|
|
|
anqp->hs20_osu_providers_list);
|
2011-09-08 13:52:23 -04:00
|
|
|
#endif /* CONFIG_HS20 */
|
2012-04-07 05:23:21 -04:00
|
|
|
}
|
2011-10-16 15:44:28 -04:00
|
|
|
#endif /* CONFIG_INTERWORKING */
|
|
|
|
|
2014-09-01 00:23:39 -04:00
|
|
|
#ifdef CONFIG_MESH
|
|
|
|
if (mask & WPA_BSS_MASK_MESH_SCAN) {
|
|
|
|
ie = (const u8 *) (bss + 1);
|
|
|
|
ret = wpas_mesh_scan_result_text(ie, bss->ie_len, pos, end);
|
|
|
|
if (ret < 0 || ret >= end - pos)
|
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_MESH */
|
|
|
|
|
2013-02-28 11:43:05 -05:00
|
|
|
if (mask & WPA_BSS_MASK_DELIM) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "====\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-02-28 11:43:05 -05:00
|
|
|
return 0;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-04-07 05:06:35 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_bss(struct wpa_supplicant *wpa_s,
|
|
|
|
const char *cmd, char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
u8 bssid[ETH_ALEN];
|
|
|
|
size_t i;
|
|
|
|
struct wpa_bss *bss;
|
2012-04-07 05:49:31 -04:00
|
|
|
struct wpa_bss *bsslast = NULL;
|
|
|
|
struct dl_list *next;
|
|
|
|
int ret = 0;
|
|
|
|
int len;
|
2014-12-06 14:40:31 -05:00
|
|
|
char *ctmp, *end = buf + buflen;
|
2012-04-07 05:23:21 -04:00
|
|
|
unsigned long mask = WPA_BSS_MASK_ALL;
|
2012-04-07 05:06:35 -04:00
|
|
|
|
2012-04-07 05:49:31 -04:00
|
|
|
if (os_strncmp(cmd, "RANGE=", 6) == 0) {
|
|
|
|
if (os_strncmp(cmd + 6, "ALL", 3) == 0) {
|
|
|
|
bss = dl_list_first(&wpa_s->bss_id, struct wpa_bss,
|
|
|
|
list_id);
|
|
|
|
bsslast = dl_list_last(&wpa_s->bss_id, struct wpa_bss,
|
|
|
|
list_id);
|
|
|
|
} else { /* N1-N2 */
|
|
|
|
unsigned int id1, id2;
|
|
|
|
|
|
|
|
if ((ctmp = os_strchr(cmd + 6, '-')) == NULL) {
|
|
|
|
wpa_printf(MSG_INFO, "Wrong BSS range "
|
|
|
|
"format");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-02-07 05:27:52 -05:00
|
|
|
if (*(cmd + 6) == '-')
|
|
|
|
id1 = 0;
|
|
|
|
else
|
|
|
|
id1 = atoi(cmd + 6);
|
|
|
|
ctmp++;
|
|
|
|
if (*ctmp >= '0' && *ctmp <= '9')
|
|
|
|
id2 = atoi(ctmp);
|
|
|
|
else
|
|
|
|
id2 = (unsigned int) -1;
|
|
|
|
bss = wpa_bss_get_id_range(wpa_s, id1, id2);
|
|
|
|
if (id2 == (unsigned int) -1)
|
2012-04-07 05:49:31 -04:00
|
|
|
bsslast = dl_list_last(&wpa_s->bss_id,
|
|
|
|
struct wpa_bss,
|
|
|
|
list_id);
|
|
|
|
else {
|
|
|
|
bsslast = wpa_bss_get_id(wpa_s, id2);
|
|
|
|
if (bsslast == NULL && bss && id2 > id1) {
|
|
|
|
struct wpa_bss *tmp = bss;
|
|
|
|
for (;;) {
|
|
|
|
next = tmp->list_id.next;
|
|
|
|
if (next == &wpa_s->bss_id)
|
|
|
|
break;
|
|
|
|
tmp = dl_list_entry(
|
|
|
|
next, struct wpa_bss,
|
|
|
|
list_id);
|
|
|
|
if (tmp->id > id2)
|
|
|
|
break;
|
|
|
|
bsslast = tmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-02-05 17:28:48 -05:00
|
|
|
} else if (os_strncmp(cmd, "FIRST", 5) == 0)
|
2012-04-14 13:39:10 -04:00
|
|
|
bss = dl_list_first(&wpa_s->bss_id, struct wpa_bss, list_id);
|
2013-02-05 17:31:34 -05:00
|
|
|
else if (os_strncmp(cmd, "LAST", 4) == 0)
|
|
|
|
bss = dl_list_last(&wpa_s->bss_id, struct wpa_bss, list_id);
|
2012-04-07 05:06:35 -04:00
|
|
|
else if (os_strncmp(cmd, "ID-", 3) == 0) {
|
|
|
|
i = atoi(cmd + 3);
|
|
|
|
bss = wpa_bss_get_id(wpa_s, i);
|
|
|
|
} else if (os_strncmp(cmd, "NEXT-", 5) == 0) {
|
|
|
|
i = atoi(cmd + 5);
|
|
|
|
bss = wpa_bss_get_id(wpa_s, i);
|
|
|
|
if (bss) {
|
2012-04-07 05:49:31 -04:00
|
|
|
next = bss->list_id.next;
|
2012-04-07 05:06:35 -04:00
|
|
|
if (next == &wpa_s->bss_id)
|
|
|
|
bss = NULL;
|
|
|
|
else
|
|
|
|
bss = dl_list_entry(next, struct wpa_bss,
|
|
|
|
list_id);
|
|
|
|
}
|
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
} else if (os_strncmp(cmd, "p2p_dev_addr=", 13) == 0) {
|
|
|
|
if (hwaddr_aton(cmd + 13, bssid) == 0)
|
|
|
|
bss = wpa_bss_get_p2p_dev_addr(wpa_s, bssid);
|
|
|
|
else
|
|
|
|
bss = NULL;
|
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
} else if (hwaddr_aton(cmd, bssid) == 0)
|
|
|
|
bss = wpa_bss_get_bssid(wpa_s, bssid);
|
|
|
|
else {
|
|
|
|
struct wpa_bss *tmp;
|
|
|
|
i = atoi(cmd);
|
|
|
|
bss = NULL;
|
|
|
|
dl_list_for_each(tmp, &wpa_s->bss_id, struct wpa_bss, list_id)
|
|
|
|
{
|
|
|
|
if (i-- == 0) {
|
|
|
|
bss = tmp;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-07 05:23:21 -04:00
|
|
|
if ((ctmp = os_strstr(cmd, "MASK=")) != NULL) {
|
|
|
|
mask = strtoul(ctmp + 5, NULL, 0x10);
|
|
|
|
if (mask == 0)
|
|
|
|
mask = WPA_BSS_MASK_ALL;
|
|
|
|
}
|
|
|
|
|
2012-04-07 05:06:35 -04:00
|
|
|
if (bss == NULL)
|
|
|
|
return 0;
|
|
|
|
|
2012-04-07 05:49:31 -04:00
|
|
|
if (bsslast == NULL)
|
|
|
|
bsslast = bss;
|
|
|
|
do {
|
|
|
|
len = print_bss_info(wpa_s, bss, mask, buf, buflen);
|
|
|
|
ret += len;
|
|
|
|
buf += len;
|
|
|
|
buflen -= len;
|
2013-02-28 11:46:06 -05:00
|
|
|
if (bss == bsslast) {
|
|
|
|
if ((mask & WPA_BSS_MASK_DELIM) && len &&
|
|
|
|
(bss == dl_list_last(&wpa_s->bss_id,
|
2014-12-06 14:40:31 -05:00
|
|
|
struct wpa_bss, list_id))) {
|
|
|
|
int res;
|
|
|
|
|
|
|
|
res = os_snprintf(buf - 5, end - buf + 5,
|
|
|
|
"####\n");
|
|
|
|
if (os_snprintf_error(end - buf + 5, res)) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"Could not add end delim");
|
|
|
|
}
|
|
|
|
}
|
2012-04-07 05:49:31 -04:00
|
|
|
break;
|
2013-02-28 11:46:06 -05:00
|
|
|
}
|
2012-04-07 05:49:31 -04:00
|
|
|
next = bss->list_id.next;
|
|
|
|
if (next == &wpa_s->bss_id)
|
|
|
|
break;
|
|
|
|
bss = dl_list_entry(next, struct wpa_bss, list_id);
|
|
|
|
} while (bss && len);
|
|
|
|
|
|
|
|
return ret;
|
2012-04-07 05:06:35 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
static int wpa_supplicant_ctrl_iface_ap_scan(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int ap_scan = atoi(cmd);
|
2009-09-13 14:16:43 -04:00
|
|
|
return wpa_supplicant_set_ap_scan(wpa_s, ap_scan);
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-04-11 16:14:38 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_scan_interval(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int scan_int = atoi(cmd);
|
2012-04-01 11:05:22 -04:00
|
|
|
return wpa_supplicant_set_scan_interval(wpa_s, scan_int);
|
2011-04-11 16:14:38 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-03-20 06:40:59 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_bss_expire_age(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int expire_age = atoi(cmd);
|
|
|
|
return wpa_supplicant_set_bss_expiration_age(wpa_s, expire_age);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_bss_expire_count(
|
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int expire_count = atoi(cmd);
|
|
|
|
return wpa_supplicant_set_bss_expiration_count(wpa_s, expire_count);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-12-13 12:22:23 -05:00
|
|
|
static void wpa_supplicant_ctrl_iface_bss_flush(
|
2012-08-25 03:23:22 -04:00
|
|
|
struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int flush_age = atoi(cmd);
|
|
|
|
|
|
|
|
if (flush_age == 0)
|
|
|
|
wpa_bss_flush(wpa_s);
|
|
|
|
else
|
|
|
|
wpa_bss_flush_by_age(wpa_s, flush_age);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-04-05 16:59:31 -04:00
|
|
|
#ifdef CONFIG_TESTING_OPTIONS
|
2010-03-29 18:42:04 -04:00
|
|
|
static void wpa_supplicant_ctrl_iface_drop_sa(struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
wpa_printf(MSG_DEBUG, "Dropping SA without deauthentication");
|
|
|
|
/* MLME-DELETEKEYS.request */
|
2011-01-09 12:44:28 -05:00
|
|
|
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, NULL, 0, 0, NULL, 0, NULL, 0);
|
|
|
|
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, NULL, 1, 0, NULL, 0, NULL, 0);
|
|
|
|
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, NULL, 2, 0, NULL, 0, NULL, 0);
|
|
|
|
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, NULL, 3, 0, NULL, 0, NULL, 0);
|
2010-03-29 18:42:04 -04:00
|
|
|
#ifdef CONFIG_IEEE80211W
|
2011-01-09 12:44:28 -05:00
|
|
|
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, NULL, 4, 0, NULL, 0, NULL, 0);
|
|
|
|
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, NULL, 5, 0, NULL, 0, NULL, 0);
|
2010-03-29 18:42:04 -04:00
|
|
|
#endif /* CONFIG_IEEE80211W */
|
|
|
|
|
|
|
|
wpa_drv_set_key(wpa_s, WPA_ALG_NONE, wpa_s->bssid, 0, 0, NULL, 0, NULL,
|
|
|
|
0);
|
|
|
|
/* MLME-SETPROTECTION.request(None) */
|
|
|
|
wpa_drv_mlme_setprotection(wpa_s, wpa_s->bssid,
|
|
|
|
MLME_SETPROTECTION_PROTECT_TYPE_NONE,
|
|
|
|
MLME_SETPROTECTION_KEY_TYPE_PAIRWISE);
|
|
|
|
wpa_sm_drop_sa(wpa_s->wpa);
|
|
|
|
}
|
2014-04-05 16:59:31 -04:00
|
|
|
#endif /* CONFIG_TESTING_OPTIONS */
|
2010-03-29 18:42:04 -04:00
|
|
|
|
|
|
|
|
2010-04-10 15:56:55 -04:00
|
|
|
static int wpa_supplicant_ctrl_iface_roam(struct wpa_supplicant *wpa_s,
|
|
|
|
char *addr)
|
|
|
|
{
|
2011-12-17 11:07:58 -05:00
|
|
|
#ifdef CONFIG_NO_SCAN_PROCESSING
|
|
|
|
return -1;
|
|
|
|
#else /* CONFIG_NO_SCAN_PROCESSING */
|
2010-04-10 15:56:55 -04:00
|
|
|
u8 bssid[ETH_ALEN];
|
|
|
|
struct wpa_bss *bss;
|
|
|
|
struct wpa_ssid *ssid = wpa_s->current_ssid;
|
|
|
|
|
|
|
|
if (hwaddr_aton(addr, bssid)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE ROAM: invalid "
|
|
|
|
"address '%s'", addr);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE ROAM " MACSTR, MAC2STR(bssid));
|
|
|
|
|
2013-03-30 05:49:05 -04:00
|
|
|
if (!ssid) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE ROAM: No network "
|
|
|
|
"configuration known for the target AP");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
bss = wpa_bss_get(wpa_s, bssid, ssid->ssid, ssid->ssid_len);
|
2010-04-10 15:56:55 -04:00
|
|
|
if (!bss) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE ROAM: Target AP not found "
|
|
|
|
"from BSS table");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* TODO: Find best network configuration block from configuration to
|
|
|
|
* allow roaming to other networks
|
|
|
|
*/
|
|
|
|
|
|
|
|
wpa_s->reassociate = 1;
|
|
|
|
wpa_supplicant_connect(wpa_s, bss, ssid);
|
|
|
|
|
|
|
|
return 0;
|
2011-12-17 11:07:58 -05:00
|
|
|
#endif /* CONFIG_NO_SCAN_PROCESSING */
|
2010-04-10 15:56:55 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
static int p2p_ctrl_find(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
unsigned int timeout = atoi(cmd);
|
|
|
|
enum p2p_discovery_type type = P2P_FIND_START_WITH_FULL;
|
2012-01-08 12:25:29 -05:00
|
|
|
u8 dev_id[ETH_ALEN], *_dev_id = NULL;
|
2014-01-08 13:01:19 -05:00
|
|
|
u8 dev_type[WPS_DEV_TYPE_LEN], *_dev_type = NULL;
|
2012-01-08 12:25:29 -05:00
|
|
|
char *pos;
|
2012-08-23 11:34:57 -04:00
|
|
|
unsigned int search_delay;
|
2014-09-05 10:27:20 -04:00
|
|
|
const char *seek[P2P_MAX_QUERY_HASH + 1];
|
|
|
|
u8 seek_count = 0;
|
2010-07-18 17:30:25 -04:00
|
|
|
|
2014-05-15 14:34:32 -04:00
|
|
|
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) {
|
|
|
|
wpa_dbg(wpa_s, MSG_INFO,
|
|
|
|
"Reject P2P_FIND since interface is disabled");
|
|
|
|
return -1;
|
|
|
|
}
|
2010-07-18 17:30:25 -04:00
|
|
|
if (os_strstr(cmd, "type=social"))
|
|
|
|
type = P2P_FIND_ONLY_SOCIAL;
|
|
|
|
else if (os_strstr(cmd, "type=progressive"))
|
|
|
|
type = P2P_FIND_PROGRESSIVE;
|
|
|
|
|
2012-01-08 12:25:29 -05:00
|
|
|
pos = os_strstr(cmd, "dev_id=");
|
|
|
|
if (pos) {
|
|
|
|
pos += 7;
|
|
|
|
if (hwaddr_aton(pos, dev_id))
|
|
|
|
return -1;
|
|
|
|
_dev_id = dev_id;
|
|
|
|
}
|
|
|
|
|
2014-01-08 13:01:19 -05:00
|
|
|
pos = os_strstr(cmd, "dev_type=");
|
|
|
|
if (pos) {
|
|
|
|
pos += 9;
|
|
|
|
if (wps_dev_type_str2bin(pos, dev_type) < 0)
|
|
|
|
return -1;
|
|
|
|
_dev_type = dev_type;
|
|
|
|
}
|
|
|
|
|
2012-08-23 11:20:58 -04:00
|
|
|
pos = os_strstr(cmd, "delay=");
|
|
|
|
if (pos) {
|
|
|
|
pos += 6;
|
|
|
|
search_delay = atoi(pos);
|
2012-08-23 11:34:57 -04:00
|
|
|
} else
|
|
|
|
search_delay = wpas_p2p_search_delay(wpa_s);
|
2012-08-23 11:20:58 -04:00
|
|
|
|
2014-09-05 10:27:20 -04:00
|
|
|
/* Must be searched for last, because it adds nul termination */
|
|
|
|
pos = os_strstr(cmd, " seek=");
|
|
|
|
while (pos && seek_count < P2P_MAX_QUERY_HASH + 1) {
|
|
|
|
char *term;
|
|
|
|
|
|
|
|
term = os_strchr(pos + 1, ' ');
|
|
|
|
seek[seek_count++] = pos + 6;
|
|
|
|
pos = os_strstr(pos + 6, " seek=");
|
|
|
|
|
|
|
|
if (term)
|
|
|
|
*term = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!seek_count)
|
|
|
|
return wpas_p2p_find(wpa_s, timeout, type, _dev_type != NULL,
|
|
|
|
_dev_type, _dev_id,
|
|
|
|
search_delay, 0, NULL);
|
|
|
|
|
|
|
|
if (seek_count > P2P_MAX_QUERY_HASH) {
|
|
|
|
seek[0] = NULL;
|
|
|
|
return wpas_p2p_find(wpa_s, timeout, type, _dev_type != NULL,
|
|
|
|
_dev_type, _dev_id,
|
|
|
|
search_delay, 1, seek);
|
|
|
|
}
|
|
|
|
|
2014-01-08 13:01:19 -05:00
|
|
|
return wpas_p2p_find(wpa_s, timeout, type, _dev_type != NULL, _dev_type,
|
2014-09-05 10:27:20 -04:00
|
|
|
_dev_id, search_delay, seek_count, seek);
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-12-10 04:34:32 -05:00
|
|
|
static struct p2ps_provision * p2p_parse_asp_provision_cmd(const char *cmd)
|
|
|
|
{
|
|
|
|
struct p2ps_provision *p2ps_prov;
|
|
|
|
char *pos;
|
|
|
|
size_t info_len = 0;
|
|
|
|
char *info = NULL;
|
|
|
|
u8 role = P2PS_SETUP_NONE;
|
|
|
|
long long unsigned val;
|
|
|
|
|
|
|
|
pos = os_strstr(cmd, "info=");
|
|
|
|
if (pos) {
|
|
|
|
pos += 5;
|
|
|
|
info_len = os_strlen(pos);
|
|
|
|
|
|
|
|
if (info_len) {
|
|
|
|
info = os_malloc(info_len + 1);
|
|
|
|
if (info) {
|
|
|
|
info_len = utf8_unescape(pos, info_len,
|
|
|
|
info, info_len + 1);
|
|
|
|
} else
|
|
|
|
info_len = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
p2ps_prov = os_zalloc(sizeof(struct p2ps_provision) + info_len + 1);
|
|
|
|
if (p2ps_prov == NULL) {
|
|
|
|
os_free(info);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (info) {
|
|
|
|
os_memcpy(p2ps_prov->info, info, info_len);
|
|
|
|
p2ps_prov->info[info_len] = '\0';
|
|
|
|
os_free(info);
|
|
|
|
}
|
|
|
|
|
|
|
|
pos = os_strstr(cmd, "status=");
|
|
|
|
if (pos)
|
|
|
|
p2ps_prov->status = atoi(pos + 7);
|
|
|
|
else
|
|
|
|
p2ps_prov->status = -1;
|
|
|
|
|
|
|
|
pos = os_strstr(cmd, "adv_id=");
|
|
|
|
if (!pos || sscanf(pos + 7, "%llx", &val) != 1 || val > 0xffffffffULL)
|
|
|
|
goto invalid_args;
|
|
|
|
p2ps_prov->adv_id = val;
|
|
|
|
|
|
|
|
pos = os_strstr(cmd, "method=");
|
|
|
|
if (pos)
|
|
|
|
p2ps_prov->method = strtol(pos + 7, NULL, 16);
|
|
|
|
else
|
|
|
|
p2ps_prov->method = 0;
|
|
|
|
|
|
|
|
pos = os_strstr(cmd, "session=");
|
|
|
|
if (!pos || sscanf(pos + 8, "%llx", &val) != 1 || val > 0xffffffffULL)
|
|
|
|
goto invalid_args;
|
|
|
|
p2ps_prov->session_id = val;
|
|
|
|
|
|
|
|
pos = os_strstr(cmd, "adv_mac=");
|
|
|
|
if (!pos || hwaddr_aton(pos + 8, p2ps_prov->adv_mac))
|
|
|
|
goto invalid_args;
|
|
|
|
|
|
|
|
pos = os_strstr(cmd, "session_mac=");
|
|
|
|
if (!pos || hwaddr_aton(pos + 12, p2ps_prov->session_mac))
|
|
|
|
goto invalid_args;
|
|
|
|
|
|
|
|
/* force conncap with tstCap (no sanity checks) */
|
|
|
|
pos = os_strstr(cmd, "tstCap=");
|
|
|
|
if (pos) {
|
|
|
|
role = strtol(pos + 7, NULL, 16);
|
|
|
|
} else {
|
|
|
|
pos = os_strstr(cmd, "role=");
|
|
|
|
if (pos) {
|
|
|
|
role = strtol(pos + 5, NULL, 16);
|
|
|
|
if (role != P2PS_SETUP_CLIENT &&
|
|
|
|
role != P2PS_SETUP_GROUP_OWNER)
|
|
|
|
role = P2PS_SETUP_NONE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
p2ps_prov->role = role;
|
|
|
|
|
|
|
|
return p2ps_prov;
|
|
|
|
|
|
|
|
invalid_args:
|
|
|
|
os_free(p2ps_prov);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_asp_provision_resp(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
struct p2ps_provision *p2ps_prov;
|
|
|
|
char *pos;
|
|
|
|
|
|
|
|
/* <addr> id=<adv_id> [role=<conncap>] [info=<infodata>] */
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "%s: %s", __func__, cmd);
|
|
|
|
|
|
|
|
if (hwaddr_aton(cmd, addr))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = cmd + 17;
|
|
|
|
if (*pos != ' ')
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
p2ps_prov = p2p_parse_asp_provision_cmd(pos);
|
|
|
|
if (!p2ps_prov)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (p2ps_prov->status < 0) {
|
|
|
|
os_free(p2ps_prov);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return wpas_p2p_prov_disc(wpa_s, addr, NULL, WPAS_P2P_PD_FOR_ASP,
|
|
|
|
p2ps_prov);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_asp_provision(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
struct p2ps_provision *p2ps_prov;
|
|
|
|
char *pos;
|
|
|
|
|
|
|
|
/* <addr> id=<adv_id> adv_mac=<adv_mac> conncap=<conncap>
|
|
|
|
* session=<ses_id> mac=<ses_mac> [info=<infodata>]
|
|
|
|
*/
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "%s: %s", __func__, cmd);
|
|
|
|
if (hwaddr_aton(cmd, addr))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = cmd + 17;
|
|
|
|
if (*pos != ' ')
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
p2ps_prov = p2p_parse_asp_provision_cmd(pos);
|
|
|
|
if (!p2ps_prov)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return wpas_p2p_prov_disc(wpa_s, addr, NULL, WPAS_P2P_PD_FOR_ASP,
|
|
|
|
p2ps_prov);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
static int p2p_ctrl_connect(struct wpa_supplicant *wpa_s, char *cmd,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
char *pos, *pos2;
|
|
|
|
char *pin = NULL;
|
|
|
|
enum p2p_wps_method wps_method;
|
|
|
|
int new_pin;
|
|
|
|
int ret;
|
2012-04-27 11:17:10 -04:00
|
|
|
int persistent_group, persistent_id = -1;
|
2010-07-18 17:30:25 -04:00
|
|
|
int join;
|
|
|
|
int auth;
|
2012-04-13 09:04:36 -04:00
|
|
|
int automatic;
|
2010-07-18 17:30:25 -04:00
|
|
|
int go_intent = -1;
|
|
|
|
int freq = 0;
|
2012-05-11 09:25:47 -04:00
|
|
|
int pd;
|
2013-10-27 13:46:17 -04:00
|
|
|
int ht40, vht;
|
2010-07-18 17:30:25 -04:00
|
|
|
|
2014-09-11 11:27:44 -04:00
|
|
|
/* <addr> <"pbc" | "pin" | PIN> [label|display|keypad|p2ps]
|
2012-04-27 11:17:10 -04:00
|
|
|
* [persistent|persistent=<network id>]
|
2012-08-15 16:07:44 -04:00
|
|
|
* [join] [auth] [go_intent=<0..15>] [freq=<in MHz>] [provdisc]
|
2013-10-27 13:46:17 -04:00
|
|
|
* [ht40] [vht] */
|
2010-07-18 17:30:25 -04:00
|
|
|
|
|
|
|
if (hwaddr_aton(cmd, addr))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = cmd + 17;
|
|
|
|
if (*pos != ' ')
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
persistent_group = os_strstr(pos, " persistent") != NULL;
|
2012-04-27 11:17:10 -04:00
|
|
|
pos2 = os_strstr(pos, " persistent=");
|
|
|
|
if (pos2) {
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
persistent_id = atoi(pos2 + 12);
|
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, persistent_id);
|
|
|
|
if (ssid == NULL || ssid->disabled != 2 ||
|
|
|
|
ssid->mode != WPAS_MODE_P2P_GO) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find "
|
|
|
|
"SSID id=%d for persistent P2P group (GO)",
|
|
|
|
persistent_id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2010-07-18 17:30:25 -04:00
|
|
|
join = os_strstr(pos, " join") != NULL;
|
|
|
|
auth = os_strstr(pos, " auth") != NULL;
|
2012-04-13 09:04:36 -04:00
|
|
|
automatic = os_strstr(pos, " auto") != NULL;
|
2012-05-11 09:25:47 -04:00
|
|
|
pd = os_strstr(pos, " provdisc") != NULL;
|
2013-10-27 13:46:17 -04:00
|
|
|
vht = (os_strstr(cmd, " vht") != NULL) || wpa_s->conf->p2p_go_vht;
|
|
|
|
ht40 = (os_strstr(cmd, " ht40") != NULL) || wpa_s->conf->p2p_go_ht40 ||
|
|
|
|
vht;
|
2010-07-18 17:30:25 -04:00
|
|
|
|
|
|
|
pos2 = os_strstr(pos, " go_intent=");
|
|
|
|
if (pos2) {
|
|
|
|
pos2 += 11;
|
|
|
|
go_intent = atoi(pos2);
|
|
|
|
if (go_intent < 0 || go_intent > 15)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
pos2 = os_strstr(pos, " freq=");
|
|
|
|
if (pos2) {
|
|
|
|
pos2 += 6;
|
|
|
|
freq = atoi(pos2);
|
|
|
|
if (freq <= 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strncmp(pos, "pin", 3) == 0) {
|
|
|
|
/* Request random PIN (to be displayed) and enable the PIN */
|
|
|
|
wps_method = WPS_PIN_DISPLAY;
|
|
|
|
} else if (os_strncmp(pos, "pbc", 3) == 0) {
|
|
|
|
wps_method = WPS_PBC;
|
|
|
|
} else {
|
|
|
|
pin = pos;
|
|
|
|
pos = os_strchr(pin, ' ');
|
|
|
|
wps_method = WPS_PIN_KEYPAD;
|
|
|
|
if (pos) {
|
|
|
|
*pos++ = '\0';
|
2011-09-08 09:40:03 -04:00
|
|
|
if (os_strncmp(pos, "display", 7) == 0)
|
2010-07-18 17:30:25 -04:00
|
|
|
wps_method = WPS_PIN_DISPLAY;
|
2014-09-11 11:27:44 -04:00
|
|
|
else if (os_strncmp(pos, "p2ps", 4) == 0)
|
|
|
|
wps_method = WPS_P2PS;
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
2012-06-30 14:27:32 -04:00
|
|
|
if (!wps_pin_str_valid(pin)) {
|
2012-06-30 14:19:12 -04:00
|
|
|
os_memcpy(buf, "FAIL-INVALID-PIN\n", 17);
|
|
|
|
return 17;
|
|
|
|
}
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
new_pin = wpas_p2p_connect(wpa_s, addr, pin, wps_method,
|
2012-04-13 09:04:36 -04:00
|
|
|
persistent_group, automatic, join,
|
2012-08-15 16:07:44 -04:00
|
|
|
auth, go_intent, freq, persistent_id, pd,
|
2013-10-27 13:46:17 -04:00
|
|
|
ht40, vht);
|
2010-10-14 07:24:56 -04:00
|
|
|
if (new_pin == -2) {
|
|
|
|
os_memcpy(buf, "FAIL-CHANNEL-UNAVAILABLE\n", 25);
|
|
|
|
return 25;
|
|
|
|
}
|
|
|
|
if (new_pin == -3) {
|
|
|
|
os_memcpy(buf, "FAIL-CHANNEL-UNSUPPORTED\n", 25);
|
|
|
|
return 25;
|
|
|
|
}
|
2010-07-18 17:30:25 -04:00
|
|
|
if (new_pin < 0)
|
|
|
|
return -1;
|
|
|
|
if (wps_method == WPS_PIN_DISPLAY && pin == NULL) {
|
|
|
|
ret = os_snprintf(buf, buflen, "%08d", new_pin);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2010-07-18 17:30:25 -04:00
|
|
|
return -1;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_memcpy(buf, "OK\n", 3);
|
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_listen(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
unsigned int timeout = atoi(cmd);
|
2014-05-15 14:34:32 -04:00
|
|
|
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) {
|
|
|
|
wpa_dbg(wpa_s, MSG_INFO,
|
|
|
|
"Reject P2P_LISTEN since interface is disabled");
|
|
|
|
return -1;
|
|
|
|
}
|
2010-07-18 17:30:25 -04:00
|
|
|
return wpas_p2p_listen(wpa_s, timeout);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_prov_disc(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
char *pos;
|
2012-04-26 10:13:03 -04:00
|
|
|
enum wpas_p2p_prov_disc_use use = WPAS_P2P_PD_FOR_GO_NEG;
|
2010-07-18 17:30:25 -04:00
|
|
|
|
2012-04-26 10:13:03 -04:00
|
|
|
/* <addr> <config method> [join|auto] */
|
2010-07-18 17:30:25 -04:00
|
|
|
|
|
|
|
if (hwaddr_aton(cmd, addr))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = cmd + 17;
|
|
|
|
if (*pos != ' ')
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
|
2012-04-26 10:13:03 -04:00
|
|
|
if (os_strstr(pos, " join") != NULL)
|
|
|
|
use = WPAS_P2P_PD_FOR_JOIN;
|
|
|
|
else if (os_strstr(pos, " auto") != NULL)
|
|
|
|
use = WPAS_P2P_PD_AUTO;
|
|
|
|
|
2014-12-10 09:25:18 -05:00
|
|
|
return wpas_p2p_prov_disc(wpa_s, addr, pos, use, NULL);
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_get_passphrase(struct wpa_supplicant *wpa_s, char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
struct wpa_ssid *ssid = wpa_s->current_ssid;
|
|
|
|
|
|
|
|
if (ssid == NULL || ssid->mode != WPAS_MODE_P2P_GO ||
|
|
|
|
ssid->passphrase == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
os_strlcpy(buf, ssid->passphrase, buflen);
|
|
|
|
return os_strlen(buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_serv_disc_req(struct wpa_supplicant *wpa_s, char *cmd,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
u64 ref;
|
|
|
|
int res;
|
|
|
|
u8 dst_buf[ETH_ALEN], *dst;
|
|
|
|
struct wpabuf *tlvs;
|
|
|
|
char *pos;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
if (hwaddr_aton(cmd, dst_buf))
|
|
|
|
return -1;
|
|
|
|
dst = dst_buf;
|
|
|
|
if (dst[0] == 0 && dst[1] == 0 && dst[2] == 0 &&
|
|
|
|
dst[3] == 0 && dst[4] == 0 && dst[5] == 0)
|
|
|
|
dst = NULL;
|
|
|
|
pos = cmd + 17;
|
|
|
|
if (*pos != ' ')
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
if (os_strncmp(pos, "upnp ", 5) == 0) {
|
|
|
|
u8 version;
|
|
|
|
pos += 5;
|
|
|
|
if (hexstr2bin(pos, &version, 1) < 0)
|
|
|
|
return -1;
|
|
|
|
pos += 2;
|
|
|
|
if (*pos != ' ')
|
|
|
|
return -1;
|
|
|
|
pos++;
|
2011-12-11 11:06:34 -05:00
|
|
|
ref = wpas_p2p_sd_request_upnp(wpa_s, dst, version, pos);
|
2012-03-02 14:48:57 -05:00
|
|
|
#ifdef CONFIG_WIFI_DISPLAY
|
|
|
|
} else if (os_strncmp(pos, "wifi-display ", 13) == 0) {
|
|
|
|
ref = wpas_p2p_sd_request_wifi_display(wpa_s, dst, pos + 13);
|
|
|
|
#endif /* CONFIG_WIFI_DISPLAY */
|
2014-12-09 10:12:27 -05:00
|
|
|
} else if (os_strncmp(pos, "asp ", 4) == 0) {
|
|
|
|
char *svc_str;
|
|
|
|
char *svc_info = NULL;
|
|
|
|
u32 id;
|
|
|
|
|
|
|
|
pos += 4;
|
|
|
|
if (sscanf(pos, "%x", &id) != 1 || id > 0xff)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos == NULL || pos[1] == '\0' || pos[1] == ' ')
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
svc_str = pos + 1;
|
|
|
|
|
|
|
|
pos = os_strchr(svc_str, ' ');
|
|
|
|
|
|
|
|
if (pos)
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
/* All remaining data is the svc_info string */
|
|
|
|
if (pos && pos[0] && pos[0] != ' ') {
|
|
|
|
len = os_strlen(pos);
|
|
|
|
|
|
|
|
/* Unescape in place */
|
|
|
|
len = utf8_unescape(pos, len, pos, len);
|
|
|
|
if (len > 0xff)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
svc_info = pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
ref = wpas_p2p_sd_request_asp(wpa_s, dst, (u8) id,
|
|
|
|
svc_str, svc_info);
|
2010-07-18 17:30:25 -04:00
|
|
|
} else {
|
|
|
|
len = os_strlen(pos);
|
|
|
|
if (len & 1)
|
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
tlvs = wpabuf_alloc(len);
|
|
|
|
if (tlvs == NULL)
|
|
|
|
return -1;
|
|
|
|
if (hexstr2bin(pos, wpabuf_put(tlvs, len), len) < 0) {
|
|
|
|
wpabuf_free(tlvs);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2011-12-11 11:06:34 -05:00
|
|
|
ref = wpas_p2p_sd_request(wpa_s, dst, tlvs);
|
2010-07-18 17:30:25 -04:00
|
|
|
wpabuf_free(tlvs);
|
|
|
|
}
|
2011-12-11 11:06:34 -05:00
|
|
|
if (ref == 0)
|
|
|
|
return -1;
|
2010-07-18 17:30:25 -04:00
|
|
|
res = os_snprintf(buf, buflen, "%llx", (long long unsigned) ref);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(buflen, res))
|
2010-07-18 17:30:25 -04:00
|
|
|
return -1;
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_serv_disc_cancel_req(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
long long unsigned val;
|
|
|
|
u64 req;
|
|
|
|
if (sscanf(cmd, "%llx", &val) != 1)
|
|
|
|
return -1;
|
|
|
|
req = val;
|
2011-12-11 11:06:34 -05:00
|
|
|
return wpas_p2p_sd_cancel_request(wpa_s, req);
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_serv_disc_resp(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int freq;
|
2010-10-31 06:17:30 -04:00
|
|
|
u8 dst[ETH_ALEN];
|
2010-07-18 17:30:25 -04:00
|
|
|
u8 dialog_token;
|
|
|
|
struct wpabuf *resp_tlvs;
|
|
|
|
char *pos, *pos2;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
freq = atoi(cmd);
|
|
|
|
if (freq == 0)
|
|
|
|
return -1;
|
|
|
|
|
2010-10-31 06:17:30 -04:00
|
|
|
if (hwaddr_aton(pos, dst))
|
2010-07-18 17:30:25 -04:00
|
|
|
return -1;
|
|
|
|
pos += 17;
|
|
|
|
if (*pos != ' ')
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
pos2 = os_strchr(pos, ' ');
|
|
|
|
if (pos2 == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos2++ = '\0';
|
|
|
|
dialog_token = atoi(pos);
|
|
|
|
|
|
|
|
len = os_strlen(pos2);
|
|
|
|
if (len & 1)
|
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
resp_tlvs = wpabuf_alloc(len);
|
|
|
|
if (resp_tlvs == NULL)
|
|
|
|
return -1;
|
|
|
|
if (hexstr2bin(pos2, wpabuf_put(resp_tlvs, len), len) < 0) {
|
|
|
|
wpabuf_free(resp_tlvs);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpas_p2p_sd_response(wpa_s, freq, dst, dialog_token, resp_tlvs);
|
|
|
|
wpabuf_free(resp_tlvs);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_serv_disc_external(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
2012-03-05 09:26:19 -05:00
|
|
|
if (os_strcmp(cmd, "0") && os_strcmp(cmd, "1"))
|
|
|
|
return -1;
|
2010-07-18 17:30:25 -04:00
|
|
|
wpa_s->p2p_sd_over_ctrl_iface = atoi(cmd);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_service_add_bonjour(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
size_t len;
|
|
|
|
struct wpabuf *query, *resp;
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
len = os_strlen(cmd);
|
|
|
|
if (len & 1)
|
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
query = wpabuf_alloc(len);
|
|
|
|
if (query == NULL)
|
|
|
|
return -1;
|
|
|
|
if (hexstr2bin(cmd, wpabuf_put(query, len), len) < 0) {
|
|
|
|
wpabuf_free(query);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
len = os_strlen(pos);
|
|
|
|
if (len & 1) {
|
|
|
|
wpabuf_free(query);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
len /= 2;
|
|
|
|
resp = wpabuf_alloc(len);
|
|
|
|
if (resp == NULL) {
|
|
|
|
wpabuf_free(query);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (hexstr2bin(pos, wpabuf_put(resp, len), len) < 0) {
|
|
|
|
wpabuf_free(query);
|
|
|
|
wpabuf_free(resp);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpas_p2p_service_add_bonjour(wpa_s, query, resp) < 0) {
|
|
|
|
wpabuf_free(query);
|
|
|
|
wpabuf_free(resp);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_service_add_upnp(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
u8 version;
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
if (hexstr2bin(cmd, &version, 1) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return wpas_p2p_service_add_upnp(wpa_s, version, pos);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-12-09 09:02:50 -05:00
|
|
|
static int p2p_ctrl_service_add_asp(struct wpa_supplicant *wpa_s,
|
|
|
|
u8 replace, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
char *adv_str;
|
|
|
|
u32 auto_accept, adv_id, svc_state, config_methods;
|
|
|
|
char *svc_info = NULL;
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
/* Auto-Accept value is mandatory, and must be one of the
|
|
|
|
* single values (0, 1, 2, 4) */
|
|
|
|
auto_accept = atoi(cmd);
|
|
|
|
switch (auto_accept) {
|
|
|
|
case P2PS_SETUP_NONE: /* No auto-accept */
|
|
|
|
case P2PS_SETUP_NEW:
|
|
|
|
case P2PS_SETUP_CLIENT:
|
|
|
|
case P2PS_SETUP_GROUP_OWNER:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Advertisement ID is mandatory */
|
|
|
|
cmd = pos;
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
/* Handle Adv_ID == 0 (wildcard "org.wi-fi.wfds") internally. */
|
|
|
|
if (sscanf(cmd, "%x", &adv_id) != 1 || adv_id == 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Only allow replacements if exist, and adds if not */
|
|
|
|
if (wpas_p2p_service_p2ps_id_exists(wpa_s, adv_id)) {
|
|
|
|
if (!replace)
|
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
if (replace)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* svc_state between 0 - 0xff is mandatory */
|
|
|
|
if (sscanf(pos, "%x", &svc_state) != 1 || svc_state > 0xff)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* config_methods is mandatory */
|
|
|
|
pos++;
|
|
|
|
if (sscanf(pos, "%x", &config_methods) != 1)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (!(config_methods &
|
|
|
|
(WPS_CONFIG_DISPLAY | WPS_CONFIG_KEYPAD | WPS_CONFIG_P2PS)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos++;
|
|
|
|
adv_str = pos;
|
|
|
|
|
|
|
|
/* Advertisement string is mandatory */
|
|
|
|
if (!pos[0] || pos[0] == ' ')
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Terminate svc string */
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos != NULL)
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
/* Service and Response Information are optional */
|
|
|
|
if (pos && pos[0]) {
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
/* Note the bare ' included, which cannot exist legally
|
|
|
|
* in unescaped string. */
|
|
|
|
svc_info = os_strstr(pos, "svc_info='");
|
|
|
|
|
|
|
|
if (svc_info) {
|
|
|
|
svc_info += 9;
|
|
|
|
len = os_strlen(svc_info);
|
|
|
|
utf8_unescape(svc_info, len, svc_info, len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return wpas_p2p_service_add_asp(wpa_s, auto_accept, adv_id, adv_str,
|
|
|
|
(u8) svc_state, (u16) config_methods,
|
|
|
|
svc_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
static int p2p_ctrl_service_add(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "bonjour") == 0)
|
|
|
|
return p2p_ctrl_service_add_bonjour(wpa_s, pos);
|
|
|
|
if (os_strcmp(cmd, "upnp") == 0)
|
|
|
|
return p2p_ctrl_service_add_upnp(wpa_s, pos);
|
2014-12-09 09:02:50 -05:00
|
|
|
if (os_strcmp(cmd, "asp") == 0)
|
|
|
|
return p2p_ctrl_service_add_asp(wpa_s, 0, pos);
|
2010-07-18 17:30:25 -04:00
|
|
|
wpa_printf(MSG_DEBUG, "Unknown service '%s'", cmd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_service_del_bonjour(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
struct wpabuf *query;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
len = os_strlen(cmd);
|
|
|
|
if (len & 1)
|
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
query = wpabuf_alloc(len);
|
|
|
|
if (query == NULL)
|
|
|
|
return -1;
|
|
|
|
if (hexstr2bin(cmd, wpabuf_put(query, len), len) < 0) {
|
|
|
|
wpabuf_free(query);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = wpas_p2p_service_del_bonjour(wpa_s, query);
|
|
|
|
wpabuf_free(query);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_service_del_upnp(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
u8 version;
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
if (hexstr2bin(cmd, &version, 1) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return wpas_p2p_service_del_upnp(wpa_s, version, pos);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-12-09 09:02:50 -05:00
|
|
|
static int p2p_ctrl_service_del_asp(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
u32 adv_id;
|
|
|
|
|
|
|
|
if (sscanf(cmd, "%x", &adv_id) != 1)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return wpas_p2p_service_del_asp(wpa_s, adv_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
static int p2p_ctrl_service_del(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "bonjour") == 0)
|
|
|
|
return p2p_ctrl_service_del_bonjour(wpa_s, pos);
|
|
|
|
if (os_strcmp(cmd, "upnp") == 0)
|
|
|
|
return p2p_ctrl_service_del_upnp(wpa_s, pos);
|
2014-12-09 09:02:50 -05:00
|
|
|
if (os_strcmp(cmd, "asp") == 0)
|
|
|
|
return p2p_ctrl_service_del_asp(wpa_s, pos);
|
|
|
|
wpa_printf(MSG_DEBUG, "Unknown service '%s'", cmd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_service_replace(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "asp") == 0)
|
|
|
|
return p2p_ctrl_service_add_asp(wpa_s, 1, pos);
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
wpa_printf(MSG_DEBUG, "Unknown service '%s'", cmd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_reject(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
|
|
|
|
/* <addr> */
|
|
|
|
|
|
|
|
if (hwaddr_aton(cmd, addr))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return wpas_p2p_reject(wpa_s, addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_invite_persistent(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid;
|
2012-09-16 01:21:46 -04:00
|
|
|
u8 *_peer = NULL, peer[ETH_ALEN];
|
2013-03-01 12:40:54 -05:00
|
|
|
int freq = 0, pref_freq = 0;
|
2013-10-27 13:46:17 -04:00
|
|
|
int ht40, vht;
|
2010-07-18 17:30:25 -04:00
|
|
|
|
|
|
|
id = atoi(cmd);
|
|
|
|
pos = os_strstr(cmd, " peer=");
|
|
|
|
if (pos) {
|
|
|
|
pos += 6;
|
|
|
|
if (hwaddr_aton(pos, peer))
|
|
|
|
return -1;
|
2012-09-16 01:21:46 -04:00
|
|
|
_peer = peer;
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL || ssid->disabled != 2) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find SSID id=%d "
|
|
|
|
"for persistent P2P group",
|
|
|
|
id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-08-31 14:20:51 -04:00
|
|
|
pos = os_strstr(cmd, " freq=");
|
|
|
|
if (pos) {
|
|
|
|
pos += 6;
|
|
|
|
freq = atoi(pos);
|
|
|
|
if (freq <= 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-03-01 12:40:54 -05:00
|
|
|
pos = os_strstr(cmd, " pref=");
|
|
|
|
if (pos) {
|
|
|
|
pos += 6;
|
|
|
|
pref_freq = atoi(pos);
|
|
|
|
if (pref_freq <= 0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-10-27 13:46:17 -04:00
|
|
|
vht = (os_strstr(cmd, " vht") != NULL) || wpa_s->conf->p2p_go_vht;
|
|
|
|
ht40 = (os_strstr(cmd, " ht40") != NULL) || wpa_s->conf->p2p_go_ht40 ||
|
|
|
|
vht;
|
2012-08-31 14:20:51 -04:00
|
|
|
|
2013-10-27 13:46:17 -04:00
|
|
|
return wpas_p2p_invite(wpa_s, _peer, ssid, NULL, freq, ht40, vht,
|
|
|
|
pref_freq);
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_invite_group(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
u8 peer[ETH_ALEN], go_dev_addr[ETH_ALEN], *go_dev = NULL;
|
|
|
|
|
|
|
|
pos = os_strstr(cmd, " peer=");
|
|
|
|
if (!pos)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
*pos = '\0';
|
|
|
|
pos += 6;
|
|
|
|
if (hwaddr_aton(pos, peer)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "P2P: Invalid MAC address '%s'", pos);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
pos = os_strstr(pos, " go_dev_addr=");
|
|
|
|
if (pos) {
|
|
|
|
pos += 13;
|
|
|
|
if (hwaddr_aton(pos, go_dev_addr)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "P2P: Invalid MAC address '%s'",
|
|
|
|
pos);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
go_dev = go_dev_addr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return wpas_p2p_invite_group(wpa_s, cmd, peer, go_dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_invite(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
if (os_strncmp(cmd, "persistent=", 11) == 0)
|
|
|
|
return p2p_ctrl_invite_persistent(wpa_s, cmd + 11);
|
|
|
|
if (os_strncmp(cmd, "group=", 6) == 0)
|
|
|
|
return p2p_ctrl_invite_group(wpa_s, cmd + 6);
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_group_add_persistent(struct wpa_supplicant *wpa_s,
|
2013-10-27 13:46:17 -04:00
|
|
|
char *cmd, int freq, int ht40,
|
|
|
|
int vht)
|
2010-07-18 17:30:25 -04:00
|
|
|
{
|
|
|
|
int id;
|
|
|
|
struct wpa_ssid *ssid;
|
|
|
|
|
|
|
|
id = atoi(cmd);
|
|
|
|
ssid = wpa_config_get_network(wpa_s->conf, id);
|
|
|
|
if (ssid == NULL || ssid->disabled != 2) {
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Could not find SSID id=%d "
|
|
|
|
"for persistent P2P group",
|
|
|
|
id);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2014-01-27 09:46:02 -05:00
|
|
|
return wpas_p2p_group_add_persistent(wpa_s, ssid, 0, freq, 0, ht40, vht,
|
2013-10-27 13:46:17 -04:00
|
|
|
NULL, 0);
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_group_add(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
2013-10-27 13:46:17 -04:00
|
|
|
int freq = 0, ht40, vht;
|
2010-07-18 17:30:25 -04:00
|
|
|
char *pos;
|
|
|
|
|
|
|
|
pos = os_strstr(cmd, "freq=");
|
|
|
|
if (pos)
|
|
|
|
freq = atoi(pos + 5);
|
|
|
|
|
2013-10-27 13:46:17 -04:00
|
|
|
vht = (os_strstr(cmd, "vht") != NULL) || wpa_s->conf->p2p_go_vht;
|
|
|
|
ht40 = (os_strstr(cmd, "ht40") != NULL) || wpa_s->conf->p2p_go_ht40 ||
|
|
|
|
vht;
|
2012-08-15 15:53:01 -04:00
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
if (os_strncmp(cmd, "persistent=", 11) == 0)
|
2012-08-15 15:53:01 -04:00
|
|
|
return p2p_ctrl_group_add_persistent(wpa_s, cmd + 11, freq,
|
2013-10-27 13:46:17 -04:00
|
|
|
ht40, vht);
|
2010-07-18 17:30:25 -04:00
|
|
|
if (os_strcmp(cmd, "persistent") == 0 ||
|
|
|
|
os_strncmp(cmd, "persistent ", 11) == 0)
|
2013-10-27 13:46:17 -04:00
|
|
|
return wpas_p2p_group_add(wpa_s, 1, freq, ht40, vht);
|
2010-07-18 17:30:25 -04:00
|
|
|
if (os_strncmp(cmd, "freq=", 5) == 0)
|
2013-10-27 13:46:17 -04:00
|
|
|
return wpas_p2p_group_add(wpa_s, 0, freq, ht40, vht);
|
2012-08-15 15:53:01 -04:00
|
|
|
if (ht40)
|
2013-10-27 13:46:17 -04:00
|
|
|
return wpas_p2p_group_add(wpa_s, 0, freq, ht40, vht);
|
2010-07-18 17:30:25 -04:00
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL: Invalid P2P_GROUP_ADD parameters '%s'",
|
|
|
|
cmd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_peer(struct wpa_supplicant *wpa_s, char *cmd,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN], *addr_ptr;
|
2011-12-22 14:26:31 -05:00
|
|
|
int next, res;
|
|
|
|
const struct p2p_peer_info *info;
|
|
|
|
char *pos, *end;
|
|
|
|
char devtype[WPS_DEV_TYPE_BUFSIZE];
|
2011-12-22 14:45:20 -05:00
|
|
|
struct wpa_ssid *ssid;
|
2012-10-25 02:16:27 -04:00
|
|
|
size_t i;
|
2010-07-18 17:30:25 -04:00
|
|
|
|
|
|
|
if (!wpa_s->global->p2p)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "FIRST") == 0) {
|
|
|
|
addr_ptr = NULL;
|
|
|
|
next = 0;
|
|
|
|
} else if (os_strncmp(cmd, "NEXT-", 5) == 0) {
|
|
|
|
if (hwaddr_aton(cmd + 5, addr) < 0)
|
|
|
|
return -1;
|
|
|
|
addr_ptr = addr;
|
|
|
|
next = 1;
|
|
|
|
} else {
|
|
|
|
if (hwaddr_aton(cmd, addr) < 0)
|
|
|
|
return -1;
|
|
|
|
addr_ptr = addr;
|
|
|
|
next = 0;
|
|
|
|
}
|
|
|
|
|
2011-12-22 14:26:31 -05:00
|
|
|
info = p2p_get_peer_info(wpa_s->global->p2p, addr_ptr, next);
|
|
|
|
if (info == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = buf + buflen;
|
|
|
|
|
|
|
|
res = os_snprintf(pos, end - pos, MACSTR "\n"
|
|
|
|
"pri_dev_type=%s\n"
|
|
|
|
"device_name=%s\n"
|
|
|
|
"manufacturer=%s\n"
|
|
|
|
"model_name=%s\n"
|
|
|
|
"model_number=%s\n"
|
|
|
|
"serial_number=%s\n"
|
|
|
|
"config_methods=0x%x\n"
|
|
|
|
"dev_capab=0x%x\n"
|
|
|
|
"group_capab=0x%x\n"
|
|
|
|
"level=%d\n",
|
|
|
|
MAC2STR(info->p2p_device_addr),
|
|
|
|
wps_dev_type_bin2str(info->pri_dev_type,
|
|
|
|
devtype, sizeof(devtype)),
|
|
|
|
info->device_name,
|
|
|
|
info->manufacturer,
|
|
|
|
info->model_name,
|
|
|
|
info->model_number,
|
|
|
|
info->serial_number,
|
|
|
|
info->config_methods,
|
|
|
|
info->dev_capab,
|
|
|
|
info->group_capab,
|
|
|
|
info->level);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, res))
|
2011-12-22 14:26:31 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += res;
|
|
|
|
|
2012-10-25 02:16:27 -04:00
|
|
|
for (i = 0; i < info->wps_sec_dev_type_list_len / WPS_DEV_TYPE_LEN; i++)
|
|
|
|
{
|
|
|
|
const u8 *t;
|
|
|
|
t = &info->wps_sec_dev_type_list[i * WPS_DEV_TYPE_LEN];
|
|
|
|
res = os_snprintf(pos, end - pos, "sec_dev_type=%s\n",
|
|
|
|
wps_dev_type_bin2str(t, devtype,
|
|
|
|
sizeof(devtype)));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, res))
|
2012-10-25 02:16:27 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += res;
|
|
|
|
}
|
|
|
|
|
2012-02-06 14:54:36 -05:00
|
|
|
ssid = wpas_p2p_get_persistent(wpa_s, info->p2p_device_addr, NULL, 0);
|
2011-12-22 14:45:20 -05:00
|
|
|
if (ssid) {
|
|
|
|
res = os_snprintf(pos, end - pos, "persistent=%d\n", ssid->id);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, res))
|
2011-12-22 14:45:20 -05:00
|
|
|
return pos - buf;
|
|
|
|
pos += res;
|
|
|
|
}
|
|
|
|
|
2011-12-22 14:26:31 -05:00
|
|
|
res = p2p_get_peer_info_txt(info, pos, end - pos);
|
|
|
|
if (res < 0)
|
2011-12-22 14:45:20 -05:00
|
|
|
return pos - buf;
|
2011-12-22 14:26:31 -05:00
|
|
|
pos += res;
|
|
|
|
|
2014-07-04 13:14:19 -04:00
|
|
|
if (info->vendor_elems) {
|
|
|
|
res = os_snprintf(pos, end - pos, "vendor_elems=");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, res))
|
2014-07-04 13:14:19 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += res;
|
|
|
|
|
|
|
|
pos += wpa_snprintf_hex(pos, end - pos,
|
|
|
|
wpabuf_head(info->vendor_elems),
|
|
|
|
wpabuf_len(info->vendor_elems));
|
|
|
|
|
|
|
|
res = os_snprintf(pos, end - pos, "\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, res))
|
2014-07-04 13:14:19 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += res;
|
|
|
|
}
|
|
|
|
|
2011-12-22 14:26:31 -05:00
|
|
|
return pos - buf;
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-02-17 15:57:13 -05:00
|
|
|
static int p2p_ctrl_disallow_freq(struct wpa_supplicant *wpa_s,
|
|
|
|
const char *param)
|
|
|
|
{
|
2013-10-22 12:10:56 -04:00
|
|
|
unsigned int i;
|
2012-02-17 15:57:13 -05:00
|
|
|
|
|
|
|
if (wpa_s->global->p2p == NULL)
|
|
|
|
return -1;
|
|
|
|
|
2013-10-22 12:10:56 -04:00
|
|
|
if (freq_range_list_parse(&wpa_s->global->p2p_disallow_freq, param) < 0)
|
|
|
|
return -1;
|
2012-02-17 15:57:13 -05:00
|
|
|
|
2013-10-22 12:10:56 -04:00
|
|
|
for (i = 0; i < wpa_s->global->p2p_disallow_freq.num; i++) {
|
|
|
|
struct wpa_freq_range *freq;
|
|
|
|
freq = &wpa_s->global->p2p_disallow_freq.range[i];
|
2012-02-17 15:57:13 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "P2P: Disallowed frequency range %u-%u",
|
2013-10-22 12:10:56 -04:00
|
|
|
freq->min, freq->max);
|
2012-02-17 15:57:13 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
wpas_p2p_update_channel_list(wpa_s);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
static int p2p_ctrl_set(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *param;
|
|
|
|
|
|
|
|
if (wpa_s->global->p2p == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
param = os_strchr(cmd, ' ');
|
|
|
|
if (param == NULL)
|
|
|
|
return -1;
|
|
|
|
*param++ = '\0';
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "discoverability") == 0) {
|
|
|
|
p2p_set_client_discoverability(wpa_s->global->p2p,
|
|
|
|
atoi(param));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "managed") == 0) {
|
|
|
|
p2p_set_managed_oper(wpa_s->global->p2p, atoi(param));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "listen_channel") == 0) {
|
|
|
|
return p2p_set_listen_channel(wpa_s->global->p2p, 81,
|
2014-05-19 03:05:39 -04:00
|
|
|
atoi(param), 1);
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "ssid_postfix") == 0) {
|
|
|
|
return p2p_set_ssid_postfix(wpa_s->global->p2p, (u8 *) param,
|
|
|
|
os_strlen(param));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "noa") == 0) {
|
|
|
|
char *pos;
|
|
|
|
int count, start, duration;
|
|
|
|
/* GO NoA parameters: count,start_offset(ms),duration(ms) */
|
|
|
|
count = atoi(param);
|
|
|
|
pos = os_strchr(param, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
start = atoi(pos);
|
|
|
|
pos = os_strchr(pos, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
duration = atoi(pos);
|
|
|
|
if (count < 0 || count > 255 || start < 0 || duration < 0)
|
|
|
|
return -1;
|
|
|
|
if (count == 0 && duration > 0)
|
|
|
|
return -1;
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: P2P_SET GO NoA: count=%d "
|
|
|
|
"start=%d duration=%d", count, start, duration);
|
2010-07-08 20:14:24 -04:00
|
|
|
return wpas_p2p_set_noa(wpa_s, count, start, duration);
|
2010-07-18 17:30:25 -04:00
|
|
|
}
|
|
|
|
|
2010-06-24 02:04:21 -04:00
|
|
|
if (os_strcmp(cmd, "ps") == 0)
|
|
|
|
return wpa_drv_set_p2p_powersave(wpa_s, atoi(param), -1, -1);
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "oppps") == 0)
|
|
|
|
return wpa_drv_set_p2p_powersave(wpa_s, -1, atoi(param), -1);
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "ctwindow") == 0)
|
|
|
|
return wpa_drv_set_p2p_powersave(wpa_s, -1, -1, atoi(param));
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
if (os_strcmp(cmd, "disabled") == 0) {
|
|
|
|
wpa_s->global->p2p_disabled = atoi(param);
|
|
|
|
wpa_printf(MSG_DEBUG, "P2P functionality %s",
|
|
|
|
wpa_s->global->p2p_disabled ?
|
|
|
|
"disabled" : "enabled");
|
|
|
|
if (wpa_s->global->p2p_disabled) {
|
|
|
|
wpas_p2p_stop_find(wpa_s);
|
2010-06-27 03:11:42 -04:00
|
|
|
os_memset(wpa_s->p2p_auth_invite, 0, ETH_ALEN);
|
2010-07-18 17:30:25 -04:00
|
|
|
p2p_flush(wpa_s->global->p2p);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-06-10 13:53:09 -04:00
|
|
|
if (os_strcmp(cmd, "conc_pref") == 0) {
|
|
|
|
if (os_strcmp(param, "sta") == 0)
|
|
|
|
wpa_s->global->conc_pref = WPA_CONC_PREF_STA;
|
|
|
|
else if (os_strcmp(param, "p2p") == 0)
|
|
|
|
wpa_s->global->conc_pref = WPA_CONC_PREF_P2P;
|
|
|
|
else {
|
|
|
|
wpa_printf(MSG_INFO, "Invalid conc_pref value");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
wpa_printf(MSG_DEBUG, "Single channel concurrency preference: "
|
|
|
|
"%s", param);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-06-28 23:44:01 -04:00
|
|
|
if (os_strcmp(cmd, "force_long_sd") == 0) {
|
|
|
|
wpa_s->force_long_sd = atoi(param);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-06-29 01:11:39 -04:00
|
|
|
if (os_strcmp(cmd, "peer_filter") == 0) {
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
if (hwaddr_aton(param, addr))
|
|
|
|
return -1;
|
|
|
|
p2p_set_peer_filter(wpa_s->global->p2p, addr);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-07-10 13:19:34 -04:00
|
|
|
if (os_strcmp(cmd, "cross_connect") == 0)
|
|
|
|
return wpas_p2p_set_cross_connect(wpa_s, atoi(param));
|
|
|
|
|
2010-07-28 13:18:52 -04:00
|
|
|
if (os_strcmp(cmd, "go_apsd") == 0) {
|
|
|
|
if (os_strcmp(param, "disable") == 0)
|
|
|
|
wpa_s->set_ap_uapsd = 0;
|
|
|
|
else {
|
|
|
|
wpa_s->set_ap_uapsd = 1;
|
|
|
|
wpa_s->ap_uapsd = atoi(param);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "client_apsd") == 0) {
|
|
|
|
if (os_strcmp(param, "disable") == 0)
|
|
|
|
wpa_s->set_sta_uapsd = 0;
|
|
|
|
else {
|
|
|
|
int be, bk, vi, vo;
|
|
|
|
char *pos;
|
|
|
|
/* format: BE,BK,VI,VO;max SP Length */
|
|
|
|
be = atoi(param);
|
|
|
|
pos = os_strchr(param, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
bk = atoi(pos);
|
|
|
|
pos = os_strchr(pos, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
vi = atoi(pos);
|
|
|
|
pos = os_strchr(pos, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
vo = atoi(pos);
|
|
|
|
/* ignore max SP Length for now */
|
|
|
|
|
|
|
|
wpa_s->set_sta_uapsd = 1;
|
|
|
|
wpa_s->sta_uapsd = 0;
|
|
|
|
if (be)
|
|
|
|
wpa_s->sta_uapsd |= BIT(0);
|
|
|
|
if (bk)
|
|
|
|
wpa_s->sta_uapsd |= BIT(1);
|
|
|
|
if (vi)
|
|
|
|
wpa_s->sta_uapsd |= BIT(2);
|
|
|
|
if (vo)
|
|
|
|
wpa_s->sta_uapsd |= BIT(3);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-02-17 15:57:13 -05:00
|
|
|
if (os_strcmp(cmd, "disallow_freq") == 0)
|
|
|
|
return p2p_ctrl_disallow_freq(wpa_s, param);
|
|
|
|
|
2012-10-30 09:12:04 -04:00
|
|
|
if (os_strcmp(cmd, "disc_int") == 0) {
|
|
|
|
int min_disc_int, max_disc_int, max_disc_tu;
|
|
|
|
char *pos;
|
|
|
|
|
|
|
|
pos = param;
|
|
|
|
|
|
|
|
min_disc_int = atoi(pos);
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
max_disc_int = atoi(pos);
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
|
|
|
|
max_disc_tu = atoi(pos);
|
|
|
|
|
|
|
|
return p2p_set_disc_int(wpa_s->global->p2p, min_disc_int,
|
|
|
|
max_disc_int, max_disc_tu);
|
|
|
|
}
|
|
|
|
|
2013-09-01 03:08:30 -04:00
|
|
|
if (os_strcmp(cmd, "per_sta_psk") == 0) {
|
|
|
|
wpa_s->global->p2p_per_sta_psk = !!atoi(param);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-04-27 10:50:50 -04:00
|
|
|
#ifdef CONFIG_WPS_NFC
|
|
|
|
if (os_strcmp(cmd, "nfc_tag") == 0)
|
|
|
|
return wpas_p2p_nfc_tag_enabled(wpa_s, !!atoi(param));
|
|
|
|
#endif /* CONFIG_WPS_NFC */
|
|
|
|
|
2013-04-04 12:09:10 -04:00
|
|
|
if (os_strcmp(cmd, "disable_ip_addr_req") == 0) {
|
|
|
|
wpa_s->p2p_disable_ip_addr_req = !!atoi(param);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: Unknown P2P_SET field value '%s'",
|
|
|
|
cmd);
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-03-31 13:31:07 -04:00
|
|
|
static void p2p_ctrl_flush(struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
os_memset(wpa_s->p2p_auth_invite, 0, ETH_ALEN);
|
|
|
|
wpa_s->force_long_sd = 0;
|
2014-10-30 11:21:52 -04:00
|
|
|
wpas_p2p_stop_find(wpa_s);
|
2013-03-31 13:31:07 -04:00
|
|
|
if (wpa_s->global->p2p)
|
|
|
|
p2p_flush(wpa_s->global->p2p);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
static int p2p_ctrl_presence_req(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos, *pos2;
|
|
|
|
unsigned int dur1 = 0, int1 = 0, dur2 = 0, int2 = 0;
|
|
|
|
|
|
|
|
if (cmd[0]) {
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
dur1 = atoi(cmd);
|
|
|
|
|
|
|
|
pos2 = os_strchr(pos, ' ');
|
|
|
|
if (pos2)
|
|
|
|
*pos2++ = '\0';
|
|
|
|
int1 = atoi(pos);
|
|
|
|
} else
|
|
|
|
pos2 = NULL;
|
|
|
|
|
|
|
|
if (pos2) {
|
|
|
|
pos = os_strchr(pos2, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
dur2 = atoi(pos2);
|
|
|
|
int2 = atoi(pos);
|
|
|
|
}
|
|
|
|
|
|
|
|
return wpas_p2p_presence_req(wpa_s, dur1, int1, dur2, int2);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int p2p_ctrl_ext_listen(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
unsigned int period = 0, interval = 0;
|
|
|
|
|
|
|
|
if (cmd[0]) {
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
*pos++ = '\0';
|
|
|
|
period = atoi(cmd);
|
|
|
|
interval = atoi(pos);
|
|
|
|
}
|
|
|
|
|
|
|
|
return wpas_p2p_ext_listen(wpa_s, period, interval);
|
|
|
|
}
|
|
|
|
|
2013-09-01 10:37:22 -04:00
|
|
|
|
|
|
|
static int p2p_ctrl_remove_client(struct wpa_supplicant *wpa_s, const char *cmd)
|
|
|
|
{
|
|
|
|
const char *pos;
|
|
|
|
u8 peer[ETH_ALEN];
|
|
|
|
int iface_addr = 0;
|
|
|
|
|
|
|
|
pos = cmd;
|
|
|
|
if (os_strncmp(pos, "iface=", 6) == 0) {
|
|
|
|
iface_addr = 1;
|
|
|
|
pos += 6;
|
|
|
|
}
|
|
|
|
if (hwaddr_aton(pos, peer))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
wpas_p2p_remove_client(wpa_s, peer, iface_addr);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-07-18 17:30:25 -04:00
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
|
|
|
|
|
2014-01-05 05:25:13 -05:00
|
|
|
static int * freq_range_to_channel_list(struct wpa_supplicant *wpa_s, char *val)
|
|
|
|
{
|
|
|
|
struct wpa_freq_range_list ranges;
|
|
|
|
int *freqs = NULL;
|
|
|
|
struct hostapd_hw_modes *mode;
|
|
|
|
u16 i;
|
|
|
|
|
|
|
|
if (wpa_s->hw.modes == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
os_memset(&ranges, 0, sizeof(ranges));
|
|
|
|
if (freq_range_list_parse(&ranges, val) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < wpa_s->hw.num_modes; i++) {
|
|
|
|
int j;
|
|
|
|
|
|
|
|
mode = &wpa_s->hw.modes[i];
|
|
|
|
for (j = 0; j < mode->num_channels; j++) {
|
|
|
|
unsigned int freq;
|
|
|
|
|
|
|
|
if (mode->channels[j].flag & HOSTAPD_CHAN_DISABLED)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
freq = mode->channels[j].freq;
|
|
|
|
if (!freq_range_list_includes(&ranges, freq))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
int_array_add_unique(&freqs, freq);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
os_free(ranges.range);
|
|
|
|
return freqs;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-10-16 15:44:28 -04:00
|
|
|
#ifdef CONFIG_INTERWORKING
|
2014-01-05 05:25:13 -05:00
|
|
|
|
|
|
|
static int ctrl_interworking_select(struct wpa_supplicant *wpa_s, char *param)
|
|
|
|
{
|
|
|
|
int auto_sel = 0;
|
|
|
|
int *freqs = NULL;
|
|
|
|
|
|
|
|
if (param) {
|
|
|
|
char *pos;
|
|
|
|
|
|
|
|
auto_sel = os_strstr(param, "auto") != NULL;
|
|
|
|
|
|
|
|
pos = os_strstr(param, "freq=");
|
|
|
|
if (pos) {
|
|
|
|
freqs = freq_range_to_channel_list(wpa_s, pos + 5);
|
|
|
|
if (freqs == NULL)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return interworking_select(wpa_s, auto_sel, freqs);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-10-04 15:13:22 -04:00
|
|
|
static int ctrl_interworking_connect(struct wpa_supplicant *wpa_s, char *dst)
|
|
|
|
{
|
|
|
|
u8 bssid[ETH_ALEN];
|
|
|
|
struct wpa_bss *bss;
|
|
|
|
|
|
|
|
if (hwaddr_aton(dst, bssid)) {
|
|
|
|
wpa_printf(MSG_DEBUG, "Invalid BSSID '%s'", dst);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
bss = wpa_bss_get_bssid(wpa_s, bssid);
|
|
|
|
if (bss == NULL) {
|
|
|
|
wpa_printf(MSG_DEBUG, "Could not find BSS " MACSTR,
|
|
|
|
MAC2STR(bssid));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2015-01-15 05:24:18 -05:00
|
|
|
if (bss->ssid_len == 0) {
|
|
|
|
int found = 0;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "Selected BSS entry for " MACSTR
|
|
|
|
" does not have SSID information", MAC2STR(bssid));
|
|
|
|
|
|
|
|
dl_list_for_each_reverse(bss, &wpa_s->bss, struct wpa_bss,
|
|
|
|
list) {
|
|
|
|
if (os_memcmp(bss->bssid, bssid, ETH_ALEN) == 0 &&
|
|
|
|
bss->ssid_len > 0) {
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!found)
|
|
|
|
return -1;
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"Found another matching BSS entry with SSID");
|
|
|
|
}
|
|
|
|
|
2011-10-04 15:13:22 -04:00
|
|
|
return interworking_connect(wpa_s, bss);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-10-16 15:44:28 -04:00
|
|
|
static int get_anqp(struct wpa_supplicant *wpa_s, char *dst)
|
|
|
|
{
|
|
|
|
u8 dst_addr[ETH_ALEN];
|
|
|
|
int used;
|
|
|
|
char *pos;
|
|
|
|
#define MAX_ANQP_INFO_ID 100
|
|
|
|
u16 id[MAX_ANQP_INFO_ID];
|
|
|
|
size_t num_id = 0;
|
2014-03-24 20:36:13 -04:00
|
|
|
u32 subtypes = 0;
|
2011-10-16 15:44:28 -04:00
|
|
|
|
|
|
|
used = hwaddr_aton2(dst, dst_addr);
|
|
|
|
if (used < 0)
|
|
|
|
return -1;
|
|
|
|
pos = dst + used;
|
2014-12-10 18:41:48 -05:00
|
|
|
if (*pos == ' ')
|
|
|
|
pos++;
|
2011-10-16 15:44:28 -04:00
|
|
|
while (num_id < MAX_ANQP_INFO_ID) {
|
2014-03-24 20:36:13 -04:00
|
|
|
if (os_strncmp(pos, "hs20:", 5) == 0) {
|
|
|
|
#ifdef CONFIG_HS20
|
|
|
|
int num = atoi(pos + 5);
|
|
|
|
if (num <= 0 || num > 31)
|
|
|
|
return -1;
|
|
|
|
subtypes |= BIT(num);
|
|
|
|
#else /* CONFIG_HS20 */
|
|
|
|
return -1;
|
|
|
|
#endif /* CONFIG_HS20 */
|
|
|
|
} else {
|
|
|
|
id[num_id] = atoi(pos);
|
|
|
|
if (id[num_id])
|
|
|
|
num_id++;
|
|
|
|
}
|
2011-10-16 15:44:28 -04:00
|
|
|
pos = os_strchr(pos + 1, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
break;
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (num_id == 0)
|
|
|
|
return -1;
|
|
|
|
|
2014-03-24 20:36:13 -04:00
|
|
|
return anqp_send_req(wpa_s, dst_addr, id, num_id, subtypes);
|
2011-10-16 15:44:28 -04:00
|
|
|
}
|
2012-08-27 11:13:10 -04:00
|
|
|
|
|
|
|
|
|
|
|
static int gas_request(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
u8 dst_addr[ETH_ALEN];
|
|
|
|
struct wpabuf *advproto, *query = NULL;
|
|
|
|
int used, ret = -1;
|
|
|
|
char *pos, *end;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
used = hwaddr_aton2(cmd, dst_addr);
|
|
|
|
if (used < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = cmd + used;
|
|
|
|
while (*pos == ' ')
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
/* Advertisement Protocol ID */
|
|
|
|
end = os_strchr(pos, ' ');
|
|
|
|
if (end)
|
|
|
|
len = end - pos;
|
|
|
|
else
|
|
|
|
len = os_strlen(pos);
|
|
|
|
if (len & 0x01)
|
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
if (len == 0)
|
|
|
|
return -1;
|
|
|
|
advproto = wpabuf_alloc(len);
|
|
|
|
if (advproto == NULL)
|
|
|
|
return -1;
|
|
|
|
if (hexstr2bin(pos, wpabuf_put(advproto, len), len) < 0)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
if (end) {
|
|
|
|
/* Optional Query Request */
|
|
|
|
pos = end + 1;
|
|
|
|
while (*pos == ' ')
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
len = os_strlen(pos);
|
|
|
|
if (len) {
|
|
|
|
if (len & 0x01)
|
|
|
|
goto fail;
|
|
|
|
len /= 2;
|
|
|
|
if (len == 0)
|
|
|
|
goto fail;
|
|
|
|
query = wpabuf_alloc(len);
|
|
|
|
if (query == NULL)
|
|
|
|
goto fail;
|
|
|
|
if (hexstr2bin(pos, wpabuf_put(query, len), len) < 0)
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = gas_send_request(wpa_s, dst_addr, advproto, query);
|
|
|
|
|
|
|
|
fail:
|
|
|
|
wpabuf_free(advproto);
|
|
|
|
wpabuf_free(query);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int gas_response_get(struct wpa_supplicant *wpa_s, char *cmd, char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
int dialog_token;
|
|
|
|
int used;
|
|
|
|
char *pos;
|
|
|
|
size_t resp_len, start, requested_len;
|
2014-01-06 00:53:37 -05:00
|
|
|
struct wpabuf *resp;
|
|
|
|
int ret;
|
2012-08-27 11:13:10 -04:00
|
|
|
|
|
|
|
used = hwaddr_aton2(cmd, addr);
|
|
|
|
if (used < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = cmd + used;
|
|
|
|
while (*pos == ' ')
|
|
|
|
pos++;
|
|
|
|
dialog_token = atoi(pos);
|
|
|
|
|
2014-01-06 00:53:37 -05:00
|
|
|
if (wpa_s->last_gas_resp &&
|
|
|
|
os_memcmp(addr, wpa_s->last_gas_addr, ETH_ALEN) == 0 &&
|
|
|
|
dialog_token == wpa_s->last_gas_dialog_token)
|
|
|
|
resp = wpa_s->last_gas_resp;
|
|
|
|
else if (wpa_s->prev_gas_resp &&
|
|
|
|
os_memcmp(addr, wpa_s->prev_gas_addr, ETH_ALEN) == 0 &&
|
|
|
|
dialog_token == wpa_s->prev_gas_dialog_token)
|
|
|
|
resp = wpa_s->prev_gas_resp;
|
|
|
|
else
|
2012-08-27 11:13:10 -04:00
|
|
|
return -1;
|
|
|
|
|
2014-01-06 00:53:37 -05:00
|
|
|
resp_len = wpabuf_len(resp);
|
2012-08-27 11:13:10 -04:00
|
|
|
start = 0;
|
|
|
|
requested_len = resp_len;
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos) {
|
|
|
|
start = atoi(pos);
|
|
|
|
if (start > resp_len)
|
|
|
|
return os_snprintf(buf, buflen, "FAIL-Invalid range");
|
|
|
|
pos = os_strchr(pos, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
requested_len = atoi(pos);
|
|
|
|
if (start + requested_len > resp_len)
|
|
|
|
return os_snprintf(buf, buflen, "FAIL-Invalid range");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (requested_len * 2 + 1 > buflen)
|
|
|
|
return os_snprintf(buf, buflen, "FAIL-Too long response");
|
|
|
|
|
2014-01-06 00:53:37 -05:00
|
|
|
ret = wpa_snprintf_hex(buf, buflen, wpabuf_head_u8(resp) + start,
|
|
|
|
requested_len);
|
|
|
|
|
|
|
|
if (start + requested_len == resp_len) {
|
|
|
|
/*
|
|
|
|
* Free memory by dropping the response after it has been
|
|
|
|
* fetched.
|
|
|
|
*/
|
|
|
|
if (resp == wpa_s->prev_gas_resp) {
|
|
|
|
wpabuf_free(wpa_s->prev_gas_resp);
|
|
|
|
wpa_s->prev_gas_resp = NULL;
|
|
|
|
} else {
|
|
|
|
wpabuf_free(wpa_s->last_gas_resp);
|
|
|
|
wpa_s->last_gas_resp = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
2012-08-27 11:13:10 -04:00
|
|
|
}
|
2011-10-16 15:44:28 -04:00
|
|
|
#endif /* CONFIG_INTERWORKING */
|
|
|
|
|
|
|
|
|
2011-09-08 13:52:23 -04:00
|
|
|
#ifdef CONFIG_HS20
|
|
|
|
|
|
|
|
static int get_hs20_anqp(struct wpa_supplicant *wpa_s, char *dst)
|
|
|
|
{
|
|
|
|
u8 dst_addr[ETH_ALEN];
|
|
|
|
int used;
|
|
|
|
char *pos;
|
|
|
|
u32 subtypes = 0;
|
|
|
|
|
|
|
|
used = hwaddr_aton2(dst, dst_addr);
|
|
|
|
if (used < 0)
|
|
|
|
return -1;
|
|
|
|
pos = dst + used;
|
2014-12-10 18:41:48 -05:00
|
|
|
if (*pos == ' ')
|
|
|
|
pos++;
|
2011-09-08 13:52:23 -04:00
|
|
|
for (;;) {
|
|
|
|
int num = atoi(pos);
|
|
|
|
if (num <= 0 || num > 31)
|
|
|
|
return -1;
|
|
|
|
subtypes |= BIT(num);
|
|
|
|
pos = os_strchr(pos + 1, ',');
|
|
|
|
if (pos == NULL)
|
|
|
|
break;
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (subtypes == 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return hs20_anqp_send_req(wpa_s, dst_addr, subtypes, NULL, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int hs20_nai_home_realm_list(struct wpa_supplicant *wpa_s,
|
|
|
|
const u8 *addr, const char *realm)
|
|
|
|
{
|
|
|
|
u8 *buf;
|
|
|
|
size_t rlen, len;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
rlen = os_strlen(realm);
|
|
|
|
len = 3 + rlen;
|
|
|
|
buf = os_malloc(len);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
buf[0] = 1; /* NAI Home Realm Count */
|
|
|
|
buf[1] = 0; /* Formatted in accordance with RFC 4282 */
|
|
|
|
buf[2] = rlen;
|
|
|
|
os_memcpy(buf + 3, realm, rlen);
|
|
|
|
|
|
|
|
ret = hs20_anqp_send_req(wpa_s, addr,
|
|
|
|
BIT(HS20_STYPE_NAI_HOME_REALM_QUERY),
|
|
|
|
buf, len);
|
|
|
|
|
|
|
|
os_free(buf);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int hs20_get_nai_home_realm_list(struct wpa_supplicant *wpa_s,
|
|
|
|
char *dst)
|
|
|
|
{
|
|
|
|
struct wpa_cred *cred = wpa_s->conf->cred;
|
|
|
|
u8 dst_addr[ETH_ALEN];
|
|
|
|
int used;
|
|
|
|
u8 *buf;
|
|
|
|
size_t len;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
used = hwaddr_aton2(dst, dst_addr);
|
|
|
|
if (used < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
while (dst[used] == ' ')
|
|
|
|
used++;
|
|
|
|
if (os_strncmp(dst + used, "realm=", 6) == 0)
|
|
|
|
return hs20_nai_home_realm_list(wpa_s, dst_addr,
|
|
|
|
dst + used + 6);
|
|
|
|
|
|
|
|
len = os_strlen(dst + used);
|
|
|
|
|
|
|
|
if (len == 0 && cred && cred->realm)
|
|
|
|
return hs20_nai_home_realm_list(wpa_s, dst_addr, cred->realm);
|
|
|
|
|
2014-06-12 11:38:31 -04:00
|
|
|
if (len & 1)
|
2011-09-08 13:52:23 -04:00
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
buf = os_malloc(len);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
if (hexstr2bin(dst + used, buf, len) < 0) {
|
|
|
|
os_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = hs20_anqp_send_req(wpa_s, dst_addr,
|
|
|
|
BIT(HS20_STYPE_NAI_HOME_REALM_QUERY),
|
|
|
|
buf, len);
|
|
|
|
os_free(buf);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-12-20 14:15:05 -05:00
|
|
|
|
|
|
|
static int hs20_icon_request(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
u8 dst_addr[ETH_ALEN];
|
|
|
|
int used;
|
|
|
|
char *icon;
|
|
|
|
|
|
|
|
used = hwaddr_aton2(cmd, dst_addr);
|
|
|
|
if (used < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
while (cmd[used] == ' ')
|
|
|
|
used++;
|
|
|
|
icon = &cmd[used];
|
|
|
|
|
2013-01-25 17:10:41 -05:00
|
|
|
wpa_s->fetch_osu_icon_in_progress = 0;
|
2012-12-20 14:15:05 -05:00
|
|
|
return hs20_anqp_send_req(wpa_s, dst_addr, BIT(HS20_STYPE_ICON_REQUEST),
|
|
|
|
(u8 *) icon, os_strlen(icon));
|
|
|
|
}
|
|
|
|
|
2011-09-08 13:52:23 -04:00
|
|
|
#endif /* CONFIG_HS20 */
|
|
|
|
|
|
|
|
|
2012-06-26 12:09:47 -04:00
|
|
|
#ifdef CONFIG_AUTOSCAN
|
|
|
|
|
|
|
|
static int wpa_supplicant_ctrl_iface_autoscan(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
enum wpa_states state = wpa_s->wpa_state;
|
|
|
|
char *new_params = NULL;
|
|
|
|
|
|
|
|
if (os_strlen(cmd) > 0) {
|
|
|
|
new_params = os_strdup(cmd);
|
|
|
|
if (new_params == NULL)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_free(wpa_s->conf->autoscan);
|
|
|
|
wpa_s->conf->autoscan = new_params;
|
|
|
|
|
|
|
|
if (wpa_s->conf->autoscan == NULL)
|
|
|
|
autoscan_deinit(wpa_s);
|
|
|
|
else if (state == WPA_DISCONNECTED || state == WPA_INACTIVE)
|
2012-06-26 12:52:46 -04:00
|
|
|
autoscan_init(wpa_s, 1);
|
2012-06-26 13:11:25 -04:00
|
|
|
else if (state == WPA_SCANNING)
|
|
|
|
wpa_supplicant_reinit_autoscan(wpa_s);
|
2012-06-26 12:09:47 -04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* CONFIG_AUTOSCAN */
|
|
|
|
|
|
|
|
|
2012-12-16 05:29:10 -05:00
|
|
|
#ifdef CONFIG_WNM
|
|
|
|
|
|
|
|
static int wpas_ctrl_iface_wnm_sleep(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int enter;
|
|
|
|
int intval = 0;
|
|
|
|
char *pos;
|
2012-12-16 05:31:16 -05:00
|
|
|
int ret;
|
|
|
|
struct wpabuf *tfs_req = NULL;
|
2012-12-16 05:29:10 -05:00
|
|
|
|
|
|
|
if (os_strncmp(cmd, "enter", 5) == 0)
|
|
|
|
enter = 1;
|
|
|
|
else if (os_strncmp(cmd, "exit", 4) == 0)
|
|
|
|
enter = 0;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = os_strstr(cmd, " interval=");
|
|
|
|
if (pos)
|
|
|
|
intval = atoi(pos + 10);
|
|
|
|
|
2012-12-16 05:31:16 -05:00
|
|
|
pos = os_strstr(cmd, " tfs_req=");
|
|
|
|
if (pos) {
|
|
|
|
char *end;
|
|
|
|
size_t len;
|
|
|
|
pos += 9;
|
|
|
|
end = os_strchr(pos, ' ');
|
|
|
|
if (end)
|
|
|
|
len = end - pos;
|
|
|
|
else
|
|
|
|
len = os_strlen(pos);
|
|
|
|
if (len & 1)
|
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
tfs_req = wpabuf_alloc(len);
|
|
|
|
if (tfs_req == NULL)
|
|
|
|
return -1;
|
|
|
|
if (hexstr2bin(pos, wpabuf_put(tfs_req, len), len) < 0) {
|
|
|
|
wpabuf_free(tfs_req);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-16 05:57:38 -05:00
|
|
|
ret = ieee802_11_send_wnmsleep_req(wpa_s, enter ? WNM_SLEEP_MODE_ENTER :
|
|
|
|
WNM_SLEEP_MODE_EXIT, intval,
|
2012-12-16 05:31:16 -05:00
|
|
|
tfs_req);
|
|
|
|
wpabuf_free(tfs_req);
|
|
|
|
|
|
|
|
return ret;
|
2012-12-16 05:29:10 -05:00
|
|
|
}
|
|
|
|
|
2013-05-16 10:50:31 -04:00
|
|
|
|
|
|
|
static int wpas_ctrl_iface_wnm_bss_query(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
int query_reason;
|
|
|
|
|
|
|
|
query_reason = atoi(cmd);
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE: WNM_BSS_QUERY query_reason=%d",
|
|
|
|
query_reason);
|
|
|
|
|
|
|
|
return wnm_send_bss_transition_mgmt_query(wpa_s, query_reason);
|
|
|
|
}
|
|
|
|
|
2012-12-16 05:29:10 -05:00
|
|
|
#endif /* CONFIG_WNM */
|
|
|
|
|
|
|
|
|
2011-04-15 11:52:01 -04:00
|
|
|
static int wpa_supplicant_signal_poll(struct wpa_supplicant *wpa_s, char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
struct wpa_signal_info si;
|
|
|
|
int ret;
|
2013-06-22 04:56:24 -04:00
|
|
|
char *pos, *end;
|
2011-04-15 11:52:01 -04:00
|
|
|
|
|
|
|
ret = wpa_drv_signal_poll(wpa_s, &si);
|
|
|
|
if (ret)
|
|
|
|
return -1;
|
|
|
|
|
2013-06-22 04:56:24 -04:00
|
|
|
pos = buf;
|
|
|
|
end = buf + buflen;
|
|
|
|
|
|
|
|
ret = os_snprintf(pos, end - pos, "RSSI=%d\nLINKSPEED=%d\n"
|
2011-04-15 11:52:01 -04:00
|
|
|
"NOISE=%d\nFREQUENCY=%u\n",
|
|
|
|
si.current_signal, si.current_txrate / 1000,
|
|
|
|
si.current_noise, si.frequency);
|
Check os_snprintf() result more consistently - automatic 2
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the comparison was 'res > size' instead of
'res >= size'. These changes were done automatically with spatch using
the following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 > E3 \| (size_t) E1 > E3 \| E1 > (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:18:39 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2011-04-15 11:52:01 -04:00
|
|
|
return -1;
|
2013-06-22 04:56:24 -04:00
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
if (si.chanwidth != CHAN_WIDTH_UNKNOWN) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "WIDTH=%s\n",
|
2014-09-10 13:34:56 -04:00
|
|
|
channel_width_to_string(si.chanwidth));
|
Check os_snprintf() result more consistently - automatic 2
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the comparison was 'res > size' instead of
'res >= size'. These changes were done automatically with spatch using
the following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 > E3 \| (size_t) E1 > E3 \| E1 > (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:18:39 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-06-22 04:56:24 -04:00
|
|
|
return -1;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (si.center_frq1 > 0 && si.center_frq2 > 0) {
|
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"CENTER_FRQ1=%d\nCENTER_FRQ2=%d\n",
|
|
|
|
si.center_frq1, si.center_frq2);
|
Check os_snprintf() result more consistently - automatic 2
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the comparison was 'res > size' instead of
'res >= size'. These changes were done automatically with spatch using
the following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 > E3 \| (size_t) E1 > E3 \| E1 > (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:18:39 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-06-22 04:56:24 -04:00
|
|
|
return -1;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
2013-06-22 04:59:29 -04:00
|
|
|
if (si.avg_signal) {
|
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"AVG_RSSI=%d\n", si.avg_signal);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-06-22 04:59:29 -04:00
|
|
|
return -1;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
2013-06-22 04:56:24 -04:00
|
|
|
return pos - buf;
|
2011-04-15 11:52:01 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-09-05 10:02:02 -04:00
|
|
|
static int wpa_supplicant_pktcnt_poll(struct wpa_supplicant *wpa_s, char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
struct hostap_sta_driver_data sta;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = wpa_drv_pktcnt_poll(wpa_s, &sta);
|
|
|
|
if (ret)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
ret = os_snprintf(buf, buflen, "TXGOOD=%lu\nTXBAD=%lu\nRXGOOD=%lu\n",
|
|
|
|
sta.tx_packets, sta.tx_retry_failed, sta.rx_packets);
|
Check os_snprintf() result more consistently - automatic 2
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the comparison was 'res > size' instead of
'res >= size'. These changes were done automatically with spatch using
the following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 > E3 \| (size_t) E1 > E3 \| E1 > (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:18:39 -05:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2012-09-05 10:02:02 -04:00
|
|
|
return -1;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-11-07 09:16:15 -05:00
|
|
|
#ifdef ANDROID
|
|
|
|
static int wpa_supplicant_driver_cmd(struct wpa_supplicant *wpa_s, char *cmd,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = wpa_drv_driver_cmd(wpa_s, cmd, buf, buflen);
|
2013-09-12 15:39:30 -04:00
|
|
|
if (ret == 0) {
|
|
|
|
if (os_strncasecmp(cmd, "COUNTRY", 7) == 0) {
|
|
|
|
struct p2p_data *p2p = wpa_s->global->p2p;
|
|
|
|
if (p2p) {
|
|
|
|
char country[3];
|
|
|
|
country[0] = cmd[8];
|
|
|
|
country[1] = cmd[9];
|
|
|
|
country[2] = 0x04;
|
|
|
|
p2p_set_country(p2p, country);
|
|
|
|
}
|
|
|
|
}
|
2013-11-07 09:16:15 -05:00
|
|
|
ret = os_snprintf(buf, buflen, "%s\n", "OK");
|
2014-12-07 08:45:02 -05:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
|
|
|
ret = -1;
|
2013-09-12 15:39:30 -04:00
|
|
|
}
|
2013-11-07 09:16:15 -05:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
#endif /* ANDROID */
|
|
|
|
|
|
|
|
|
2014-03-03 06:09:50 -05:00
|
|
|
static int wpa_supplicant_vendor_cmd(struct wpa_supplicant *wpa_s, char *cmd,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
char *pos;
|
|
|
|
u8 *data = NULL;
|
|
|
|
unsigned int vendor_id, subcmd;
|
|
|
|
struct wpabuf *reply;
|
|
|
|
size_t data_len = 0;
|
|
|
|
|
|
|
|
/* cmd: <vendor id> <subcommand id> [<hex formatted data>] */
|
|
|
|
vendor_id = strtoul(cmd, &pos, 16);
|
|
|
|
if (!isblank(*pos))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
subcmd = strtoul(pos, &pos, 10);
|
|
|
|
|
|
|
|
if (*pos != '\0') {
|
|
|
|
if (!isblank(*pos++))
|
|
|
|
return -EINVAL;
|
|
|
|
data_len = os_strlen(pos);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data_len) {
|
|
|
|
data_len /= 2;
|
|
|
|
data = os_malloc(data_len);
|
|
|
|
if (!data)
|
2014-04-29 11:47:36 -04:00
|
|
|
return -1;
|
2014-03-03 06:09:50 -05:00
|
|
|
|
|
|
|
if (hexstr2bin(pos, data, data_len)) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"Vendor command: wrong parameter format");
|
|
|
|
os_free(data);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
reply = wpabuf_alloc((buflen - 1) / 2);
|
|
|
|
if (!reply) {
|
|
|
|
os_free(data);
|
2014-04-29 11:47:36 -04:00
|
|
|
return -1;
|
2014-03-03 06:09:50 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = wpa_drv_vendor_cmd(wpa_s, vendor_id, subcmd, data, data_len,
|
|
|
|
reply);
|
|
|
|
|
|
|
|
if (ret == 0)
|
|
|
|
ret = wpa_snprintf_hex(buf, buflen, wpabuf_head_u8(reply),
|
|
|
|
wpabuf_len(reply));
|
|
|
|
|
|
|
|
wpabuf_free(reply);
|
|
|
|
os_free(data);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-03-31 13:31:07 -04:00
|
|
|
static void wpa_supplicant_ctrl_iface_flush(struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
2015-01-18 20:44:10 -05:00
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
struct wpa_supplicant *p2p_wpa_s = wpa_s->global->p2p_init_wpa_s ?
|
|
|
|
wpa_s->global->p2p_init_wpa_s : wpa_s;
|
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
|
2013-03-31 13:31:07 -04:00
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG, "Flush all wpa_supplicant state");
|
|
|
|
|
|
|
|
#ifdef CONFIG_P2P
|
2015-01-18 20:44:10 -05:00
|
|
|
wpas_p2p_cancel(p2p_wpa_s);
|
|
|
|
p2p_ctrl_flush(p2p_wpa_s);
|
|
|
|
wpas_p2p_group_remove(p2p_wpa_s, "*");
|
|
|
|
wpas_p2p_service_flush(p2p_wpa_s);
|
|
|
|
p2p_wpa_s->global->p2p_disabled = 0;
|
|
|
|
p2p_wpa_s->global->p2p_per_sta_psk = 0;
|
|
|
|
p2p_wpa_s->conf->num_sec_device_types = 0;
|
|
|
|
p2p_wpa_s->p2p_disable_ip_addr_req = 0;
|
|
|
|
os_free(p2p_wpa_s->global->p2p_go_avoid_freq.range);
|
|
|
|
p2p_wpa_s->global->p2p_go_avoid_freq.range = NULL;
|
2014-12-10 06:29:29 -05:00
|
|
|
p2p_wpa_s->global->pending_p2ps_group = 0;
|
2013-03-31 13:31:07 -04:00
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
|
|
|
|
#ifdef CONFIG_WPS_TESTING
|
|
|
|
wps_version_number = 0x20;
|
|
|
|
wps_testing_dummy_cred = 0;
|
2013-11-28 08:47:19 -05:00
|
|
|
wps_corrupt_pkhash = 0;
|
2013-03-31 13:31:07 -04:00
|
|
|
#endif /* CONFIG_WPS_TESTING */
|
|
|
|
#ifdef CONFIG_WPS
|
2013-12-28 09:31:37 -05:00
|
|
|
wpa_s->wps_fragment_size = 0;
|
2013-03-31 13:31:07 -04:00
|
|
|
wpas_wps_cancel(wpa_s);
|
2014-12-21 10:32:35 -05:00
|
|
|
wps_registrar_flush(wpa_s->wps->registrar);
|
2013-03-31 13:31:07 -04:00
|
|
|
#endif /* CONFIG_WPS */
|
2013-10-20 14:34:39 -04:00
|
|
|
wpa_s->after_wps = 0;
|
2013-10-27 06:56:56 -04:00
|
|
|
wpa_s->known_wps_freq = 0;
|
2013-03-31 13:31:07 -04:00
|
|
|
|
2013-11-28 08:34:24 -05:00
|
|
|
#ifdef CONFIG_TDLS
|
2013-03-31 13:31:07 -04:00
|
|
|
#ifdef CONFIG_TDLS_TESTING
|
|
|
|
extern unsigned int tdls_testing;
|
|
|
|
tdls_testing = 0;
|
|
|
|
#endif /* CONFIG_TDLS_TESTING */
|
|
|
|
wpa_drv_tdls_oper(wpa_s, TDLS_ENABLE, NULL);
|
|
|
|
wpa_tdls_enable(wpa_s->wpa, 1);
|
|
|
|
#endif /* CONFIG_TDLS */
|
|
|
|
|
2013-05-24 09:02:58 -04:00
|
|
|
eloop_cancel_timeout(wpa_supplicant_stop_countermeasures, wpa_s, NULL);
|
|
|
|
wpa_supplicant_stop_countermeasures(wpa_s, NULL);
|
|
|
|
|
2013-03-31 13:31:07 -04:00
|
|
|
wpa_s->no_keep_alive = 0;
|
|
|
|
|
|
|
|
os_free(wpa_s->disallow_aps_bssid);
|
|
|
|
wpa_s->disallow_aps_bssid = NULL;
|
|
|
|
wpa_s->disallow_aps_bssid_count = 0;
|
|
|
|
os_free(wpa_s->disallow_aps_ssid);
|
|
|
|
wpa_s->disallow_aps_ssid = NULL;
|
|
|
|
wpa_s->disallow_aps_ssid_count = 0;
|
|
|
|
|
|
|
|
wpa_s->set_sta_uapsd = 0;
|
|
|
|
wpa_s->sta_uapsd = 0;
|
|
|
|
|
|
|
|
wpa_drv_radio_disable(wpa_s, 0);
|
|
|
|
wpa_blacklist_clear(wpa_s);
|
2013-04-28 15:35:15 -04:00
|
|
|
wpa_s->extra_blacklist_count = 0;
|
2013-03-31 13:31:07 -04:00
|
|
|
wpa_supplicant_ctrl_iface_remove_network(wpa_s, "all");
|
|
|
|
wpa_supplicant_ctrl_iface_remove_cred(wpa_s, "all");
|
2014-01-08 09:14:30 -05:00
|
|
|
wpa_config_flush_blobs(wpa_s->conf);
|
2014-01-23 03:21:49 -05:00
|
|
|
wpa_s->conf->auto_interworking = 0;
|
|
|
|
wpa_s->conf->okc = 0;
|
2013-12-29 12:25:05 -05:00
|
|
|
|
2014-11-27 12:56:15 -05:00
|
|
|
wpa_sm_pmksa_cache_flush(wpa_s->wpa, NULL);
|
|
|
|
rsn_preauth_deinit(wpa_s->wpa);
|
|
|
|
|
2013-12-29 12:25:05 -05:00
|
|
|
wpa_sm_set_param(wpa_s->wpa, RSNA_PMK_LIFETIME, 43200);
|
|
|
|
wpa_sm_set_param(wpa_s->wpa, RSNA_PMK_REAUTH_THRESHOLD, 70);
|
|
|
|
wpa_sm_set_param(wpa_s->wpa, RSNA_SA_TIMEOUT, 60);
|
2013-12-31 05:07:11 -05:00
|
|
|
eapol_sm_notify_logoff(wpa_s->eapol, FALSE);
|
2013-11-24 14:42:17 -05:00
|
|
|
|
2014-02-13 04:24:00 -05:00
|
|
|
radio_remove_works(wpa_s, NULL, 1);
|
2014-12-01 10:49:19 -05:00
|
|
|
wpa_s->ext_work_in_progress = 0;
|
2014-02-25 15:37:57 -05:00
|
|
|
|
|
|
|
wpa_s->next_ssid = NULL;
|
2013-01-25 17:10:41 -05:00
|
|
|
|
|
|
|
#ifdef CONFIG_INTERWORKING
|
|
|
|
hs20_cancel_fetch_osu(wpa_s);
|
|
|
|
#endif /* CONFIG_INTERWORKING */
|
2014-03-08 13:21:21 -05:00
|
|
|
|
|
|
|
wpa_s->ext_mgmt_frame_handling = 0;
|
2014-10-10 11:01:15 -04:00
|
|
|
wpa_s->ext_eapol_frame_io = 0;
|
2014-10-25 14:25:00 -04:00
|
|
|
#ifdef CONFIG_TESTING_OPTIONS
|
|
|
|
wpa_s->extra_roc_dur = 0;
|
2015-01-19 12:34:00 -05:00
|
|
|
wpa_s->test_failure = WPAS_TEST_FAILURE_NONE;
|
2014-10-25 14:25:00 -04:00
|
|
|
#endif /* CONFIG_TESTING_OPTIONS */
|
2014-12-08 09:22:13 -05:00
|
|
|
|
|
|
|
wpa_s->disconnected = 0;
|
2014-12-27 08:37:13 -05:00
|
|
|
os_free(wpa_s->next_scan_freqs);
|
|
|
|
wpa_s->next_scan_freqs = NULL;
|
2015-01-17 08:39:48 -05:00
|
|
|
|
|
|
|
wpa_bss_flush(wpa_s);
|
|
|
|
if (!dl_list_empty(&wpa_s->bss)) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"BSS table not empty after flush: %u entries, current_bss=%p bssid="
|
|
|
|
MACSTR " pending_bssid=" MACSTR,
|
|
|
|
dl_list_len(&wpa_s->bss), wpa_s->current_bss,
|
|
|
|
MAC2STR(wpa_s->bssid),
|
|
|
|
MAC2STR(wpa_s->pending_bssid));
|
|
|
|
}
|
2013-03-31 13:31:07 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-01-04 06:10:41 -05:00
|
|
|
static int wpas_ctrl_radio_work_show(struct wpa_supplicant *wpa_s,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
struct wpa_radio_work *work;
|
|
|
|
char *pos, *end;
|
|
|
|
struct os_reltime now, diff;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = buf + buflen;
|
|
|
|
|
|
|
|
os_get_reltime(&now);
|
|
|
|
|
|
|
|
dl_list_for_each(work, &wpa_s->radio->work, struct wpa_radio_work, list)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
os_reltime_sub(&now, &work->time, &diff);
|
|
|
|
ret = os_snprintf(pos, end - pos, "%s@%s:%u:%u:%ld.%06ld\n",
|
|
|
|
work->type, work->wpa_s->ifname, work->freq,
|
|
|
|
work->started, diff.sec, diff.usec);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-01-04 06:10:41 -05:00
|
|
|
break;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void wpas_ctrl_radio_work_timeout(void *eloop_ctx, void *timeout_ctx)
|
|
|
|
{
|
|
|
|
struct wpa_radio_work *work = eloop_ctx;
|
|
|
|
struct wpa_external_work *ework = work->ctx;
|
|
|
|
|
|
|
|
wpa_dbg(work->wpa_s, MSG_DEBUG,
|
|
|
|
"Timing out external radio work %u (%s)",
|
|
|
|
ework->id, work->type);
|
|
|
|
wpa_msg(work->wpa_s, MSG_INFO, EXT_RADIO_WORK_TIMEOUT "%u", ework->id);
|
2014-12-01 10:49:19 -05:00
|
|
|
work->wpa_s->ext_work_in_progress = 0;
|
2014-01-04 06:10:41 -05:00
|
|
|
radio_work_done(work);
|
2014-05-31 15:58:51 -04:00
|
|
|
os_free(ework);
|
2014-01-04 06:10:41 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void wpas_ctrl_radio_work_cb(struct wpa_radio_work *work, int deinit)
|
|
|
|
{
|
|
|
|
struct wpa_external_work *ework = work->ctx;
|
|
|
|
|
|
|
|
if (deinit) {
|
2014-02-13 04:24:00 -05:00
|
|
|
if (work->started)
|
|
|
|
eloop_cancel_timeout(wpas_ctrl_radio_work_timeout,
|
|
|
|
work, NULL);
|
|
|
|
|
2014-01-04 06:10:41 -05:00
|
|
|
os_free(ework);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_dbg(work->wpa_s, MSG_DEBUG, "Starting external radio work %u (%s)",
|
|
|
|
ework->id, ework->type);
|
|
|
|
wpa_msg(work->wpa_s, MSG_INFO, EXT_RADIO_WORK_START "%u", ework->id);
|
2014-12-01 10:49:19 -05:00
|
|
|
work->wpa_s->ext_work_in_progress = 1;
|
2014-01-04 06:10:41 -05:00
|
|
|
if (!ework->timeout)
|
|
|
|
ework->timeout = 10;
|
|
|
|
eloop_register_timeout(ework->timeout, 0, wpas_ctrl_radio_work_timeout,
|
|
|
|
work, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpas_ctrl_radio_work_add(struct wpa_supplicant *wpa_s, char *cmd,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
struct wpa_external_work *ework;
|
|
|
|
char *pos, *pos2;
|
|
|
|
size_t type_len;
|
|
|
|
int ret;
|
|
|
|
unsigned int freq = 0;
|
|
|
|
|
|
|
|
/* format: <name> [freq=<MHz>] [timeout=<seconds>] */
|
|
|
|
|
|
|
|
ework = os_zalloc(sizeof(*ework));
|
|
|
|
if (ework == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
pos = os_strchr(cmd, ' ');
|
|
|
|
if (pos) {
|
|
|
|
type_len = pos - cmd;
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
pos2 = os_strstr(pos, "freq=");
|
|
|
|
if (pos2)
|
|
|
|
freq = atoi(pos2 + 5);
|
|
|
|
|
|
|
|
pos2 = os_strstr(pos, "timeout=");
|
|
|
|
if (pos2)
|
|
|
|
ework->timeout = atoi(pos2 + 8);
|
|
|
|
} else {
|
|
|
|
type_len = os_strlen(cmd);
|
|
|
|
}
|
|
|
|
if (4 + type_len >= sizeof(ework->type))
|
|
|
|
type_len = sizeof(ework->type) - 4 - 1;
|
|
|
|
os_strlcpy(ework->type, "ext:", sizeof(ework->type));
|
|
|
|
os_memcpy(ework->type + 4, cmd, type_len);
|
|
|
|
ework->type[4 + type_len] = '\0';
|
|
|
|
|
|
|
|
wpa_s->ext_work_id++;
|
|
|
|
if (wpa_s->ext_work_id == 0)
|
|
|
|
wpa_s->ext_work_id++;
|
|
|
|
ework->id = wpa_s->ext_work_id;
|
|
|
|
|
|
|
|
if (radio_add_work(wpa_s, freq, ework->type, 0, wpas_ctrl_radio_work_cb,
|
|
|
|
ework) < 0) {
|
|
|
|
os_free(ework);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = os_snprintf(buf, buflen, "%u", ework->id);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(buflen, ret))
|
2014-01-04 06:10:41 -05:00
|
|
|
return -1;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpas_ctrl_radio_work_done(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
struct wpa_radio_work *work;
|
|
|
|
unsigned int id = atoi(cmd);
|
|
|
|
|
|
|
|
dl_list_for_each(work, &wpa_s->radio->work, struct wpa_radio_work, list)
|
|
|
|
{
|
|
|
|
struct wpa_external_work *ework;
|
|
|
|
|
|
|
|
if (os_strncmp(work->type, "ext:", 4) != 0)
|
|
|
|
continue;
|
|
|
|
ework = work->ctx;
|
|
|
|
if (id && ework->id != id)
|
|
|
|
continue;
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG,
|
|
|
|
"Completed external radio work %u (%s)",
|
|
|
|
ework->id, ework->type);
|
|
|
|
eloop_cancel_timeout(wpas_ctrl_radio_work_timeout, work, NULL);
|
2014-12-01 10:49:19 -05:00
|
|
|
wpa_s->ext_work_in_progress = 0;
|
2014-01-04 06:10:41 -05:00
|
|
|
radio_work_done(work);
|
2014-03-14 14:33:56 -04:00
|
|
|
os_free(ework);
|
2014-01-04 06:10:41 -05:00
|
|
|
return 3; /* "OK\n" */
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpas_ctrl_radio_work(struct wpa_supplicant *wpa_s, char *cmd,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
if (os_strcmp(cmd, "show") == 0)
|
|
|
|
return wpas_ctrl_radio_work_show(wpa_s, buf, buflen);
|
|
|
|
if (os_strncmp(cmd, "add ", 4) == 0)
|
|
|
|
return wpas_ctrl_radio_work_add(wpa_s, cmd + 4, buf, buflen);
|
|
|
|
if (os_strncmp(cmd, "done ", 5) == 0)
|
|
|
|
return wpas_ctrl_radio_work_done(wpa_s, cmd + 4);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void wpas_ctrl_radio_work_flush(struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
struct wpa_radio_work *work, *tmp;
|
|
|
|
|
wpa_supplicant: Fix seg fault in wpas_ctrl_radio_work_flush() in error case
Verify wpa_s->radio pointer before accessing it. If interface addition
fails, this could get called before wpa_s->radio has been set.
The segmentation fault details:
Program received signal SIGSEGV, Segmentation fault.
0x00000000004b9591 in wpas_ctrl_radio_work_flush (wpa_s=0x77fff0) at ctrl_iface.c:5754
5754 dl_list_for_each_safe(work, tmp, &wpa_s->radio->work,
Call stack:
0 wpas_ctrl_radio_work_flush (wpa_s=0x77fff0) at ctrl_iface.c:5754
1 wpa_supplicant_deinit_iface (wpa_s=0x77fff0, notify=0, terminate=0) at wpa_supplicant.c:3619
2 wpa_supplicant_add_iface (global=0x75db10, iface=0x7fffffffe270) at wpa_supplicant.c:3691
3 wpas_p2p_add_p2pdev_interface (wpa_s=0x75dd20) at p2p_supplicant.c:3700
4 main (argc=<optimized out>, argv=<optimized out>) at main.c:317
Function:
5750 void wpas_ctrl_radio_work_flush(struct wpa_supplicant *wpa_s)
5751 {
5752 struct wpa_radio_work *work, *tmp;
5753
5754 dl_list_for_each_safe(work, tmp, &wpa_s->radio->work,
5755 struct wpa_radio_work, list) {
5756 struct wpa_external_work *ework;
5757
5758 if (os_strncmp(work->type, "ext:", 4) != 0)
Root cause:
(gdb) p wpa_s->radio
$1 = (struct wpa_radio *) 0x0
Signed-hostap: Max Stepanov <Max.Stepanov@intel.com>
2014-01-22 09:05:45 -05:00
|
|
|
if (!wpa_s || !wpa_s->radio)
|
|
|
|
return;
|
|
|
|
|
2014-01-04 06:10:41 -05:00
|
|
|
dl_list_for_each_safe(work, tmp, &wpa_s->radio->work,
|
|
|
|
struct wpa_radio_work, list) {
|
|
|
|
struct wpa_external_work *ework;
|
|
|
|
|
|
|
|
if (os_strncmp(work->type, "ext:", 4) != 0)
|
|
|
|
continue;
|
|
|
|
ework = work->ctx;
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG,
|
2014-04-12 09:41:45 -04:00
|
|
|
"Flushing%s external radio work %u (%s)",
|
2014-01-04 06:10:41 -05:00
|
|
|
work->started ? " started" : "", ework->id,
|
|
|
|
ework->type);
|
|
|
|
if (work->started)
|
|
|
|
eloop_cancel_timeout(wpas_ctrl_radio_work_timeout,
|
|
|
|
work, NULL);
|
|
|
|
radio_work_done(work);
|
2014-05-31 15:58:51 -04:00
|
|
|
os_free(ework);
|
2014-01-04 06:10:41 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-10-19 09:26:01 -04:00
|
|
|
static void wpas_ctrl_eapol_response(void *eloop_ctx, void *timeout_ctx)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s = eloop_ctx;
|
|
|
|
eapol_sm_notify_ctrl_response(wpa_s->eapol);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-12-11 18:12:15 -05:00
|
|
|
static int scan_id_list_parse(struct wpa_supplicant *wpa_s, const char *value,
|
|
|
|
unsigned int *scan_id_count, int scan_id[])
|
2014-07-01 11:22:56 -04:00
|
|
|
{
|
|
|
|
const char *pos = value;
|
|
|
|
|
|
|
|
while (pos) {
|
|
|
|
if (*pos == ' ' || *pos == '\0')
|
|
|
|
break;
|
2014-12-11 18:12:15 -05:00
|
|
|
if (*scan_id_count == MAX_SCAN_ID)
|
2014-07-01 11:22:56 -04:00
|
|
|
return -1;
|
2014-12-11 18:12:15 -05:00
|
|
|
scan_id[(*scan_id_count)++] = atoi(pos);
|
2014-07-01 11:22:56 -04:00
|
|
|
pos = os_strchr(pos, ',');
|
|
|
|
if (pos)
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-12-25 13:04:52 -05:00
|
|
|
static void wpas_ctrl_scan(struct wpa_supplicant *wpa_s, char *params,
|
|
|
|
char *reply, int reply_size, int *reply_len)
|
|
|
|
{
|
|
|
|
char *pos;
|
2014-12-11 18:12:15 -05:00
|
|
|
unsigned int manual_scan_passive = 0;
|
|
|
|
unsigned int manual_scan_use_id = 0;
|
|
|
|
unsigned int manual_scan_only_new = 0;
|
|
|
|
unsigned int scan_only = 0;
|
|
|
|
unsigned int scan_id_count = 0;
|
|
|
|
int scan_id[MAX_SCAN_ID];
|
|
|
|
void (*scan_res_handler)(struct wpa_supplicant *wpa_s,
|
|
|
|
struct wpa_scan_results *scan_res);
|
|
|
|
int *manual_scan_freqs = NULL;
|
2013-12-25 13:04:52 -05:00
|
|
|
|
|
|
|
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) {
|
|
|
|
*reply_len = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-12-12 05:11:14 -05:00
|
|
|
if (radio_work_pending(wpa_s, "scan")) {
|
|
|
|
wpa_printf(MSG_DEBUG,
|
|
|
|
"Pending scan scheduled - reject new request");
|
|
|
|
*reply_len = os_snprintf(reply, reply_size, "FAIL-BUSY\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-12-25 13:04:52 -05:00
|
|
|
if (params) {
|
|
|
|
if (os_strncasecmp(params, "TYPE=ONLY", 9) == 0)
|
2014-12-11 18:12:15 -05:00
|
|
|
scan_only = 1;
|
2013-12-25 13:04:52 -05:00
|
|
|
|
|
|
|
pos = os_strstr(params, "freq=");
|
2014-12-11 18:12:15 -05:00
|
|
|
if (pos) {
|
|
|
|
manual_scan_freqs = freq_range_to_channel_list(wpa_s,
|
|
|
|
pos + 5);
|
|
|
|
if (manual_scan_freqs == NULL) {
|
|
|
|
*reply_len = -1;
|
|
|
|
goto done;
|
|
|
|
}
|
2013-12-25 13:04:52 -05:00
|
|
|
}
|
2013-12-26 09:52:55 -05:00
|
|
|
|
|
|
|
pos = os_strstr(params, "passive=");
|
|
|
|
if (pos)
|
2014-12-11 18:12:15 -05:00
|
|
|
manual_scan_passive = !!atoi(pos + 8);
|
2013-12-26 10:35:48 -05:00
|
|
|
|
|
|
|
pos = os_strstr(params, "use_id=");
|
|
|
|
if (pos)
|
2014-12-11 18:12:15 -05:00
|
|
|
manual_scan_use_id = atoi(pos + 7);
|
2014-01-02 16:03:31 -05:00
|
|
|
|
|
|
|
pos = os_strstr(params, "only_new=1");
|
|
|
|
if (pos)
|
2014-12-11 18:12:15 -05:00
|
|
|
manual_scan_only_new = 1;
|
2014-07-01 11:22:56 -04:00
|
|
|
|
|
|
|
pos = os_strstr(params, "scan_id=");
|
2014-12-11 18:12:15 -05:00
|
|
|
if (pos && scan_id_list_parse(wpa_s, pos + 8, &scan_id_count,
|
|
|
|
scan_id) < 0) {
|
2014-07-01 11:22:56 -04:00
|
|
|
*reply_len = -1;
|
2014-12-11 18:12:15 -05:00
|
|
|
goto done;
|
2014-07-01 11:22:56 -04:00
|
|
|
}
|
2013-12-25 13:04:52 -05:00
|
|
|
}
|
|
|
|
|
2014-12-11 18:12:15 -05:00
|
|
|
if (scan_only)
|
|
|
|
scan_res_handler = scan_only_handler;
|
|
|
|
else if (wpa_s->scan_res_handler == scan_only_handler)
|
|
|
|
scan_res_handler = NULL;
|
|
|
|
else
|
|
|
|
scan_res_handler = wpa_s->scan_res_handler;
|
|
|
|
|
2013-12-25 13:04:52 -05:00
|
|
|
if (!wpa_s->sched_scanning && !wpa_s->scanning &&
|
|
|
|
((wpa_s->wpa_state <= WPA_SCANNING) ||
|
|
|
|
(wpa_s->wpa_state == WPA_COMPLETED))) {
|
2014-12-11 18:12:15 -05:00
|
|
|
wpa_s->manual_scan_passive = manual_scan_passive;
|
|
|
|
wpa_s->manual_scan_use_id = manual_scan_use_id;
|
|
|
|
wpa_s->manual_scan_only_new = manual_scan_only_new;
|
|
|
|
wpa_s->scan_id_count = scan_id_count;
|
|
|
|
os_memcpy(wpa_s->scan_id, scan_id, scan_id_count * sizeof(int));
|
|
|
|
wpa_s->scan_res_handler = scan_res_handler;
|
|
|
|
os_free(wpa_s->manual_scan_freqs);
|
|
|
|
wpa_s->manual_scan_freqs = manual_scan_freqs;
|
|
|
|
manual_scan_freqs = NULL;
|
|
|
|
|
2013-12-25 13:04:52 -05:00
|
|
|
wpa_s->normal_scans = 0;
|
|
|
|
wpa_s->scan_req = MANUAL_SCAN_REQ;
|
|
|
|
wpa_s->after_wps = 0;
|
|
|
|
wpa_s->known_wps_freq = 0;
|
|
|
|
wpa_supplicant_req_scan(wpa_s, 0, 0);
|
2013-12-26 10:35:48 -05:00
|
|
|
if (wpa_s->manual_scan_use_id) {
|
|
|
|
wpa_s->manual_scan_id++;
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG, "Assigned scan id %u",
|
|
|
|
wpa_s->manual_scan_id);
|
|
|
|
*reply_len = os_snprintf(reply, reply_size, "%u\n",
|
|
|
|
wpa_s->manual_scan_id);
|
|
|
|
}
|
2013-12-25 13:04:52 -05:00
|
|
|
} else if (wpa_s->sched_scanning) {
|
2014-12-11 18:12:15 -05:00
|
|
|
wpa_s->manual_scan_passive = manual_scan_passive;
|
|
|
|
wpa_s->manual_scan_use_id = manual_scan_use_id;
|
|
|
|
wpa_s->manual_scan_only_new = manual_scan_only_new;
|
|
|
|
wpa_s->scan_id_count = scan_id_count;
|
|
|
|
os_memcpy(wpa_s->scan_id, scan_id, scan_id_count * sizeof(int));
|
|
|
|
wpa_s->scan_res_handler = scan_res_handler;
|
|
|
|
os_free(wpa_s->manual_scan_freqs);
|
|
|
|
wpa_s->manual_scan_freqs = manual_scan_freqs;
|
|
|
|
manual_scan_freqs = NULL;
|
|
|
|
|
2013-12-25 13:04:52 -05:00
|
|
|
wpa_printf(MSG_DEBUG, "Stop ongoing sched_scan to allow requested full scan to proceed");
|
|
|
|
wpa_supplicant_cancel_sched_scan(wpa_s);
|
|
|
|
wpa_s->scan_req = MANUAL_SCAN_REQ;
|
|
|
|
wpa_supplicant_req_scan(wpa_s, 0, 0);
|
2013-12-26 10:35:48 -05:00
|
|
|
if (wpa_s->manual_scan_use_id) {
|
|
|
|
wpa_s->manual_scan_id++;
|
|
|
|
*reply_len = os_snprintf(reply, reply_size, "%u\n",
|
|
|
|
wpa_s->manual_scan_id);
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG, "Assigned scan id %u",
|
|
|
|
wpa_s->manual_scan_id);
|
|
|
|
}
|
2013-12-25 13:04:52 -05:00
|
|
|
} else {
|
|
|
|
wpa_printf(MSG_DEBUG, "Ongoing scan action - reject new request");
|
|
|
|
*reply_len = os_snprintf(reply, reply_size, "FAIL-BUSY\n");
|
|
|
|
}
|
2014-12-11 18:12:15 -05:00
|
|
|
|
|
|
|
done:
|
|
|
|
os_free(manual_scan_freqs);
|
2013-12-25 13:04:52 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-03-08 13:21:21 -05:00
|
|
|
#ifdef CONFIG_TESTING_OPTIONS
|
|
|
|
|
|
|
|
static void wpas_ctrl_iface_mgmt_tx_cb(struct wpa_supplicant *wpa_s,
|
|
|
|
unsigned int freq, const u8 *dst,
|
|
|
|
const u8 *src, const u8 *bssid,
|
|
|
|
const u8 *data, size_t data_len,
|
|
|
|
enum offchannel_send_action_result
|
|
|
|
result)
|
|
|
|
{
|
|
|
|
wpa_msg(wpa_s, MSG_INFO, "MGMT-TX-STATUS freq=%u dst=" MACSTR
|
|
|
|
" src=" MACSTR " bssid=" MACSTR " result=%s",
|
|
|
|
freq, MAC2STR(dst), MAC2STR(src), MAC2STR(bssid),
|
|
|
|
result == OFFCHANNEL_SEND_ACTION_SUCCESS ?
|
|
|
|
"SUCCESS" : (result == OFFCHANNEL_SEND_ACTION_NO_ACK ?
|
|
|
|
"NO_ACK" : "FAILED"));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpas_ctrl_iface_mgmt_tx(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos, *param;
|
|
|
|
size_t len;
|
|
|
|
u8 *buf, da[ETH_ALEN], bssid[ETH_ALEN];
|
|
|
|
int res, used;
|
|
|
|
int freq = 0, no_cck = 0, wait_time = 0;
|
|
|
|
|
|
|
|
/* <DA> <BSSID> [freq=<MHz>] [wait_time=<ms>] [no_cck=1]
|
|
|
|
* <action=Action frame payload> */
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "External MGMT TX: %s", cmd);
|
|
|
|
|
|
|
|
pos = cmd;
|
|
|
|
used = hwaddr_aton2(pos, da);
|
|
|
|
if (used < 0)
|
|
|
|
return -1;
|
|
|
|
pos += used;
|
|
|
|
while (*pos == ' ')
|
|
|
|
pos++;
|
|
|
|
used = hwaddr_aton2(pos, bssid);
|
|
|
|
if (used < 0)
|
|
|
|
return -1;
|
|
|
|
pos += used;
|
|
|
|
|
|
|
|
param = os_strstr(pos, " freq=");
|
|
|
|
if (param) {
|
|
|
|
param += 6;
|
|
|
|
freq = atoi(param);
|
|
|
|
}
|
|
|
|
|
|
|
|
param = os_strstr(pos, " no_cck=");
|
|
|
|
if (param) {
|
|
|
|
param += 8;
|
|
|
|
no_cck = atoi(param);
|
|
|
|
}
|
|
|
|
|
|
|
|
param = os_strstr(pos, " wait_time=");
|
|
|
|
if (param) {
|
|
|
|
param += 11;
|
|
|
|
wait_time = atoi(param);
|
|
|
|
}
|
|
|
|
|
|
|
|
param = os_strstr(pos, " action=");
|
|
|
|
if (param == NULL)
|
|
|
|
return -1;
|
|
|
|
param += 8;
|
|
|
|
|
|
|
|
len = os_strlen(param);
|
|
|
|
if (len & 1)
|
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
|
|
|
|
buf = os_malloc(len);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (hexstr2bin(param, buf, len) < 0) {
|
|
|
|
os_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
res = offchannel_send_action(wpa_s, freq, da, wpa_s->own_addr, bssid,
|
|
|
|
buf, len, wait_time,
|
|
|
|
wpas_ctrl_iface_mgmt_tx_cb, no_cck);
|
|
|
|
os_free(buf);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void wpas_ctrl_iface_mgmt_tx_done(struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
wpa_printf(MSG_DEBUG, "External MGMT TX - done waiting");
|
|
|
|
offchannel_send_action_done(wpa_s);
|
|
|
|
}
|
|
|
|
|
2014-05-15 14:09:48 -04:00
|
|
|
|
|
|
|
static int wpas_ctrl_iface_driver_event(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos, *param;
|
|
|
|
union wpa_event_data event;
|
|
|
|
enum wpa_event_type ev;
|
|
|
|
|
|
|
|
/* <event name> [parameters..] */
|
|
|
|
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG, "Testing - external driver event: %s", cmd);
|
|
|
|
|
|
|
|
pos = cmd;
|
|
|
|
param = os_strchr(pos, ' ');
|
|
|
|
if (param)
|
|
|
|
*param++ = '\0';
|
|
|
|
|
|
|
|
os_memset(&event, 0, sizeof(event));
|
|
|
|
|
|
|
|
if (os_strcmp(cmd, "INTERFACE_ENABLED") == 0) {
|
|
|
|
ev = EVENT_INTERFACE_ENABLED;
|
|
|
|
} else if (os_strcmp(cmd, "INTERFACE_DISABLED") == 0) {
|
|
|
|
ev = EVENT_INTERFACE_DISABLED;
|
2014-05-25 13:58:27 -04:00
|
|
|
} else if (os_strcmp(cmd, "AVOID_FREQUENCIES") == 0) {
|
|
|
|
ev = EVENT_AVOID_FREQUENCIES;
|
|
|
|
if (param == NULL)
|
|
|
|
param = "";
|
|
|
|
if (freq_range_list_parse(&event.freq_range, param) < 0)
|
|
|
|
return -1;
|
|
|
|
wpa_supplicant_event(wpa_s, ev, &event);
|
|
|
|
os_free(event.freq_range.range);
|
|
|
|
return 0;
|
2014-05-15 14:09:48 -04:00
|
|
|
} else {
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG, "Testing - unknown driver event: %s",
|
|
|
|
cmd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_supplicant_event(wpa_s, ev, &event);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-10-10 11:01:15 -04:00
|
|
|
|
|
|
|
static int wpas_ctrl_iface_eapol_rx(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos;
|
|
|
|
u8 src[ETH_ALEN], *buf;
|
|
|
|
int used;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "External EAPOL RX: %s", cmd);
|
|
|
|
|
|
|
|
pos = cmd;
|
|
|
|
used = hwaddr_aton2(pos, src);
|
|
|
|
if (used < 0)
|
|
|
|
return -1;
|
|
|
|
pos += used;
|
|
|
|
while (*pos == ' ')
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
len = os_strlen(pos);
|
|
|
|
if (len & 1)
|
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
|
|
|
|
buf = os_malloc(len);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (hexstr2bin(pos, buf, len) < 0) {
|
|
|
|
os_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_supplicant_rx_eapol(wpa_s, src, buf, len);
|
|
|
|
os_free(buf);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-10-19 13:51:45 -04:00
|
|
|
|
|
|
|
static u16 ipv4_hdr_checksum(const void *buf, size_t len)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
u32 sum = 0;
|
|
|
|
const u16 *pos = buf;
|
|
|
|
|
|
|
|
for (i = 0; i < len / 2; i++)
|
|
|
|
sum += *pos++;
|
|
|
|
|
|
|
|
while (sum >> 16)
|
|
|
|
sum = (sum & 0xffff) + (sum >> 16);
|
|
|
|
|
|
|
|
return sum ^ 0xffff;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#define HWSIM_PACKETLEN 1500
|
|
|
|
#define HWSIM_IP_LEN (HWSIM_PACKETLEN - sizeof(struct ether_header))
|
|
|
|
|
|
|
|
void wpas_data_test_rx(void *ctx, const u8 *src_addr, const u8 *buf, size_t len)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s = ctx;
|
|
|
|
const struct ether_header *eth;
|
|
|
|
const struct iphdr *ip;
|
|
|
|
const u8 *pos;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
if (len != HWSIM_PACKETLEN)
|
|
|
|
return;
|
|
|
|
|
|
|
|
eth = (const struct ether_header *) buf;
|
|
|
|
ip = (const struct iphdr *) (eth + 1);
|
|
|
|
pos = (const u8 *) (ip + 1);
|
|
|
|
|
|
|
|
if (ip->ihl != 5 || ip->version != 4 ||
|
|
|
|
ntohs(ip->tot_len) != HWSIM_IP_LEN)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (i = 0; i < HWSIM_IP_LEN - sizeof(*ip); i++) {
|
|
|
|
if (*pos != (u8) i)
|
|
|
|
return;
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_msg(wpa_s, MSG_INFO, "DATA-TEST-RX " MACSTR " " MACSTR,
|
|
|
|
MAC2STR(eth->ether_dhost), MAC2STR(eth->ether_shost));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpas_ctrl_iface_data_test_config(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
int enabled = atoi(cmd);
|
|
|
|
|
|
|
|
if (!enabled) {
|
|
|
|
if (wpa_s->l2_test) {
|
|
|
|
l2_packet_deinit(wpa_s->l2_test);
|
|
|
|
wpa_s->l2_test = NULL;
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG, "test data: Disabled");
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa_s->l2_test)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
wpa_s->l2_test = l2_packet_init(wpa_s->ifname, wpa_s->own_addr,
|
|
|
|
ETHERTYPE_IP, wpas_data_test_rx,
|
|
|
|
wpa_s, 1);
|
|
|
|
if (wpa_s->l2_test == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG, "test data: Enabled");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpas_ctrl_iface_data_test_tx(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
u8 dst[ETH_ALEN], src[ETH_ALEN];
|
|
|
|
char *pos;
|
|
|
|
int used;
|
|
|
|
long int val;
|
|
|
|
u8 tos;
|
|
|
|
u8 buf[HWSIM_PACKETLEN];
|
|
|
|
struct ether_header *eth;
|
|
|
|
struct iphdr *ip;
|
|
|
|
u8 *dpos;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
if (wpa_s->l2_test == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* format: <dst> <src> <tos> */
|
|
|
|
|
|
|
|
pos = cmd;
|
|
|
|
used = hwaddr_aton2(pos, dst);
|
|
|
|
if (used < 0)
|
|
|
|
return -1;
|
|
|
|
pos += used;
|
|
|
|
while (*pos == ' ')
|
|
|
|
pos++;
|
|
|
|
used = hwaddr_aton2(pos, src);
|
|
|
|
if (used < 0)
|
|
|
|
return -1;
|
|
|
|
pos += used;
|
|
|
|
|
|
|
|
val = strtol(pos, NULL, 0);
|
|
|
|
if (val < 0 || val > 0xff)
|
|
|
|
return -1;
|
|
|
|
tos = val;
|
|
|
|
|
|
|
|
eth = (struct ether_header *) buf;
|
|
|
|
os_memcpy(eth->ether_dhost, dst, ETH_ALEN);
|
|
|
|
os_memcpy(eth->ether_shost, src, ETH_ALEN);
|
|
|
|
eth->ether_type = htons(ETHERTYPE_IP);
|
|
|
|
ip = (struct iphdr *) (eth + 1);
|
|
|
|
os_memset(ip, 0, sizeof(*ip));
|
|
|
|
ip->ihl = 5;
|
|
|
|
ip->version = 4;
|
|
|
|
ip->ttl = 64;
|
|
|
|
ip->tos = tos;
|
|
|
|
ip->tot_len = htons(HWSIM_IP_LEN);
|
|
|
|
ip->protocol = 1;
|
|
|
|
ip->saddr = htonl(192 << 24 | 168 << 16 | 1 << 8 | 1);
|
|
|
|
ip->daddr = htonl(192 << 24 | 168 << 16 | 1 << 8 | 2);
|
|
|
|
ip->check = ipv4_hdr_checksum(ip, sizeof(*ip));
|
|
|
|
dpos = (u8 *) (ip + 1);
|
|
|
|
for (i = 0; i < HWSIM_IP_LEN - sizeof(*ip); i++)
|
|
|
|
*dpos++ = i;
|
|
|
|
|
|
|
|
if (l2_packet_send(wpa_s->l2_test, dst, ETHERTYPE_IP, buf,
|
|
|
|
HWSIM_PACKETLEN) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG, "test data: TX dst=" MACSTR " src=" MACSTR
|
|
|
|
" tos=0x%x", MAC2STR(dst), MAC2STR(src), tos);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-27 16:51:46 -05:00
|
|
|
|
|
|
|
static int wpas_ctrl_iface_data_test_frame(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
u8 *buf;
|
|
|
|
struct ether_header *eth;
|
|
|
|
struct l2_packet_data *l2 = NULL;
|
|
|
|
size_t len;
|
|
|
|
u16 ethertype;
|
|
|
|
int res = -1;
|
|
|
|
|
|
|
|
len = os_strlen(cmd);
|
|
|
|
if (len & 1 || len < ETH_HLEN * 2)
|
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
|
|
|
|
buf = os_malloc(len);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (hexstr2bin(cmd, buf, len) < 0)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
eth = (struct ether_header *) buf;
|
|
|
|
ethertype = ntohs(eth->ether_type);
|
|
|
|
|
|
|
|
l2 = l2_packet_init(wpa_s->ifname, wpa_s->own_addr, ethertype,
|
|
|
|
wpas_data_test_rx, wpa_s, 1);
|
|
|
|
if (l2 == NULL)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
res = l2_packet_send(l2, eth->ether_dhost, ethertype, buf, len);
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG, "test data: TX frame res=%d", res);
|
|
|
|
done:
|
|
|
|
if (l2)
|
|
|
|
l2_packet_deinit(l2);
|
|
|
|
os_free(buf);
|
|
|
|
|
|
|
|
return res < 0 ? -1 : 0;
|
|
|
|
}
|
|
|
|
|
2015-01-05 13:30:28 -05:00
|
|
|
|
|
|
|
static int wpas_ctrl_test_alloc_fail(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
#ifdef WPA_TRACE_BFD
|
|
|
|
extern char wpa_trace_fail_func[256];
|
|
|
|
extern unsigned int wpa_trace_fail_after;
|
|
|
|
char *pos;
|
|
|
|
|
|
|
|
wpa_trace_fail_after = atoi(cmd);
|
|
|
|
pos = os_strchr(cmd, ':');
|
|
|
|
if (pos) {
|
|
|
|
pos++;
|
|
|
|
os_strlcpy(wpa_trace_fail_func, pos,
|
|
|
|
sizeof(wpa_trace_fail_func));
|
|
|
|
} else {
|
|
|
|
wpa_trace_fail_after = 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
#else /* WPA_TRACE_BFD */
|
|
|
|
return -1;
|
|
|
|
#endif /* WPA_TRACE_BFD */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpas_ctrl_get_alloc_fail(struct wpa_supplicant *wpa_s,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
#ifdef WPA_TRACE_BFD
|
|
|
|
extern char wpa_trace_fail_func[256];
|
|
|
|
extern unsigned int wpa_trace_fail_after;
|
|
|
|
|
|
|
|
return os_snprintf(buf, buflen, "%u:%s", wpa_trace_fail_after,
|
|
|
|
wpa_trace_fail_func);
|
|
|
|
#else /* WPA_TRACE_BFD */
|
|
|
|
return -1;
|
|
|
|
#endif /* WPA_TRACE_BFD */
|
|
|
|
}
|
|
|
|
|
2014-03-08 13:21:21 -05:00
|
|
|
#endif /* CONFIG_TESTING_OPTIONS */
|
|
|
|
|
|
|
|
|
2014-07-04 11:23:43 -04:00
|
|
|
static void wpas_ctrl_vendor_elem_update(struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
char buf[30];
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "Update vendor elements");
|
|
|
|
|
|
|
|
for (i = 0; i < NUM_VENDOR_ELEM_FRAMES; i++) {
|
|
|
|
if (wpa_s->vendor_elem[i]) {
|
2014-12-06 14:40:31 -05:00
|
|
|
int res;
|
|
|
|
|
|
|
|
res = os_snprintf(buf, sizeof(buf), "frame[%u]", i);
|
|
|
|
if (!os_snprintf_error(sizeof(buf), res)) {
|
|
|
|
wpa_hexdump_buf(MSG_DEBUG, buf,
|
|
|
|
wpa_s->vendor_elem[i]);
|
|
|
|
}
|
2014-07-04 11:23:43 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
if (wpa_s->parent == wpa_s &&
|
|
|
|
wpa_s->global->p2p &&
|
|
|
|
!wpa_s->global->p2p_disabled)
|
|
|
|
p2p_set_vendor_elems(wpa_s->global->p2p, wpa_s->vendor_elem);
|
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static struct wpa_supplicant *
|
|
|
|
wpas_ctrl_vendor_elem_iface(struct wpa_supplicant *wpa_s,
|
|
|
|
enum wpa_vendor_elem_frame frame)
|
|
|
|
{
|
|
|
|
switch (frame) {
|
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
case VENDOR_ELEM_PROBE_REQ_P2P:
|
|
|
|
case VENDOR_ELEM_PROBE_RESP_P2P:
|
|
|
|
case VENDOR_ELEM_PROBE_RESP_P2P_GO:
|
|
|
|
case VENDOR_ELEM_BEACON_P2P_GO:
|
|
|
|
case VENDOR_ELEM_P2P_PD_REQ:
|
|
|
|
case VENDOR_ELEM_P2P_PD_RESP:
|
|
|
|
case VENDOR_ELEM_P2P_GO_NEG_REQ:
|
|
|
|
case VENDOR_ELEM_P2P_GO_NEG_RESP:
|
|
|
|
case VENDOR_ELEM_P2P_GO_NEG_CONF:
|
|
|
|
case VENDOR_ELEM_P2P_INV_REQ:
|
|
|
|
case VENDOR_ELEM_P2P_INV_RESP:
|
|
|
|
case VENDOR_ELEM_P2P_ASSOC_REQ:
|
|
|
|
return wpa_s->parent;
|
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
default:
|
|
|
|
return wpa_s;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpas_ctrl_vendor_elem_add(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos = cmd;
|
|
|
|
int frame;
|
|
|
|
size_t len;
|
|
|
|
struct wpabuf *buf;
|
|
|
|
struct ieee802_11_elems elems;
|
|
|
|
|
|
|
|
frame = atoi(pos);
|
|
|
|
if (frame < 0 || frame >= NUM_VENDOR_ELEM_FRAMES)
|
|
|
|
return -1;
|
|
|
|
wpa_s = wpas_ctrl_vendor_elem_iface(wpa_s, frame);
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
len = os_strlen(pos);
|
|
|
|
if (len == 0)
|
|
|
|
return 0;
|
|
|
|
if (len & 1)
|
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
|
|
|
|
buf = wpabuf_alloc(len);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (hexstr2bin(pos, wpabuf_put(buf, len), len) < 0) {
|
|
|
|
wpabuf_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ieee802_11_parse_elems(wpabuf_head_u8(buf), len, &elems, 0) ==
|
|
|
|
ParseFailed) {
|
|
|
|
wpabuf_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa_s->vendor_elem[frame] == NULL) {
|
|
|
|
wpa_s->vendor_elem[frame] = buf;
|
|
|
|
wpas_ctrl_vendor_elem_update(wpa_s);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpabuf_resize(&wpa_s->vendor_elem[frame], len) < 0) {
|
|
|
|
wpabuf_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpabuf_put_buf(wpa_s->vendor_elem[frame], buf);
|
|
|
|
wpabuf_free(buf);
|
|
|
|
wpas_ctrl_vendor_elem_update(wpa_s);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpas_ctrl_vendor_elem_get(struct wpa_supplicant *wpa_s, char *cmd,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
int frame = atoi(cmd);
|
|
|
|
|
|
|
|
if (frame < 0 || frame >= NUM_VENDOR_ELEM_FRAMES)
|
|
|
|
return -1;
|
|
|
|
wpa_s = wpas_ctrl_vendor_elem_iface(wpa_s, frame);
|
|
|
|
|
|
|
|
if (wpa_s->vendor_elem[frame] == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return wpa_snprintf_hex(buf, buflen,
|
|
|
|
wpabuf_head_u8(wpa_s->vendor_elem[frame]),
|
|
|
|
wpabuf_len(wpa_s->vendor_elem[frame]));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpas_ctrl_vendor_elem_remove(struct wpa_supplicant *wpa_s, char *cmd)
|
|
|
|
{
|
|
|
|
char *pos = cmd;
|
|
|
|
int frame;
|
|
|
|
size_t len;
|
|
|
|
u8 *buf;
|
|
|
|
struct ieee802_11_elems elems;
|
|
|
|
u8 *ie, *end;
|
|
|
|
|
|
|
|
frame = atoi(pos);
|
|
|
|
if (frame < 0 || frame >= NUM_VENDOR_ELEM_FRAMES)
|
|
|
|
return -1;
|
|
|
|
wpa_s = wpas_ctrl_vendor_elem_iface(wpa_s, frame);
|
|
|
|
|
|
|
|
pos = os_strchr(pos, ' ');
|
|
|
|
if (pos == NULL)
|
|
|
|
return -1;
|
|
|
|
pos++;
|
|
|
|
|
|
|
|
if (*pos == '*') {
|
|
|
|
wpabuf_free(wpa_s->vendor_elem[frame]);
|
|
|
|
wpa_s->vendor_elem[frame] = NULL;
|
|
|
|
wpas_ctrl_vendor_elem_update(wpa_s);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa_s->vendor_elem[frame] == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
len = os_strlen(pos);
|
|
|
|
if (len == 0)
|
|
|
|
return 0;
|
|
|
|
if (len & 1)
|
|
|
|
return -1;
|
|
|
|
len /= 2;
|
|
|
|
|
|
|
|
buf = os_malloc(len);
|
|
|
|
if (buf == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (hexstr2bin(pos, buf, len) < 0) {
|
|
|
|
os_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ieee802_11_parse_elems(buf, len, &elems, 0) == ParseFailed) {
|
|
|
|
os_free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ie = wpabuf_mhead_u8(wpa_s->vendor_elem[frame]);
|
|
|
|
end = ie + wpabuf_len(wpa_s->vendor_elem[frame]);
|
|
|
|
|
|
|
|
for (; ie + 1 < end; ie += 2 + ie[1]) {
|
|
|
|
if (ie + len > end)
|
|
|
|
break;
|
|
|
|
if (os_memcmp(ie, buf, len) != 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (wpabuf_len(wpa_s->vendor_elem[frame]) == len) {
|
|
|
|
wpabuf_free(wpa_s->vendor_elem[frame]);
|
|
|
|
wpa_s->vendor_elem[frame] = NULL;
|
|
|
|
} else {
|
|
|
|
os_memmove(ie, ie + len,
|
2014-10-06 07:24:33 -04:00
|
|
|
end - (ie + len));
|
2014-07-04 11:23:43 -04:00
|
|
|
wpa_s->vendor_elem[frame]->used -= len;
|
|
|
|
}
|
|
|
|
os_free(buf);
|
|
|
|
wpas_ctrl_vendor_elem_update(wpa_s);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_free(buf);
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-11-05 03:42:51 -05:00
|
|
|
static void wpas_ctrl_neighbor_rep_cb(void *ctx, struct wpabuf *neighbor_rep)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s = ctx;
|
|
|
|
|
|
|
|
if (neighbor_rep) {
|
|
|
|
wpa_msg_ctrl(wpa_s, MSG_INFO, RRM_EVENT_NEIGHBOR_REP_RXED
|
|
|
|
"length=%u",
|
|
|
|
(unsigned int) wpabuf_len(neighbor_rep));
|
|
|
|
wpabuf_free(neighbor_rep);
|
|
|
|
} else {
|
|
|
|
wpa_msg_ctrl(wpa_s, MSG_INFO, RRM_EVENT_NEIGHBOR_REP_FAILED);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-11-05 03:42:53 -05:00
|
|
|
static int wpas_ctrl_iface_send_neigbor_rep(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
2014-11-05 03:42:51 -05:00
|
|
|
{
|
2014-11-05 03:42:53 -05:00
|
|
|
struct wpa_ssid ssid;
|
|
|
|
struct wpa_ssid *ssid_p = NULL;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (os_strncmp(cmd, " ssid=", 6) == 0) {
|
|
|
|
ssid.ssid_len = os_strlen(cmd + 6);
|
|
|
|
if (ssid.ssid_len > 32)
|
|
|
|
return -1;
|
|
|
|
ssid.ssid = (u8 *) (cmd + 6);
|
|
|
|
ssid_p = &ssid;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = wpas_rrm_send_neighbor_rep_request(wpa_s, ssid_p,
|
|
|
|
wpas_ctrl_neighbor_rep_cb,
|
|
|
|
wpa_s);
|
|
|
|
|
|
|
|
return ret;
|
2014-11-05 03:42:51 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-11-30 18:11:29 -05:00
|
|
|
static int wpas_ctrl_iface_erp_flush(struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
eapol_sm_erp_flush(wpa_s->eapol);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-12-29 01:41:07 -05:00
|
|
|
static int wpas_ctrl_iface_mac_rand_scan(struct wpa_supplicant *wpa_s,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
char *token, *context = NULL;
|
|
|
|
unsigned int enable = ~0, type = 0;
|
|
|
|
u8 _addr[ETH_ALEN], _mask[ETH_ALEN];
|
|
|
|
u8 *addr = NULL, *mask = NULL;
|
|
|
|
|
|
|
|
while ((token = str_token(cmd, " ", &context))) {
|
|
|
|
if (os_strcasecmp(token, "scan") == 0) {
|
|
|
|
type |= MAC_ADDR_RAND_SCAN;
|
|
|
|
} else if (os_strcasecmp(token, "sched") == 0) {
|
|
|
|
type |= MAC_ADDR_RAND_SCHED_SCAN;
|
|
|
|
} else if (os_strcasecmp(token, "pno") == 0) {
|
|
|
|
type |= MAC_ADDR_RAND_PNO;
|
|
|
|
} else if (os_strcasecmp(token, "all") == 0) {
|
|
|
|
type = wpa_s->mac_addr_rand_supported;
|
|
|
|
} else if (os_strncasecmp(token, "enable=", 7) == 0) {
|
|
|
|
enable = atoi(token + 7);
|
|
|
|
} else if (os_strncasecmp(token, "addr=", 5) == 0) {
|
|
|
|
addr = _addr;
|
|
|
|
if (hwaddr_aton(token + 5, addr)) {
|
|
|
|
wpa_printf(MSG_INFO,
|
|
|
|
"CTRL: Invalid MAC address: %s",
|
|
|
|
token);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else if (os_strncasecmp(token, "mask=", 5) == 0) {
|
|
|
|
mask = _mask;
|
|
|
|
if (hwaddr_aton(token + 5, mask)) {
|
|
|
|
wpa_printf(MSG_INFO,
|
|
|
|
"CTRL: Invalid MAC address mask: %s",
|
|
|
|
token);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
wpa_printf(MSG_INFO,
|
|
|
|
"CTRL: Invalid MAC_RAND_SCAN parameter: %s",
|
|
|
|
token);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!type) {
|
|
|
|
wpa_printf(MSG_INFO, "CTRL: MAC_RAND_SCAN no type specified");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((wpa_s->mac_addr_rand_supported & type) != type) {
|
|
|
|
wpa_printf(MSG_INFO,
|
|
|
|
"CTRL: MAC_RAND_SCAN types=%u != supported=%u",
|
|
|
|
type, wpa_s->mac_addr_rand_supported);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (enable > 1) {
|
|
|
|
wpa_printf(MSG_INFO,
|
|
|
|
"CTRL: MAC_RAND_SCAN enable=<0/1> not specified");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!enable) {
|
|
|
|
wpas_mac_addr_rand_scan_clear(wpa_s, type);
|
|
|
|
if (wpa_s->pno) {
|
|
|
|
if (type & MAC_ADDR_RAND_PNO) {
|
|
|
|
wpas_stop_pno(wpa_s);
|
|
|
|
wpas_start_pno(wpa_s);
|
|
|
|
}
|
|
|
|
} else if (wpa_s->sched_scanning &&
|
|
|
|
(type & MAC_ADDR_RAND_SCHED_SCAN)) {
|
|
|
|
/* simulate timeout to restart the sched scan */
|
|
|
|
wpa_s->sched_scan_timed_out = 1;
|
|
|
|
wpa_s->prev_sched_ssid = NULL;
|
|
|
|
wpa_supplicant_cancel_sched_scan(wpa_s);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((addr && !mask) || (!addr && mask)) {
|
|
|
|
wpa_printf(MSG_INFO,
|
|
|
|
"CTRL: MAC_RAND_SCAN invalid addr/mask combination");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (addr && mask && (!(mask[0] & 0x01) || (addr[0] & 0x01))) {
|
|
|
|
wpa_printf(MSG_INFO,
|
|
|
|
"CTRL: MAC_RAND_SCAN cannot allow multicast address");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type & MAC_ADDR_RAND_SCAN) {
|
|
|
|
wpas_mac_addr_rand_scan_set(wpa_s, MAC_ADDR_RAND_SCAN,
|
|
|
|
addr, mask);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type & MAC_ADDR_RAND_SCHED_SCAN) {
|
|
|
|
wpas_mac_addr_rand_scan_set(wpa_s, MAC_ADDR_RAND_SCHED_SCAN,
|
|
|
|
addr, mask);
|
|
|
|
|
|
|
|
if (wpa_s->sched_scanning && !wpa_s->pno) {
|
|
|
|
/* simulate timeout to restart the sched scan */
|
|
|
|
wpa_s->sched_scan_timed_out = 1;
|
|
|
|
wpa_s->prev_sched_ssid = NULL;
|
|
|
|
wpa_supplicant_cancel_sched_scan(wpa_s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type & MAC_ADDR_RAND_PNO) {
|
|
|
|
wpas_mac_addr_rand_scan_set(wpa_s, MAC_ADDR_RAND_PNO,
|
|
|
|
addr, mask);
|
|
|
|
if (wpa_s->pno) {
|
|
|
|
wpas_stop_pno(wpa_s);
|
|
|
|
wpas_start_pno(wpa_s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
|
|
|
|
char *buf, size_t *resp_len)
|
|
|
|
{
|
|
|
|
char *reply;
|
2010-07-18 17:30:25 -04:00
|
|
|
const int reply_size = 4096;
|
2008-02-27 20:34:43 -05:00
|
|
|
int reply_len;
|
|
|
|
|
|
|
|
if (os_strncmp(buf, WPA_CTRL_RSP, os_strlen(WPA_CTRL_RSP)) == 0 ||
|
2014-01-04 00:40:46 -05:00
|
|
|
os_strncmp(buf, "SET_NETWORK ", 12) == 0) {
|
|
|
|
if (wpa_debug_show_keys)
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG,
|
|
|
|
"Control interface command '%s'", buf);
|
|
|
|
else
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG,
|
|
|
|
"Control interface command '%s [REMOVED]'",
|
|
|
|
os_strncmp(buf, WPA_CTRL_RSP,
|
|
|
|
os_strlen(WPA_CTRL_RSP)) == 0 ?
|
|
|
|
WPA_CTRL_RSP : "SET_NETWORK");
|
|
|
|
} else if (os_strncmp(buf, "WPS_NFC_TAG_READ", 16) == 0 ||
|
2014-04-06 09:42:27 -04:00
|
|
|
os_strncmp(buf, "NFC_REPORT_HANDOVER", 19) == 0) {
|
2008-02-27 20:34:43 -05:00
|
|
|
wpa_hexdump_ascii_key(MSG_DEBUG, "RX ctrl_iface",
|
|
|
|
(const u8 *) buf, os_strlen(buf));
|
|
|
|
} else {
|
2010-09-24 18:50:13 -04:00
|
|
|
int level = MSG_DEBUG;
|
|
|
|
if (os_strcmp(buf, "PING") == 0)
|
|
|
|
level = MSG_EXCESSIVE;
|
2012-09-23 18:01:26 -04:00
|
|
|
wpa_dbg(wpa_s, level, "Control interface command '%s'", buf);
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
reply = os_malloc(reply_size);
|
|
|
|
if (reply == NULL) {
|
|
|
|
*resp_len = 1;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_memcpy(reply, "OK\n", 3);
|
|
|
|
reply_len = 3;
|
|
|
|
|
|
|
|
if (os_strcmp(buf, "PING") == 0) {
|
|
|
|
os_memcpy(reply, "PONG\n", 5);
|
|
|
|
reply_len = 5;
|
2012-08-05 13:12:16 -04:00
|
|
|
} else if (os_strcmp(buf, "IFNAME") == 0) {
|
|
|
|
reply_len = os_strlen(wpa_s->ifname);
|
|
|
|
os_memcpy(reply, wpa_s->ifname, reply_len);
|
2011-02-06 13:15:19 -05:00
|
|
|
} else if (os_strncmp(buf, "RELOG", 5) == 0) {
|
|
|
|
if (wpa_debug_reopen_file() < 0)
|
|
|
|
reply_len = -1;
|
2010-08-04 12:11:32 -04:00
|
|
|
} else if (os_strncmp(buf, "NOTE ", 5) == 0) {
|
|
|
|
wpa_printf(MSG_INFO, "NOTE: %s", buf + 5);
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strcmp(buf, "MIB") == 0) {
|
|
|
|
reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
|
|
|
|
if (reply_len >= 0) {
|
2014-12-13 12:15:38 -05:00
|
|
|
reply_len += eapol_sm_get_mib(wpa_s->eapol,
|
|
|
|
reply + reply_len,
|
|
|
|
reply_size - reply_len);
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
|
|
|
} else if (os_strncmp(buf, "STATUS", 6) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_status(
|
|
|
|
wpa_s, buf + 6, reply, reply_size);
|
|
|
|
} else if (os_strcmp(buf, "PMKSA") == 0) {
|
2009-01-13 13:22:42 -05:00
|
|
|
reply_len = wpa_sm_pmksa_cache_list(wpa_s->wpa, reply,
|
|
|
|
reply_size);
|
2014-09-26 13:20:21 -04:00
|
|
|
} else if (os_strcmp(buf, "PMKSA_FLUSH") == 0) {
|
|
|
|
wpa_sm_pmksa_cache_flush(wpa_s->wpa, NULL);
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strncmp(buf, "SET ", 4) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_set(wpa_s, buf + 4))
|
|
|
|
reply_len = -1;
|
2010-10-31 11:07:31 -04:00
|
|
|
} else if (os_strncmp(buf, "GET ", 4) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_get(wpa_s, buf + 4,
|
|
|
|
reply, reply_size);
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strcmp(buf, "LOGON") == 0) {
|
|
|
|
eapol_sm_notify_logoff(wpa_s->eapol, FALSE);
|
|
|
|
} else if (os_strcmp(buf, "LOGOFF") == 0) {
|
|
|
|
eapol_sm_notify_logoff(wpa_s->eapol, TRUE);
|
|
|
|
} else if (os_strcmp(buf, "REASSOCIATE") == 0) {
|
2010-05-23 03:27:32 -04:00
|
|
|
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED)
|
|
|
|
reply_len = -1;
|
2012-11-25 09:30:30 -05:00
|
|
|
else
|
|
|
|
wpas_request_connection(wpa_s);
|
2014-03-06 13:06:04 -05:00
|
|
|
} else if (os_strcmp(buf, "REATTACH") == 0) {
|
|
|
|
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED ||
|
|
|
|
!wpa_s->current_ssid)
|
|
|
|
reply_len = -1;
|
|
|
|
else {
|
|
|
|
wpa_s->reattach = 1;
|
|
|
|
wpas_request_connection(wpa_s);
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strcmp(buf, "RECONNECT") == 0) {
|
2010-05-23 03:27:32 -04:00
|
|
|
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED)
|
|
|
|
reply_len = -1;
|
2012-11-25 09:30:30 -05:00
|
|
|
else if (wpa_s->disconnected)
|
|
|
|
wpas_request_connection(wpa_s);
|
2008-05-30 11:43:06 -04:00
|
|
|
#ifdef IEEE8021X_EAPOL
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strncmp(buf, "PREAUTH ", 8) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_preauth(wpa_s, buf + 8))
|
|
|
|
reply_len = -1;
|
2008-05-30 11:43:06 -04:00
|
|
|
#endif /* IEEE8021X_EAPOL */
|
2008-02-27 20:34:43 -05:00
|
|
|
#ifdef CONFIG_PEERKEY
|
|
|
|
} else if (os_strncmp(buf, "STKSTART ", 9) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_stkstart(wpa_s, buf + 9))
|
|
|
|
reply_len = -1;
|
|
|
|
#endif /* CONFIG_PEERKEY */
|
|
|
|
#ifdef CONFIG_IEEE80211R
|
|
|
|
} else if (os_strncmp(buf, "FT_DS ", 6) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_ft_ds(wpa_s, buf + 6))
|
|
|
|
reply_len = -1;
|
|
|
|
#endif /* CONFIG_IEEE80211R */
|
2008-11-29 13:59:45 -05:00
|
|
|
#ifdef CONFIG_WPS
|
|
|
|
} else if (os_strcmp(buf, "WPS_PBC") == 0) {
|
2011-03-10 11:59:51 -05:00
|
|
|
int res = wpa_supplicant_ctrl_iface_wps_pbc(wpa_s, NULL);
|
|
|
|
if (res == -2) {
|
|
|
|
os_memcpy(reply, "FAIL-PBC-OVERLAP\n", 17);
|
|
|
|
reply_len = 17;
|
|
|
|
} else if (res)
|
2008-11-29 13:59:45 -05:00
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "WPS_PBC ", 8) == 0) {
|
2011-03-10 11:59:51 -05:00
|
|
|
int res = wpa_supplicant_ctrl_iface_wps_pbc(wpa_s, buf + 8);
|
|
|
|
if (res == -2) {
|
|
|
|
os_memcpy(reply, "FAIL-PBC-OVERLAP\n", 17);
|
|
|
|
reply_len = 17;
|
|
|
|
} else if (res)
|
2008-11-29 13:59:45 -05:00
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "WPS_PIN ", 8) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_wps_pin(wpa_s, buf + 8,
|
|
|
|
reply,
|
|
|
|
reply_size);
|
2010-09-23 13:30:52 -04:00
|
|
|
} else if (os_strncmp(buf, "WPS_CHECK_PIN ", 14) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_wps_check_pin(
|
|
|
|
wpa_s, buf + 14, reply, reply_size);
|
2010-09-06 13:51:06 -04:00
|
|
|
} else if (os_strcmp(buf, "WPS_CANCEL") == 0) {
|
|
|
|
if (wpas_wps_cancel(wpa_s))
|
|
|
|
reply_len = -1;
|
2012-06-28 07:05:13 -04:00
|
|
|
#ifdef CONFIG_WPS_NFC
|
2012-06-27 11:56:41 -04:00
|
|
|
} else if (os_strcmp(buf, "WPS_NFC") == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_wps_nfc(wpa_s, NULL))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "WPS_NFC ", 8) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_wps_nfc(wpa_s, buf + 8))
|
|
|
|
reply_len = -1;
|
2013-02-15 04:45:29 -05:00
|
|
|
} else if (os_strncmp(buf, "WPS_NFC_CONFIG_TOKEN ", 21) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_wps_nfc_config_token(
|
|
|
|
wpa_s, buf + 21, reply, reply_size);
|
2012-06-27 11:56:41 -04:00
|
|
|
} else if (os_strncmp(buf, "WPS_NFC_TOKEN ", 14) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_wps_nfc_token(
|
|
|
|
wpa_s, buf + 14, reply, reply_size);
|
2012-06-28 06:59:29 -04:00
|
|
|
} else if (os_strncmp(buf, "WPS_NFC_TAG_READ ", 17) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_wps_nfc_tag_read(wpa_s,
|
|
|
|
buf + 17))
|
|
|
|
reply_len = -1;
|
2012-10-28 11:39:46 -04:00
|
|
|
} else if (os_strncmp(buf, "NFC_GET_HANDOVER_REQ ", 21) == 0) {
|
|
|
|
reply_len = wpas_ctrl_nfc_get_handover_req(
|
|
|
|
wpa_s, buf + 21, reply, reply_size);
|
|
|
|
} else if (os_strncmp(buf, "NFC_GET_HANDOVER_SEL ", 21) == 0) {
|
|
|
|
reply_len = wpas_ctrl_nfc_get_handover_sel(
|
|
|
|
wpa_s, buf + 21, reply, reply_size);
|
2013-02-11 11:43:46 -05:00
|
|
|
} else if (os_strncmp(buf, "NFC_REPORT_HANDOVER ", 20) == 0) {
|
|
|
|
if (wpas_ctrl_nfc_report_handover(wpa_s, buf + 20))
|
|
|
|
reply_len = -1;
|
2012-06-28 07:05:13 -04:00
|
|
|
#endif /* CONFIG_WPS_NFC */
|
2008-11-29 13:59:45 -05:00
|
|
|
} else if (os_strncmp(buf, "WPS_REG ", 8) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_wps_reg(wpa_s, buf + 8))
|
|
|
|
reply_len = -1;
|
2010-11-17 09:46:55 -05:00
|
|
|
#ifdef CONFIG_AP
|
|
|
|
} else if (os_strncmp(buf, "WPS_AP_PIN ", 11) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_wps_ap_pin(
|
|
|
|
wpa_s, buf + 11, reply, reply_size);
|
|
|
|
#endif /* CONFIG_AP */
|
2009-11-13 15:07:11 -05:00
|
|
|
#ifdef CONFIG_WPS_ER
|
2009-11-07 05:41:01 -05:00
|
|
|
} else if (os_strcmp(buf, "WPS_ER_START") == 0) {
|
2010-05-27 08:23:55 -04:00
|
|
|
if (wpas_wps_er_start(wpa_s, NULL))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "WPS_ER_START ", 13) == 0) {
|
|
|
|
if (wpas_wps_er_start(wpa_s, buf + 13))
|
2009-11-07 05:41:01 -05:00
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "WPS_ER_STOP") == 0) {
|
2014-12-13 12:50:16 -05:00
|
|
|
wpas_wps_er_stop(wpa_s);
|
2009-11-13 15:07:11 -05:00
|
|
|
} else if (os_strncmp(buf, "WPS_ER_PIN ", 11) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_wps_er_pin(wpa_s, buf + 11))
|
|
|
|
reply_len = -1;
|
2009-11-15 11:46:03 -05:00
|
|
|
} else if (os_strncmp(buf, "WPS_ER_PBC ", 11) == 0) {
|
2010-10-25 14:59:25 -04:00
|
|
|
int ret = wpas_wps_er_pbc(wpa_s, buf + 11);
|
|
|
|
if (ret == -2) {
|
|
|
|
os_memcpy(reply, "FAIL-PBC-OVERLAP\n", 17);
|
|
|
|
reply_len = 17;
|
|
|
|
} else if (ret == -3) {
|
|
|
|
os_memcpy(reply, "FAIL-UNKNOWN-UUID\n", 18);
|
|
|
|
reply_len = 18;
|
|
|
|
} else if (ret == -4) {
|
|
|
|
os_memcpy(reply, "FAIL-NO-AP-SETTINGS\n", 20);
|
|
|
|
reply_len = 20;
|
|
|
|
} else if (ret)
|
2009-11-15 11:46:03 -05:00
|
|
|
reply_len = -1;
|
2009-11-15 15:27:06 -05:00
|
|
|
} else if (os_strncmp(buf, "WPS_ER_LEARN ", 13) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_wps_er_learn(wpa_s, buf + 13))
|
|
|
|
reply_len = -1;
|
2010-10-20 06:37:01 -04:00
|
|
|
} else if (os_strncmp(buf, "WPS_ER_SET_CONFIG ", 18) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_wps_er_set_config(wpa_s,
|
|
|
|
buf + 18))
|
|
|
|
reply_len = -1;
|
2010-05-27 17:01:48 -04:00
|
|
|
} else if (os_strncmp(buf, "WPS_ER_CONFIG ", 14) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_wps_er_config(wpa_s, buf + 14))
|
|
|
|
reply_len = -1;
|
2012-06-28 09:35:51 -04:00
|
|
|
#ifdef CONFIG_WPS_NFC
|
|
|
|
} else if (os_strncmp(buf, "WPS_ER_NFC_CONFIG_TOKEN ", 24) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_wps_er_nfc_config_token(
|
|
|
|
wpa_s, buf + 24, reply, reply_size);
|
|
|
|
#endif /* CONFIG_WPS_NFC */
|
2009-11-13 15:07:11 -05:00
|
|
|
#endif /* CONFIG_WPS_ER */
|
2008-11-29 13:59:45 -05:00
|
|
|
#endif /* CONFIG_WPS */
|
2009-01-14 18:21:55 -05:00
|
|
|
#ifdef CONFIG_IBSS_RSN
|
|
|
|
} else if (os_strncmp(buf, "IBSS_RSN ", 9) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_ibss_rsn(wpa_s, buf + 9))
|
|
|
|
reply_len = -1;
|
|
|
|
#endif /* CONFIG_IBSS_RSN */
|
2014-09-01 00:23:33 -04:00
|
|
|
#ifdef CONFIG_MESH
|
2014-11-14 20:35:23 -05:00
|
|
|
} else if (os_strncmp(buf, "MESH_INTERFACE_ADD ", 19) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_mesh_interface_add(
|
|
|
|
wpa_s, buf + 19, reply, reply_size);
|
|
|
|
} else if (os_strcmp(buf, "MESH_INTERFACE_ADD") == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_mesh_interface_add(
|
|
|
|
wpa_s, "", reply, reply_size);
|
2014-09-01 00:23:33 -04:00
|
|
|
} else if (os_strncmp(buf, "MESH_GROUP_ADD ", 15) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_mesh_group_add(wpa_s, buf + 15))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "MESH_GROUP_REMOVE ", 18) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_mesh_group_remove(wpa_s,
|
|
|
|
buf + 18))
|
|
|
|
reply_len = -1;
|
|
|
|
#endif /* CONFIG_MESH */
|
2010-07-18 17:30:25 -04:00
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
} else if (os_strncmp(buf, "P2P_FIND ", 9) == 0) {
|
2014-09-05 10:27:20 -04:00
|
|
|
if (p2p_ctrl_find(wpa_s, buf + 8))
|
2010-07-18 17:30:25 -04:00
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "P2P_FIND") == 0) {
|
|
|
|
if (p2p_ctrl_find(wpa_s, ""))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "P2P_STOP_FIND") == 0) {
|
|
|
|
wpas_p2p_stop_find(wpa_s);
|
2014-12-10 04:34:32 -05:00
|
|
|
} else if (os_strncmp(buf, "P2P_ASP_PROVISION ", 18) == 0) {
|
|
|
|
if (p2p_ctrl_asp_provision(wpa_s, buf + 18))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "P2P_ASP_PROVISION_RESP ", 23) == 0) {
|
|
|
|
if (p2p_ctrl_asp_provision_resp(wpa_s, buf + 23))
|
|
|
|
reply_len = -1;
|
2010-07-18 17:30:25 -04:00
|
|
|
} else if (os_strncmp(buf, "P2P_CONNECT ", 12) == 0) {
|
|
|
|
reply_len = p2p_ctrl_connect(wpa_s, buf + 12, reply,
|
|
|
|
reply_size);
|
|
|
|
} else if (os_strncmp(buf, "P2P_LISTEN ", 11) == 0) {
|
|
|
|
if (p2p_ctrl_listen(wpa_s, buf + 11))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "P2P_LISTEN") == 0) {
|
|
|
|
if (p2p_ctrl_listen(wpa_s, ""))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "P2P_GROUP_REMOVE ", 17) == 0) {
|
|
|
|
if (wpas_p2p_group_remove(wpa_s, buf + 17))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "P2P_GROUP_ADD") == 0) {
|
2013-10-27 13:46:17 -04:00
|
|
|
if (wpas_p2p_group_add(wpa_s, 0, 0, 0, 0))
|
2010-07-18 17:30:25 -04:00
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "P2P_GROUP_ADD ", 14) == 0) {
|
|
|
|
if (p2p_ctrl_group_add(wpa_s, buf + 14))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "P2P_PROV_DISC ", 14) == 0) {
|
|
|
|
if (p2p_ctrl_prov_disc(wpa_s, buf + 14))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "P2P_GET_PASSPHRASE") == 0) {
|
|
|
|
reply_len = p2p_get_passphrase(wpa_s, reply, reply_size);
|
|
|
|
} else if (os_strncmp(buf, "P2P_SERV_DISC_REQ ", 18) == 0) {
|
|
|
|
reply_len = p2p_ctrl_serv_disc_req(wpa_s, buf + 18, reply,
|
|
|
|
reply_size);
|
|
|
|
} else if (os_strncmp(buf, "P2P_SERV_DISC_CANCEL_REQ ", 25) == 0) {
|
|
|
|
if (p2p_ctrl_serv_disc_cancel_req(wpa_s, buf + 25) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "P2P_SERV_DISC_RESP ", 19) == 0) {
|
|
|
|
if (p2p_ctrl_serv_disc_resp(wpa_s, buf + 19) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "P2P_SERVICE_UPDATE") == 0) {
|
|
|
|
wpas_p2p_sd_service_update(wpa_s);
|
|
|
|
} else if (os_strncmp(buf, "P2P_SERV_DISC_EXTERNAL ", 23) == 0) {
|
|
|
|
if (p2p_ctrl_serv_disc_external(wpa_s, buf + 23) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "P2P_SERVICE_FLUSH") == 0) {
|
|
|
|
wpas_p2p_service_flush(wpa_s);
|
|
|
|
} else if (os_strncmp(buf, "P2P_SERVICE_ADD ", 16) == 0) {
|
|
|
|
if (p2p_ctrl_service_add(wpa_s, buf + 16) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "P2P_SERVICE_DEL ", 16) == 0) {
|
|
|
|
if (p2p_ctrl_service_del(wpa_s, buf + 16) < 0)
|
|
|
|
reply_len = -1;
|
2014-12-09 09:02:50 -05:00
|
|
|
} else if (os_strncmp(buf, "P2P_SERVICE_REP ", 16) == 0) {
|
|
|
|
if (p2p_ctrl_service_replace(wpa_s, buf + 16) < 0)
|
|
|
|
reply_len = -1;
|
2010-07-18 17:30:25 -04:00
|
|
|
} else if (os_strncmp(buf, "P2P_REJECT ", 11) == 0) {
|
|
|
|
if (p2p_ctrl_reject(wpa_s, buf + 11) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "P2P_INVITE ", 11) == 0) {
|
|
|
|
if (p2p_ctrl_invite(wpa_s, buf + 11) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "P2P_PEER ", 9) == 0) {
|
|
|
|
reply_len = p2p_ctrl_peer(wpa_s, buf + 9, reply,
|
|
|
|
reply_size);
|
|
|
|
} else if (os_strncmp(buf, "P2P_SET ", 8) == 0) {
|
|
|
|
if (p2p_ctrl_set(wpa_s, buf + 8) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "P2P_FLUSH") == 0) {
|
2013-03-31 13:31:07 -04:00
|
|
|
p2p_ctrl_flush(wpa_s);
|
2010-11-25 06:09:50 -05:00
|
|
|
} else if (os_strncmp(buf, "P2P_UNAUTHORIZE ", 16) == 0) {
|
|
|
|
if (wpas_p2p_unauthorize(wpa_s, buf + 16) < 0)
|
|
|
|
reply_len = -1;
|
2010-10-19 08:53:28 -04:00
|
|
|
} else if (os_strcmp(buf, "P2P_CANCEL") == 0) {
|
|
|
|
if (wpas_p2p_cancel(wpa_s))
|
|
|
|
reply_len = -1;
|
2010-07-18 17:30:25 -04:00
|
|
|
} else if (os_strncmp(buf, "P2P_PRESENCE_REQ ", 17) == 0) {
|
|
|
|
if (p2p_ctrl_presence_req(wpa_s, buf + 17) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "P2P_PRESENCE_REQ") == 0) {
|
|
|
|
if (p2p_ctrl_presence_req(wpa_s, "") < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "P2P_EXT_LISTEN ", 15) == 0) {
|
|
|
|
if (p2p_ctrl_ext_listen(wpa_s, buf + 15) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "P2P_EXT_LISTEN") == 0) {
|
|
|
|
if (p2p_ctrl_ext_listen(wpa_s, "") < 0)
|
|
|
|
reply_len = -1;
|
2013-09-01 10:37:22 -04:00
|
|
|
} else if (os_strncmp(buf, "P2P_REMOVE_CLIENT ", 18) == 0) {
|
|
|
|
if (p2p_ctrl_remove_client(wpa_s, buf + 18) < 0)
|
|
|
|
reply_len = -1;
|
2010-07-18 17:30:25 -04:00
|
|
|
#endif /* CONFIG_P2P */
|
2012-03-02 10:26:01 -05:00
|
|
|
#ifdef CONFIG_WIFI_DISPLAY
|
|
|
|
} else if (os_strncmp(buf, "WFD_SUBELEM_SET ", 16) == 0) {
|
|
|
|
if (wifi_display_subelem_set(wpa_s->global, buf + 16) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "WFD_SUBELEM_GET ", 16) == 0) {
|
|
|
|
reply_len = wifi_display_subelem_get(wpa_s->global, buf + 16,
|
|
|
|
reply, reply_size);
|
|
|
|
#endif /* CONFIG_WIFI_DISPLAY */
|
2011-10-16 15:44:28 -04:00
|
|
|
#ifdef CONFIG_INTERWORKING
|
|
|
|
} else if (os_strcmp(buf, "FETCH_ANQP") == 0) {
|
|
|
|
if (interworking_fetch_anqp(wpa_s) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "STOP_FETCH_ANQP") == 0) {
|
|
|
|
interworking_stop_fetch_anqp(wpa_s);
|
2014-01-05 05:25:13 -05:00
|
|
|
} else if (os_strcmp(buf, "INTERWORKING_SELECT") == 0) {
|
|
|
|
if (ctrl_interworking_select(wpa_s, NULL) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "INTERWORKING_SELECT ", 20) == 0) {
|
|
|
|
if (ctrl_interworking_select(wpa_s, buf + 20) < 0)
|
2011-10-04 15:13:22 -04:00
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "INTERWORKING_CONNECT ", 21) == 0) {
|
|
|
|
if (ctrl_interworking_connect(wpa_s, buf + 21) < 0)
|
|
|
|
reply_len = -1;
|
2011-10-16 15:44:28 -04:00
|
|
|
} else if (os_strncmp(buf, "ANQP_GET ", 9) == 0) {
|
|
|
|
if (get_anqp(wpa_s, buf + 9) < 0)
|
|
|
|
reply_len = -1;
|
2012-08-27 11:13:10 -04:00
|
|
|
} else if (os_strncmp(buf, "GAS_REQUEST ", 12) == 0) {
|
|
|
|
if (gas_request(wpa_s, buf + 12) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "GAS_RESPONSE_GET ", 17) == 0) {
|
|
|
|
reply_len = gas_response_get(wpa_s, buf + 17, reply,
|
|
|
|
reply_size);
|
2011-10-16 15:44:28 -04:00
|
|
|
#endif /* CONFIG_INTERWORKING */
|
2011-09-08 13:52:23 -04:00
|
|
|
#ifdef CONFIG_HS20
|
|
|
|
} else if (os_strncmp(buf, "HS20_ANQP_GET ", 14) == 0) {
|
|
|
|
if (get_hs20_anqp(wpa_s, buf + 14) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "HS20_GET_NAI_HOME_REALM_LIST ", 29) == 0) {
|
|
|
|
if (hs20_get_nai_home_realm_list(wpa_s, buf + 29) < 0)
|
|
|
|
reply_len = -1;
|
2012-12-20 14:15:05 -05:00
|
|
|
} else if (os_strncmp(buf, "HS20_ICON_REQUEST ", 18) == 0) {
|
|
|
|
if (hs20_icon_request(wpa_s, buf + 18) < 0)
|
|
|
|
reply_len = -1;
|
2013-01-25 17:10:41 -05:00
|
|
|
} else if (os_strcmp(buf, "FETCH_OSU") == 0) {
|
|
|
|
if (hs20_fetch_osu(wpa_s) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "CANCEL_FETCH_OSU") == 0) {
|
|
|
|
hs20_cancel_fetch_osu(wpa_s);
|
2011-09-08 13:52:23 -04:00
|
|
|
#endif /* CONFIG_HS20 */
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strncmp(buf, WPA_CTRL_RSP, os_strlen(WPA_CTRL_RSP)) == 0)
|
|
|
|
{
|
|
|
|
if (wpa_supplicant_ctrl_iface_ctrl_rsp(
|
|
|
|
wpa_s, buf + os_strlen(WPA_CTRL_RSP)))
|
|
|
|
reply_len = -1;
|
2013-10-19 09:26:01 -04:00
|
|
|
else {
|
|
|
|
/*
|
|
|
|
* Notify response from timeout to allow the control
|
|
|
|
* interface response to be sent first.
|
|
|
|
*/
|
|
|
|
eloop_register_timeout(0, 0, wpas_ctrl_eapol_response,
|
|
|
|
wpa_s, NULL);
|
|
|
|
}
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strcmp(buf, "RECONFIGURE") == 0) {
|
|
|
|
if (wpa_supplicant_reload_configuration(wpa_s))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "TERMINATE") == 0) {
|
2009-12-19 16:47:54 -05:00
|
|
|
wpa_supplicant_terminate_proc(wpa_s->global);
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strncmp(buf, "BSSID ", 6) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_bssid(wpa_s, buf + 6))
|
|
|
|
reply_len = -1;
|
2011-10-18 13:11:52 -04:00
|
|
|
} else if (os_strncmp(buf, "BLACKLIST", 9) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_blacklist(
|
|
|
|
wpa_s, buf + 9, reply, reply_size);
|
2011-10-18 13:16:38 -04:00
|
|
|
} else if (os_strncmp(buf, "LOG_LEVEL", 9) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_log_level(
|
|
|
|
wpa_s, buf + 9, reply, reply_size);
|
2014-12-02 13:59:29 -05:00
|
|
|
} else if (os_strncmp(buf, "LIST_NETWORKS ", 14) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_list_networks(
|
|
|
|
wpa_s, buf + 14, reply, reply_size);
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strcmp(buf, "LIST_NETWORKS") == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_list_networks(
|
2014-12-02 13:59:29 -05:00
|
|
|
wpa_s, NULL, reply, reply_size);
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strcmp(buf, "DISCONNECT") == 0) {
|
2012-03-23 19:12:07 -04:00
|
|
|
#ifdef CONFIG_SME
|
|
|
|
wpa_s->sme.prev_bssid_set = 0;
|
|
|
|
#endif /* CONFIG_SME */
|
2008-02-27 20:34:43 -05:00
|
|
|
wpa_s->reassociate = 0;
|
|
|
|
wpa_s->disconnected = 1;
|
2011-11-28 09:35:30 -05:00
|
|
|
wpa_supplicant_cancel_sched_scan(wpa_s);
|
2012-06-26 12:57:03 -04:00
|
|
|
wpa_supplicant_cancel_scan(wpa_s);
|
2010-04-11 12:27:41 -04:00
|
|
|
wpa_supplicant_deauthenticate(wpa_s,
|
|
|
|
WLAN_REASON_DEAUTH_LEAVING);
|
2013-12-25 13:04:52 -05:00
|
|
|
} else if (os_strcmp(buf, "SCAN") == 0) {
|
|
|
|
wpas_ctrl_scan(wpa_s, NULL, reply, reply_size, &reply_len);
|
|
|
|
} else if (os_strncmp(buf, "SCAN ", 5) == 0) {
|
|
|
|
wpas_ctrl_scan(wpa_s, buf + 5, reply, reply_size, &reply_len);
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strcmp(buf, "SCAN_RESULTS") == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_scan_results(
|
|
|
|
wpa_s, reply, reply_size);
|
|
|
|
} else if (os_strncmp(buf, "SELECT_NETWORK ", 15) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_select_network(wpa_s, buf + 15))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "ENABLE_NETWORK ", 15) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_enable_network(wpa_s, buf + 15))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "DISABLE_NETWORK ", 16) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_disable_network(wpa_s, buf + 16))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "ADD_NETWORK") == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_add_network(
|
|
|
|
wpa_s, reply, reply_size);
|
|
|
|
} else if (os_strncmp(buf, "REMOVE_NETWORK ", 15) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_remove_network(wpa_s, buf + 15))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "SET_NETWORK ", 12) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_set_network(wpa_s, buf + 12))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "GET_NETWORK ", 12) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_get_network(
|
|
|
|
wpa_s, buf + 12, reply, reply_size);
|
2014-04-29 16:41:47 -04:00
|
|
|
} else if (os_strncmp(buf, "DUP_NETWORK ", 12) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_dup_network(wpa_s, buf + 12))
|
|
|
|
reply_len = -1;
|
2012-02-16 09:36:00 -05:00
|
|
|
} else if (os_strcmp(buf, "LIST_CREDS") == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_list_creds(
|
|
|
|
wpa_s, reply, reply_size);
|
|
|
|
} else if (os_strcmp(buf, "ADD_CRED") == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_add_cred(
|
|
|
|
wpa_s, reply, reply_size);
|
|
|
|
} else if (os_strncmp(buf, "REMOVE_CRED ", 12) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_remove_cred(wpa_s, buf + 12))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "SET_CRED ", 9) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_set_cred(wpa_s, buf + 9))
|
|
|
|
reply_len = -1;
|
2014-04-04 13:10:49 -04:00
|
|
|
} else if (os_strncmp(buf, "GET_CRED ", 9) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_get_cred(wpa_s, buf + 9,
|
|
|
|
reply,
|
|
|
|
reply_size);
|
2008-02-27 20:34:43 -05:00
|
|
|
#ifndef CONFIG_NO_CONFIG_WRITE
|
|
|
|
} else if (os_strcmp(buf, "SAVE_CONFIG") == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_save_config(wpa_s))
|
|
|
|
reply_len = -1;
|
|
|
|
#endif /* CONFIG_NO_CONFIG_WRITE */
|
|
|
|
} else if (os_strncmp(buf, "GET_CAPABILITY ", 15) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_get_capability(
|
|
|
|
wpa_s, buf + 15, reply, reply_size);
|
|
|
|
} else if (os_strncmp(buf, "AP_SCAN ", 8) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_ap_scan(wpa_s, buf + 8))
|
|
|
|
reply_len = -1;
|
2011-04-11 16:14:38 -04:00
|
|
|
} else if (os_strncmp(buf, "SCAN_INTERVAL ", 14) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_scan_interval(wpa_s, buf + 14))
|
|
|
|
reply_len = -1;
|
2008-12-24 13:25:19 -05:00
|
|
|
} else if (os_strcmp(buf, "INTERFACE_LIST") == 0) {
|
|
|
|
reply_len = wpa_supplicant_global_iface_list(
|
|
|
|
wpa_s->global, reply, reply_size);
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strcmp(buf, "INTERFACES") == 0) {
|
|
|
|
reply_len = wpa_supplicant_global_iface_interfaces(
|
|
|
|
wpa_s->global, reply, reply_size);
|
|
|
|
} else if (os_strncmp(buf, "BSS ", 4) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_bss(
|
|
|
|
wpa_s, buf + 4, reply, reply_size);
|
2009-09-08 05:58:02 -04:00
|
|
|
#ifdef CONFIG_AP
|
|
|
|
} else if (os_strcmp(buf, "STA-FIRST") == 0) {
|
|
|
|
reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size);
|
|
|
|
} else if (os_strncmp(buf, "STA ", 4) == 0) {
|
|
|
|
reply_len = ap_ctrl_iface_sta(wpa_s, buf + 4, reply,
|
|
|
|
reply_size);
|
|
|
|
} else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
|
|
|
|
reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply,
|
|
|
|
reply_size);
|
2012-02-25 10:22:48 -05:00
|
|
|
} else if (os_strncmp(buf, "DEAUTHENTICATE ", 15) == 0) {
|
|
|
|
if (ap_ctrl_iface_sta_deauthenticate(wpa_s, buf + 15))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "DISASSOCIATE ", 13) == 0) {
|
|
|
|
if (ap_ctrl_iface_sta_disassociate(wpa_s, buf + 13))
|
|
|
|
reply_len = -1;
|
2013-11-14 05:28:32 -05:00
|
|
|
} else if (os_strncmp(buf, "CHAN_SWITCH ", 12) == 0) {
|
|
|
|
if (ap_ctrl_iface_chanswitch(wpa_s, buf + 12))
|
|
|
|
reply_len = -1;
|
2009-09-08 05:58:02 -04:00
|
|
|
#endif /* CONFIG_AP */
|
2010-02-27 11:46:02 -05:00
|
|
|
} else if (os_strcmp(buf, "SUSPEND") == 0) {
|
|
|
|
wpas_notify_suspend(wpa_s->global);
|
|
|
|
} else if (os_strcmp(buf, "RESUME") == 0) {
|
|
|
|
wpas_notify_resume(wpa_s->global);
|
2014-04-05 16:59:31 -04:00
|
|
|
#ifdef CONFIG_TESTING_OPTIONS
|
2010-03-29 18:42:04 -04:00
|
|
|
} else if (os_strcmp(buf, "DROP_SA") == 0) {
|
|
|
|
wpa_supplicant_ctrl_iface_drop_sa(wpa_s);
|
2014-04-05 16:59:31 -04:00
|
|
|
#endif /* CONFIG_TESTING_OPTIONS */
|
2010-04-10 15:56:55 -04:00
|
|
|
} else if (os_strncmp(buf, "ROAM ", 5) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_roam(wpa_s, buf + 5))
|
|
|
|
reply_len = -1;
|
2010-09-06 10:28:45 -04:00
|
|
|
} else if (os_strncmp(buf, "STA_AUTOCONNECT ", 16) == 0) {
|
2014-12-13 12:27:41 -05:00
|
|
|
wpa_s->auto_reconnect_disabled = atoi(buf + 16) == 0;
|
2011-03-20 06:40:59 -04:00
|
|
|
} else if (os_strncmp(buf, "BSS_EXPIRE_AGE ", 15) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_bss_expire_age(wpa_s, buf + 15))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "BSS_EXPIRE_COUNT ", 17) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_bss_expire_count(wpa_s,
|
|
|
|
buf + 17))
|
|
|
|
reply_len = -1;
|
2012-08-25 03:23:22 -04:00
|
|
|
} else if (os_strncmp(buf, "BSS_FLUSH ", 10) == 0) {
|
2014-12-13 12:22:23 -05:00
|
|
|
wpa_supplicant_ctrl_iface_bss_flush(wpa_s, buf + 10);
|
2010-10-07 03:26:56 -04:00
|
|
|
#ifdef CONFIG_TDLS
|
|
|
|
} else if (os_strncmp(buf, "TDLS_DISCOVER ", 14) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_tdls_discover(wpa_s, buf + 14))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "TDLS_SETUP ", 11) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_tdls_setup(wpa_s, buf + 11))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "TDLS_TEARDOWN ", 14) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_tdls_teardown(wpa_s, buf + 14))
|
|
|
|
reply_len = -1;
|
2014-12-29 00:20:51 -05:00
|
|
|
} else if (os_strncmp(buf, "TDLS_CHAN_SWITCH ", 17) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_tdls_chan_switch(wpa_s,
|
|
|
|
buf + 17))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "TDLS_CANCEL_CHAN_SWITCH ", 24) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_tdls_cancel_chan_switch(wpa_s,
|
|
|
|
buf + 24))
|
|
|
|
reply_len = -1;
|
2010-10-07 03:26:56 -04:00
|
|
|
#endif /* CONFIG_TDLS */
|
2014-10-22 08:04:02 -04:00
|
|
|
} else if (os_strcmp(buf, "WMM_AC_STATUS") == 0) {
|
|
|
|
reply_len = wpas_wmm_ac_status(wpa_s, reply, reply_size);
|
2014-10-22 08:03:59 -04:00
|
|
|
} else if (os_strncmp(buf, "WMM_AC_ADDTS ", 13) == 0) {
|
|
|
|
if (wmm_ac_ctrl_addts(wpa_s, buf + 13))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "WMM_AC_DELTS ", 13) == 0) {
|
|
|
|
if (wmm_ac_ctrl_delts(wpa_s, buf + 13))
|
|
|
|
reply_len = -1;
|
2011-04-15 11:52:01 -04:00
|
|
|
} else if (os_strncmp(buf, "SIGNAL_POLL", 11) == 0) {
|
|
|
|
reply_len = wpa_supplicant_signal_poll(wpa_s, reply,
|
|
|
|
reply_size);
|
2012-09-05 10:02:02 -04:00
|
|
|
} else if (os_strncmp(buf, "PKTCNT_POLL", 11) == 0) {
|
|
|
|
reply_len = wpa_supplicant_pktcnt_poll(wpa_s, reply,
|
|
|
|
reply_size);
|
2012-06-26 12:09:47 -04:00
|
|
|
#ifdef CONFIG_AUTOSCAN
|
|
|
|
} else if (os_strncmp(buf, "AUTOSCAN ", 9) == 0) {
|
|
|
|
if (wpa_supplicant_ctrl_iface_autoscan(wpa_s, buf + 9))
|
|
|
|
reply_len = -1;
|
|
|
|
#endif /* CONFIG_AUTOSCAN */
|
2013-11-07 09:16:15 -05:00
|
|
|
#ifdef ANDROID
|
|
|
|
} else if (os_strncmp(buf, "DRIVER ", 7) == 0) {
|
|
|
|
reply_len = wpa_supplicant_driver_cmd(wpa_s, buf + 7, reply,
|
|
|
|
reply_size);
|
|
|
|
#endif /* ANDROID */
|
2014-03-03 06:09:50 -05:00
|
|
|
} else if (os_strncmp(buf, "VENDOR ", 7) == 0) {
|
|
|
|
reply_len = wpa_supplicant_vendor_cmd(wpa_s, buf + 7, reply,
|
|
|
|
reply_size);
|
2011-11-13 12:47:51 -05:00
|
|
|
} else if (os_strcmp(buf, "REAUTHENTICATE") == 0) {
|
2012-11-25 15:05:32 -05:00
|
|
|
pmksa_cache_clear_current(wpa_s->wpa);
|
2011-11-13 12:47:51 -05:00
|
|
|
eapol_sm_request_reauth(wpa_s->eapol);
|
2012-12-16 05:29:10 -05:00
|
|
|
#ifdef CONFIG_WNM
|
|
|
|
} else if (os_strncmp(buf, "WNM_SLEEP ", 10) == 0) {
|
|
|
|
if (wpas_ctrl_iface_wnm_sleep(wpa_s, buf + 10))
|
|
|
|
reply_len = -1;
|
2015-01-18 20:44:04 -05:00
|
|
|
} else if (os_strncmp(buf, "WNM_BSS_QUERY ", 14) == 0) {
|
|
|
|
if (wpas_ctrl_iface_wnm_bss_query(wpa_s, buf + 14))
|
2013-05-16 10:50:31 -04:00
|
|
|
reply_len = -1;
|
2012-12-16 05:29:10 -05:00
|
|
|
#endif /* CONFIG_WNM */
|
2013-03-31 13:31:07 -04:00
|
|
|
} else if (os_strcmp(buf, "FLUSH") == 0) {
|
|
|
|
wpa_supplicant_ctrl_iface_flush(wpa_s);
|
2014-01-04 06:10:41 -05:00
|
|
|
} else if (os_strncmp(buf, "RADIO_WORK ", 11) == 0) {
|
|
|
|
reply_len = wpas_ctrl_radio_work(wpa_s, buf + 11, reply,
|
|
|
|
reply_size);
|
2014-03-08 13:21:21 -05:00
|
|
|
#ifdef CONFIG_TESTING_OPTIONS
|
|
|
|
} else if (os_strncmp(buf, "MGMT_TX ", 8) == 0) {
|
|
|
|
if (wpas_ctrl_iface_mgmt_tx(wpa_s, buf + 8) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "MGMT_TX_DONE") == 0) {
|
|
|
|
wpas_ctrl_iface_mgmt_tx_done(wpa_s);
|
2014-05-15 14:09:48 -04:00
|
|
|
} else if (os_strncmp(buf, "DRIVER_EVENT ", 13) == 0) {
|
|
|
|
if (wpas_ctrl_iface_driver_event(wpa_s, buf + 13) < 0)
|
|
|
|
reply_len = -1;
|
2014-10-10 11:01:15 -04:00
|
|
|
} else if (os_strncmp(buf, "EAPOL_RX ", 9) == 0) {
|
|
|
|
if (wpas_ctrl_iface_eapol_rx(wpa_s, buf + 9) < 0)
|
|
|
|
reply_len = -1;
|
2014-10-19 13:51:45 -04:00
|
|
|
} else if (os_strncmp(buf, "DATA_TEST_CONFIG ", 17) == 0) {
|
|
|
|
if (wpas_ctrl_iface_data_test_config(wpa_s, buf + 17) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "DATA_TEST_TX ", 13) == 0) {
|
|
|
|
if (wpas_ctrl_iface_data_test_tx(wpa_s, buf + 13) < 0)
|
|
|
|
reply_len = -1;
|
2014-11-27 16:51:46 -05:00
|
|
|
} else if (os_strncmp(buf, "DATA_TEST_FRAME ", 16) == 0) {
|
|
|
|
if (wpas_ctrl_iface_data_test_frame(wpa_s, buf + 16) < 0)
|
|
|
|
reply_len = -1;
|
2015-01-05 13:30:28 -05:00
|
|
|
} else if (os_strncmp(buf, "TEST_ALLOC_FAIL ", 16) == 0) {
|
|
|
|
if (wpas_ctrl_test_alloc_fail(wpa_s, buf + 16) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strcmp(buf, "GET_ALLOC_FAIL") == 0) {
|
|
|
|
reply_len = wpas_ctrl_get_alloc_fail(wpa_s, reply, reply_size);
|
2014-03-08 13:21:21 -05:00
|
|
|
#endif /* CONFIG_TESTING_OPTIONS */
|
2014-07-04 11:23:43 -04:00
|
|
|
} else if (os_strncmp(buf, "VENDOR_ELEM_ADD ", 16) == 0) {
|
|
|
|
if (wpas_ctrl_vendor_elem_add(wpa_s, buf + 16) < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "VENDOR_ELEM_GET ", 16) == 0) {
|
|
|
|
reply_len = wpas_ctrl_vendor_elem_get(wpa_s, buf + 16, reply,
|
|
|
|
reply_size);
|
|
|
|
} else if (os_strncmp(buf, "VENDOR_ELEM_REMOVE ", 19) == 0) {
|
|
|
|
if (wpas_ctrl_vendor_elem_remove(wpa_s, buf + 19) < 0)
|
|
|
|
reply_len = -1;
|
2014-11-05 03:42:51 -05:00
|
|
|
} else if (os_strncmp(buf, "NEIGHBOR_REP_REQUEST", 20) == 0) {
|
2014-11-05 03:42:53 -05:00
|
|
|
if (wpas_ctrl_iface_send_neigbor_rep(wpa_s, buf + 20))
|
2014-11-05 03:42:51 -05:00
|
|
|
reply_len = -1;
|
2014-11-30 18:11:29 -05:00
|
|
|
} else if (os_strcmp(buf, "ERP_FLUSH") == 0) {
|
|
|
|
wpas_ctrl_iface_erp_flush(wpa_s);
|
2014-12-29 01:41:07 -05:00
|
|
|
} else if (os_strncmp(buf, "MAC_RAND_SCAN ", 14) == 0) {
|
|
|
|
if (wpas_ctrl_iface_mac_rand_scan(wpa_s, buf + 14))
|
|
|
|
reply_len = -1;
|
2008-02-27 20:34:43 -05:00
|
|
|
} else {
|
|
|
|
os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
|
|
|
|
reply_len = 16;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (reply_len < 0) {
|
|
|
|
os_memcpy(reply, "FAIL\n", 5);
|
|
|
|
reply_len = 5;
|
|
|
|
}
|
|
|
|
|
|
|
|
*resp_len = reply_len;
|
|
|
|
return reply;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_global_iface_add(struct wpa_global *global,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
struct wpa_interface iface;
|
|
|
|
char *pos;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* <ifname>TAB<confname>TAB<driver>TAB<ctrl_interface>TAB<driver_param>
|
|
|
|
* TAB<bridge_ifname>
|
|
|
|
*/
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE GLOBAL INTERFACE_ADD '%s'", cmd);
|
|
|
|
|
|
|
|
os_memset(&iface, 0, sizeof(iface));
|
|
|
|
|
|
|
|
do {
|
|
|
|
iface.ifname = pos = cmd;
|
|
|
|
pos = os_strchr(pos, '\t');
|
|
|
|
if (pos)
|
|
|
|
*pos++ = '\0';
|
|
|
|
if (iface.ifname[0] == '\0')
|
|
|
|
return -1;
|
|
|
|
if (pos == NULL)
|
|
|
|
break;
|
|
|
|
|
|
|
|
iface.confname = pos;
|
|
|
|
pos = os_strchr(pos, '\t');
|
|
|
|
if (pos)
|
|
|
|
*pos++ = '\0';
|
|
|
|
if (iface.confname[0] == '\0')
|
|
|
|
iface.confname = NULL;
|
|
|
|
if (pos == NULL)
|
|
|
|
break;
|
|
|
|
|
|
|
|
iface.driver = pos;
|
|
|
|
pos = os_strchr(pos, '\t');
|
|
|
|
if (pos)
|
|
|
|
*pos++ = '\0';
|
|
|
|
if (iface.driver[0] == '\0')
|
|
|
|
iface.driver = NULL;
|
|
|
|
if (pos == NULL)
|
|
|
|
break;
|
|
|
|
|
|
|
|
iface.ctrl_interface = pos;
|
|
|
|
pos = os_strchr(pos, '\t');
|
|
|
|
if (pos)
|
|
|
|
*pos++ = '\0';
|
|
|
|
if (iface.ctrl_interface[0] == '\0')
|
|
|
|
iface.ctrl_interface = NULL;
|
|
|
|
if (pos == NULL)
|
|
|
|
break;
|
|
|
|
|
|
|
|
iface.driver_param = pos;
|
|
|
|
pos = os_strchr(pos, '\t');
|
|
|
|
if (pos)
|
|
|
|
*pos++ = '\0';
|
|
|
|
if (iface.driver_param[0] == '\0')
|
|
|
|
iface.driver_param = NULL;
|
|
|
|
if (pos == NULL)
|
|
|
|
break;
|
|
|
|
|
|
|
|
iface.bridge_ifname = pos;
|
|
|
|
pos = os_strchr(pos, '\t');
|
|
|
|
if (pos)
|
|
|
|
*pos++ = '\0';
|
|
|
|
if (iface.bridge_ifname[0] == '\0')
|
|
|
|
iface.bridge_ifname = NULL;
|
|
|
|
if (pos == NULL)
|
|
|
|
break;
|
|
|
|
} while (0);
|
|
|
|
|
|
|
|
if (wpa_supplicant_get_iface(global, iface.ifname))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return wpa_supplicant_add_iface(global, &iface) ? 0 : -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_global_iface_remove(struct wpa_global *global,
|
|
|
|
char *cmd)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s;
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "CTRL_IFACE GLOBAL INTERFACE_REMOVE '%s'", cmd);
|
|
|
|
|
|
|
|
wpa_s = wpa_supplicant_get_iface(global, cmd);
|
|
|
|
if (wpa_s == NULL)
|
|
|
|
return -1;
|
2012-01-29 13:15:48 -05:00
|
|
|
return wpa_supplicant_remove_iface(global, wpa_s, 0);
|
2008-02-27 20:34:43 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-12-24 13:25:19 -05:00
|
|
|
static void wpa_free_iface_info(struct wpa_interface_info *iface)
|
|
|
|
{
|
|
|
|
struct wpa_interface_info *prev;
|
|
|
|
|
|
|
|
while (iface) {
|
|
|
|
prev = iface;
|
|
|
|
iface = iface->next;
|
|
|
|
|
|
|
|
os_free(prev->ifname);
|
|
|
|
os_free(prev->desc);
|
|
|
|
os_free(prev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_global_iface_list(struct wpa_global *global,
|
|
|
|
char *buf, int len)
|
|
|
|
{
|
|
|
|
int i, res;
|
|
|
|
struct wpa_interface_info *iface = NULL, *last = NULL, *tmp;
|
|
|
|
char *pos, *end;
|
|
|
|
|
2009-04-09 06:40:12 -04:00
|
|
|
for (i = 0; wpa_drivers[i]; i++) {
|
|
|
|
struct wpa_driver_ops *drv = wpa_drivers[i];
|
2008-12-24 13:25:19 -05:00
|
|
|
if (drv->get_interfaces == NULL)
|
|
|
|
continue;
|
2010-04-14 09:38:53 -04:00
|
|
|
tmp = drv->get_interfaces(global->drv_priv[i]);
|
2008-12-24 13:25:19 -05:00
|
|
|
if (tmp == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (last == NULL)
|
|
|
|
iface = last = tmp;
|
|
|
|
else
|
|
|
|
last->next = tmp;
|
|
|
|
while (last->next)
|
|
|
|
last = last->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = buf + len;
|
|
|
|
for (tmp = iface; tmp; tmp = tmp->next) {
|
|
|
|
res = os_snprintf(pos, end - pos, "%s\t%s\t%s\n",
|
|
|
|
tmp->drv_name, tmp->ifname,
|
|
|
|
tmp->desc ? tmp->desc : "");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, res)) {
|
2008-12-24 13:25:19 -05:00
|
|
|
*pos = '\0';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
pos += res;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_free_iface_info(iface);
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
static int wpa_supplicant_global_iface_interfaces(struct wpa_global *global,
|
|
|
|
char *buf, int len)
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
char *pos, *end;
|
|
|
|
struct wpa_supplicant *wpa_s;
|
|
|
|
|
|
|
|
wpa_s = global->ifaces;
|
|
|
|
pos = buf;
|
|
|
|
end = buf + len;
|
|
|
|
|
|
|
|
while (wpa_s) {
|
|
|
|
res = os_snprintf(pos, end - pos, "%s\n", wpa_s->ifname);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, res)) {
|
2008-02-27 20:34:43 -05:00
|
|
|
*pos = '\0';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
pos += res;
|
|
|
|
wpa_s = wpa_s->next;
|
|
|
|
}
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-05-18 03:19:38 -04:00
|
|
|
static char * wpas_global_ctrl_iface_ifname(struct wpa_global *global,
|
|
|
|
const char *ifname,
|
|
|
|
char *cmd, size_t *resp_len)
|
|
|
|
{
|
|
|
|
struct wpa_supplicant *wpa_s;
|
|
|
|
|
|
|
|
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
|
|
|
|
if (os_strcmp(ifname, wpa_s->ifname) == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa_s == NULL) {
|
|
|
|
char *resp = os_strdup("FAIL-NO-IFNAME-MATCH\n");
|
|
|
|
if (resp)
|
|
|
|
*resp_len = os_strlen(resp);
|
|
|
|
else
|
|
|
|
*resp_len = 1;
|
|
|
|
return resp;
|
|
|
|
}
|
|
|
|
|
|
|
|
return wpa_supplicant_ctrl_iface_process(wpa_s, cmd, resp_len);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-05-18 12:41:08 -04:00
|
|
|
static char * wpas_global_ctrl_iface_redir_p2p(struct wpa_global *global,
|
|
|
|
char *buf, size_t *resp_len)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
static const char * cmd[] = {
|
2014-01-15 13:27:19 -05:00
|
|
|
"LIST_NETWORKS",
|
2013-05-18 12:41:08 -04:00
|
|
|
"P2P_FIND",
|
|
|
|
"P2P_STOP_FIND",
|
|
|
|
"P2P_LISTEN",
|
|
|
|
"P2P_GROUP_ADD",
|
|
|
|
"P2P_GET_PASSPHRASE",
|
|
|
|
"P2P_SERVICE_UPDATE",
|
|
|
|
"P2P_SERVICE_FLUSH",
|
|
|
|
"P2P_FLUSH",
|
|
|
|
"P2P_CANCEL",
|
|
|
|
"P2P_PRESENCE_REQ",
|
|
|
|
"P2P_EXT_LISTEN",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
static const char * prefix[] = {
|
2014-01-15 13:27:19 -05:00
|
|
|
#ifdef ANDROID
|
|
|
|
"DRIVER ",
|
|
|
|
#endif /* ANDROID */
|
|
|
|
"GET_NETWORK ",
|
|
|
|
"REMOVE_NETWORK ",
|
2013-05-18 12:41:08 -04:00
|
|
|
"P2P_FIND ",
|
|
|
|
"P2P_CONNECT ",
|
|
|
|
"P2P_LISTEN ",
|
|
|
|
"P2P_GROUP_REMOVE ",
|
|
|
|
"P2P_GROUP_ADD ",
|
|
|
|
"P2P_PROV_DISC ",
|
|
|
|
"P2P_SERV_DISC_REQ ",
|
|
|
|
"P2P_SERV_DISC_CANCEL_REQ ",
|
|
|
|
"P2P_SERV_DISC_RESP ",
|
|
|
|
"P2P_SERV_DISC_EXTERNAL ",
|
|
|
|
"P2P_SERVICE_ADD ",
|
|
|
|
"P2P_SERVICE_DEL ",
|
|
|
|
"P2P_REJECT ",
|
|
|
|
"P2P_INVITE ",
|
|
|
|
"P2P_PEER ",
|
|
|
|
"P2P_SET ",
|
|
|
|
"P2P_UNAUTHORIZE ",
|
|
|
|
"P2P_PRESENCE_REQ ",
|
|
|
|
"P2P_EXT_LISTEN ",
|
2013-09-01 10:37:22 -04:00
|
|
|
"P2P_REMOVE_CLIENT ",
|
2015-01-18 20:44:06 -05:00
|
|
|
"WPS_NFC_TOKEN ",
|
|
|
|
"WPS_NFC_TAG_READ ",
|
2014-02-26 19:05:21 -05:00
|
|
|
"NFC_GET_HANDOVER_SEL ",
|
|
|
|
"NFC_GET_HANDOVER_REQ ",
|
|
|
|
"NFC_REPORT_HANDOVER ",
|
2013-05-18 12:41:08 -04:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
int found = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (global->p2p_init_wpa_s == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (i = 0; !found && cmd[i]; i++) {
|
|
|
|
if (os_strcmp(buf, cmd[i]) == 0)
|
|
|
|
found = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; !found && prefix[i]; i++) {
|
|
|
|
if (os_strncmp(buf, prefix[i], os_strlen(prefix[i])) == 0)
|
|
|
|
found = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (found)
|
|
|
|
return wpa_supplicant_ctrl_iface_process(global->p2p_init_wpa_s,
|
|
|
|
buf, resp_len);
|
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char * wpas_global_ctrl_iface_redir_wfd(struct wpa_global *global,
|
|
|
|
char *buf, size_t *resp_len)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_WIFI_DISPLAY
|
|
|
|
if (global->p2p_init_wpa_s == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (os_strncmp(buf, "WFD_SUBELEM_SET ", 16) == 0 ||
|
|
|
|
os_strncmp(buf, "WFD_SUBELEM_GET ", 16) == 0)
|
|
|
|
return wpa_supplicant_ctrl_iface_process(global->p2p_init_wpa_s,
|
|
|
|
buf, resp_len);
|
|
|
|
#endif /* CONFIG_WIFI_DISPLAY */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char * wpas_global_ctrl_iface_redir(struct wpa_global *global,
|
|
|
|
char *buf, size_t *resp_len)
|
|
|
|
{
|
|
|
|
char *ret;
|
|
|
|
|
|
|
|
ret = wpas_global_ctrl_iface_redir_p2p(global, buf, resp_len);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
ret = wpas_global_ctrl_iface_redir_wfd(global, buf, resp_len);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-08-25 13:35:19 -04:00
|
|
|
static int wpas_global_ctrl_iface_set(struct wpa_global *global, char *cmd)
|
|
|
|
{
|
|
|
|
char *value;
|
|
|
|
|
|
|
|
value = os_strchr(cmd, ' ');
|
|
|
|
if (value == NULL)
|
|
|
|
return -1;
|
|
|
|
*value++ = '\0';
|
|
|
|
|
|
|
|
wpa_printf(MSG_DEBUG, "GLOBAL_CTRL_IFACE SET '%s'='%s'", cmd, value);
|
|
|
|
|
|
|
|
#ifdef CONFIG_WIFI_DISPLAY
|
|
|
|
if (os_strcasecmp(cmd, "wifi_display") == 0) {
|
|
|
|
wifi_display_enable(global, !!atoi(value));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_WIFI_DISPLAY */
|
|
|
|
|
2014-04-15 06:22:48 -04:00
|
|
|
/* Restore cmd to its original value to allow redirection */
|
|
|
|
value[-1] = ' ';
|
|
|
|
|
2013-08-25 13:35:19 -04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-08-25 13:41:39 -04:00
|
|
|
#ifndef CONFIG_NO_CONFIG_WRITE
|
|
|
|
static int wpas_global_ctrl_iface_save_config(struct wpa_global *global)
|
|
|
|
{
|
2014-04-15 06:15:09 -04:00
|
|
|
int ret = 0, saved = 0;
|
2013-08-25 13:41:39 -04:00
|
|
|
struct wpa_supplicant *wpa_s;
|
|
|
|
|
|
|
|
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
|
|
|
|
if (!wpa_s->conf->update_config) {
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG, "CTRL_IFACE: SAVE_CONFIG - Not allowed to update configuration (update_config=0)");
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa_config_write(wpa_s->confname, wpa_s->conf)) {
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG, "CTRL_IFACE: SAVE_CONFIG - Failed to update configuration");
|
|
|
|
ret = 1;
|
|
|
|
} else {
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG, "CTRL_IFACE: SAVE_CONFIG - Configuration updated");
|
2014-04-15 06:15:09 -04:00
|
|
|
saved++;
|
2013-08-25 13:41:39 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-15 06:15:09 -04:00
|
|
|
if (!saved && !ret) {
|
|
|
|
wpa_dbg(wpa_s, MSG_DEBUG,
|
|
|
|
"CTRL_IFACE: SAVE_CONFIG - No configuration files could be updated");
|
|
|
|
ret = 1;
|
|
|
|
}
|
|
|
|
|
2013-08-25 13:41:39 -04:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_NO_CONFIG_WRITE */
|
|
|
|
|
|
|
|
|
2013-08-25 13:53:58 -04:00
|
|
|
static int wpas_global_ctrl_iface_status(struct wpa_global *global,
|
|
|
|
char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
char *pos, *end;
|
|
|
|
int ret;
|
|
|
|
struct wpa_supplicant *wpa_s;
|
|
|
|
|
|
|
|
pos = buf;
|
|
|
|
end = buf + buflen;
|
|
|
|
|
|
|
|
#ifdef CONFIG_P2P
|
2013-08-25 14:02:12 -04:00
|
|
|
if (global->p2p && !global->p2p_disabled) {
|
2013-08-25 13:53:58 -04:00
|
|
|
ret = os_snprintf(pos, end - pos, "p2p_device_address=" MACSTR
|
2013-08-25 14:02:12 -04:00
|
|
|
"\n"
|
|
|
|
"p2p_state=%s\n",
|
|
|
|
MAC2STR(global->p2p_dev_addr),
|
|
|
|
p2p_get_state_txt(global->p2p));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-08-25 14:02:12 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
} else if (global->p2p) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "p2p_state=DISABLED\n");
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-08-25 13:53:58 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_P2P */
|
|
|
|
|
|
|
|
#ifdef CONFIG_WIFI_DISPLAY
|
|
|
|
ret = os_snprintf(pos, end - pos, "wifi_display=%d\n",
|
|
|
|
!!global->wifi_display);
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-08-25 13:53:58 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
#endif /* CONFIG_WIFI_DISPLAY */
|
|
|
|
|
|
|
|
for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "ifname=%s\n"
|
|
|
|
"address=" MACSTR "\n",
|
|
|
|
wpa_s->ifname, MAC2STR(wpa_s->own_addr));
|
Check os_snprintf() result more consistently - automatic 1
This converts os_snprintf() result validation cases to use
os_snprintf_error() where the exact rule used in os_snprintf_error() was
used. These changes were done automatically with spatch using the
following semantic patch:
@@
identifier E1;
expression E2,E3,E4,E5,E6;
statement S1;
@@
(
E1 = os_snprintf(E2, E3, ...);
|
int E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else
E1 = os_snprintf(E2, E3, ...);
|
if (E5)
E1 = os_snprintf(E2, E3, ...);
else if (E6)
E1 = os_snprintf(E2, E3, ...);
else
E1 = 0;
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else if (E6) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
return -1;
}
|
if (E5) {
...
E1 = os_snprintf(E2, E3, ...);
} else {
...
E1 = os_snprintf(E2, E3, ...);
}
)
? os_free(E4);
- if (E1 < 0 || \( E1 >= E3 \| (size_t) E1 >= E3 \| (unsigned int) E1 >= E3 \| E1 >= (int) E3 \))
+ if (os_snprintf_error(E3, E1))
(
S1
|
{ ... }
)
Signed-off-by: Jouni Malinen <j@w1.fi>
2014-12-08 04:15:51 -05:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2013-08-25 13:53:58 -04:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-27 20:34:43 -05:00
|
|
|
char * wpa_supplicant_global_ctrl_iface_process(struct wpa_global *global,
|
|
|
|
char *buf, size_t *resp_len)
|
|
|
|
{
|
|
|
|
char *reply;
|
|
|
|
const int reply_size = 2048;
|
|
|
|
int reply_len;
|
2011-09-01 11:16:37 -04:00
|
|
|
int level = MSG_DEBUG;
|
2008-02-27 20:34:43 -05:00
|
|
|
|
2013-05-18 03:19:38 -04:00
|
|
|
if (os_strncmp(buf, "IFNAME=", 7) == 0) {
|
|
|
|
char *pos = os_strchr(buf + 7, ' ');
|
|
|
|
if (pos) {
|
|
|
|
*pos++ = '\0';
|
|
|
|
return wpas_global_ctrl_iface_ifname(global,
|
|
|
|
buf + 7, pos,
|
|
|
|
resp_len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-18 12:41:08 -04:00
|
|
|
reply = wpas_global_ctrl_iface_redir(global, buf, resp_len);
|
|
|
|
if (reply)
|
|
|
|
return reply;
|
|
|
|
|
2011-09-01 11:16:37 -04:00
|
|
|
if (os_strcmp(buf, "PING") == 0)
|
|
|
|
level = MSG_EXCESSIVE;
|
|
|
|
wpa_hexdump_ascii(level, "RX global ctrl_iface",
|
2008-02-27 20:34:43 -05:00
|
|
|
(const u8 *) buf, os_strlen(buf));
|
|
|
|
|
|
|
|
reply = os_malloc(reply_size);
|
|
|
|
if (reply == NULL) {
|
|
|
|
*resp_len = 1;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
os_memcpy(reply, "OK\n", 3);
|
|
|
|
reply_len = 3;
|
|
|
|
|
|
|
|
if (os_strcmp(buf, "PING") == 0) {
|
|
|
|
os_memcpy(reply, "PONG\n", 5);
|
|
|
|
reply_len = 5;
|
|
|
|
} else if (os_strncmp(buf, "INTERFACE_ADD ", 14) == 0) {
|
|
|
|
if (wpa_supplicant_global_iface_add(global, buf + 14))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "INTERFACE_REMOVE ", 17) == 0) {
|
|
|
|
if (wpa_supplicant_global_iface_remove(global, buf + 17))
|
|
|
|
reply_len = -1;
|
2008-12-24 13:25:19 -05:00
|
|
|
} else if (os_strcmp(buf, "INTERFACE_LIST") == 0) {
|
|
|
|
reply_len = wpa_supplicant_global_iface_list(
|
|
|
|
global, reply, reply_size);
|
2008-02-27 20:34:43 -05:00
|
|
|
} else if (os_strcmp(buf, "INTERFACES") == 0) {
|
|
|
|
reply_len = wpa_supplicant_global_iface_interfaces(
|
|
|
|
global, reply, reply_size);
|
|
|
|
} else if (os_strcmp(buf, "TERMINATE") == 0) {
|
2009-12-19 16:47:54 -05:00
|
|
|
wpa_supplicant_terminate_proc(global);
|
2010-02-27 11:46:02 -05:00
|
|
|
} else if (os_strcmp(buf, "SUSPEND") == 0) {
|
|
|
|
wpas_notify_suspend(global);
|
|
|
|
} else if (os_strcmp(buf, "RESUME") == 0) {
|
|
|
|
wpas_notify_resume(global);
|
2013-08-25 13:35:19 -04:00
|
|
|
} else if (os_strncmp(buf, "SET ", 4) == 0) {
|
2014-04-15 06:22:48 -04:00
|
|
|
if (wpas_global_ctrl_iface_set(global, buf + 4)) {
|
|
|
|
#ifdef CONFIG_P2P
|
|
|
|
if (global->p2p_init_wpa_s) {
|
|
|
|
os_free(reply);
|
|
|
|
/* Check if P2P redirection would work for this
|
|
|
|
* command. */
|
|
|
|
return wpa_supplicant_ctrl_iface_process(
|
|
|
|
global->p2p_init_wpa_s,
|
|
|
|
buf, resp_len);
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_P2P */
|
2013-08-25 13:35:19 -04:00
|
|
|
reply_len = -1;
|
2014-04-15 06:22:48 -04:00
|
|
|
}
|
2013-08-25 13:41:39 -04:00
|
|
|
#ifndef CONFIG_NO_CONFIG_WRITE
|
|
|
|
} else if (os_strcmp(buf, "SAVE_CONFIG") == 0) {
|
|
|
|
if (wpas_global_ctrl_iface_save_config(global))
|
|
|
|
reply_len = -1;
|
|
|
|
#endif /* CONFIG_NO_CONFIG_WRITE */
|
2013-08-25 13:53:58 -04:00
|
|
|
} else if (os_strcmp(buf, "STATUS") == 0) {
|
|
|
|
reply_len = wpas_global_ctrl_iface_status(global, reply,
|
|
|
|
reply_size);
|
2014-02-20 17:14:30 -05:00
|
|
|
#ifdef CONFIG_MODULE_TESTS
|
|
|
|
} else if (os_strcmp(buf, "MODULE_TESTS") == 0) {
|
|
|
|
int wpas_module_tests(void);
|
|
|
|
if (wpas_module_tests() < 0)
|
|
|
|
reply_len = -1;
|
|
|
|
#endif /* CONFIG_MODULE_TESTS */
|
2014-10-20 04:22:16 -04:00
|
|
|
} else if (os_strncmp(buf, "RELOG", 5) == 0) {
|
|
|
|
if (wpa_debug_reopen_file() < 0)
|
|
|
|
reply_len = -1;
|
2008-02-27 20:34:43 -05:00
|
|
|
} else {
|
|
|
|
os_memcpy(reply, "UNKNOWN COMMAND\n", 16);
|
|
|
|
reply_len = 16;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (reply_len < 0) {
|
|
|
|
os_memcpy(reply, "FAIL\n", 5);
|
|
|
|
reply_len = 5;
|
|
|
|
}
|
|
|
|
|
|
|
|
*resp_len = reply_len;
|
|
|
|
return reply;
|
|
|
|
}
|