2014-09-01 06:23:21 +02:00
|
|
|
/*
|
|
|
|
* WPA Supplicant - Basic mesh mode routines
|
|
|
|
* Copyright (c) 2013-2014, cozybit, Inc. All rights reserved.
|
|
|
|
*
|
|
|
|
* This software may be distributed under the terms of the BSD license.
|
|
|
|
* See README for more details.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "utils/includes.h"
|
|
|
|
|
|
|
|
#include "utils/common.h"
|
|
|
|
#include "utils/eloop.h"
|
|
|
|
#include "utils/uuid.h"
|
|
|
|
#include "common/ieee802_11_defs.h"
|
|
|
|
#include "common/wpa_ctrl.h"
|
|
|
|
#include "ap/sta_info.h"
|
|
|
|
#include "ap/hostapd.h"
|
|
|
|
#include "ap/ieee802_11.h"
|
|
|
|
#include "config_ssid.h"
|
|
|
|
#include "config.h"
|
|
|
|
#include "wpa_supplicant_i.h"
|
|
|
|
#include "driver_i.h"
|
|
|
|
#include "notify.h"
|
2014-09-01 06:23:36 +02:00
|
|
|
#include "ap.h"
|
2014-03-11 05:07:01 +01:00
|
|
|
#include "mesh_mpm.h"
|
2014-09-01 06:23:29 +02:00
|
|
|
#include "mesh_rsn.h"
|
2014-09-01 06:23:21 +02:00
|
|
|
#include "mesh.h"
|
|
|
|
|
|
|
|
|
|
|
|
static void wpa_supplicant_mesh_deinit(struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
wpa_supplicant_mesh_iface_deinit(wpa_s, wpa_s->ifmsh);
|
|
|
|
wpa_s->ifmsh = NULL;
|
|
|
|
wpa_s->current_ssid = NULL;
|
2014-09-01 06:23:29 +02:00
|
|
|
os_free(wpa_s->mesh_rsn);
|
|
|
|
wpa_s->mesh_rsn = NULL;
|
2014-09-01 06:23:21 +02:00
|
|
|
/* TODO: leave mesh (stop beacon). This will happen on link down
|
|
|
|
* anyway, so it's not urgent */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void wpa_supplicant_mesh_iface_deinit(struct wpa_supplicant *wpa_s,
|
|
|
|
struct hostapd_iface *ifmsh)
|
|
|
|
{
|
|
|
|
if (!ifmsh)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (ifmsh->mconf) {
|
2014-03-11 05:07:01 +01:00
|
|
|
mesh_mpm_deinit(wpa_s, ifmsh);
|
2014-09-01 06:23:21 +02:00
|
|
|
if (ifmsh->mconf->ies) {
|
|
|
|
ifmsh->mconf->ies = NULL;
|
|
|
|
/* We cannot free this struct
|
|
|
|
* because wpa_authenticator on
|
|
|
|
* hostapd side is also using it
|
|
|
|
* for now just set to NULL and
|
|
|
|
* let hostapd code free it.
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
os_free(ifmsh->mconf);
|
|
|
|
ifmsh->mconf = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* take care of shared data */
|
|
|
|
hostapd_interface_deinit(ifmsh);
|
|
|
|
hostapd_interface_free(ifmsh);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static struct mesh_conf * mesh_config_create(struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
struct mesh_conf *conf;
|
|
|
|
|
|
|
|
conf = os_zalloc(sizeof(struct mesh_conf));
|
|
|
|
if (!conf)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
os_memcpy(conf->meshid, ssid->ssid, ssid->ssid_len);
|
|
|
|
conf->meshid_len = ssid->ssid_len;
|
|
|
|
|
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_SAE)
|
|
|
|
conf->security |= MESH_CONF_SEC_AUTH |
|
|
|
|
MESH_CONF_SEC_AMPE;
|
|
|
|
else
|
|
|
|
conf->security |= MESH_CONF_SEC_NONE;
|
|
|
|
|
|
|
|
/* defaults */
|
|
|
|
conf->mesh_pp_id = MESH_PATH_PROTOCOL_HWMP;
|
|
|
|
conf->mesh_pm_id = MESH_PATH_METRIC_AIRTIME;
|
|
|
|
conf->mesh_cc_id = 0;
|
|
|
|
conf->mesh_sp_id = MESH_SYNC_METHOD_NEIGHBOR_OFFSET;
|
|
|
|
conf->mesh_auth_id = (conf->security & MESH_CONF_SEC_AUTH) ? 1 : 0;
|
2014-11-15 02:35:32 +01:00
|
|
|
conf->dot11MeshMaxRetries = ssid->dot11MeshMaxRetries;
|
|
|
|
conf->dot11MeshRetryTimeout = ssid->dot11MeshRetryTimeout;
|
|
|
|
conf->dot11MeshConfirmTimeout = ssid->dot11MeshConfirmTimeout;
|
|
|
|
conf->dot11MeshHoldingTimeout = ssid->dot11MeshHoldingTimeout;
|
2014-09-01 06:23:21 +02:00
|
|
|
|
|
|
|
return conf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void wpas_mesh_copy_groups(struct hostapd_data *bss,
|
|
|
|
struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
int num_groups;
|
|
|
|
size_t groups_size;
|
|
|
|
|
|
|
|
for (num_groups = 0; wpa_s->conf->sae_groups[num_groups] > 0;
|
|
|
|
num_groups++)
|
|
|
|
;
|
|
|
|
|
|
|
|
groups_size = (num_groups + 1) * sizeof(wpa_s->conf->sae_groups[0]);
|
|
|
|
bss->conf->sae_groups = os_malloc(groups_size);
|
|
|
|
if (bss->conf->sae_groups)
|
|
|
|
os_memcpy(bss->conf->sae_groups, wpa_s->conf->sae_groups,
|
|
|
|
groups_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
struct hostapd_iface *ifmsh;
|
|
|
|
struct hostapd_data *bss;
|
|
|
|
struct hostapd_config *conf;
|
|
|
|
struct mesh_conf *mconf;
|
|
|
|
int basic_rates_erp[] = { 10, 20, 55, 60, 110, 120, 240, -1 };
|
|
|
|
static int default_groups[] = { 19, 20, 21, 25, 26, -1 };
|
|
|
|
size_t len;
|
2014-09-01 06:23:38 +02:00
|
|
|
int rate_len;
|
2014-09-01 06:23:21 +02:00
|
|
|
|
2014-03-11 05:07:01 +01:00
|
|
|
if (!wpa_s->conf->user_mpm) {
|
|
|
|
/* not much for us to do here */
|
|
|
|
wpa_msg(wpa_s, MSG_WARNING,
|
|
|
|
"user_mpm is not enabled in configuration");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-09-01 06:23:21 +02:00
|
|
|
wpa_s->ifmsh = ifmsh = os_zalloc(sizeof(*wpa_s->ifmsh));
|
|
|
|
if (!ifmsh)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2014-11-15 02:35:25 +01:00
|
|
|
ifmsh->drv_flags = wpa_s->drv_flags;
|
2014-09-01 06:23:21 +02:00
|
|
|
ifmsh->num_bss = 1;
|
|
|
|
ifmsh->bss = os_calloc(wpa_s->ifmsh->num_bss,
|
|
|
|
sizeof(struct hostapd_data *));
|
|
|
|
if (!ifmsh->bss)
|
|
|
|
goto out_free;
|
|
|
|
|
|
|
|
ifmsh->bss[0] = bss = os_zalloc(sizeof(struct hostapd_data));
|
|
|
|
if (!bss)
|
|
|
|
goto out_free;
|
|
|
|
|
|
|
|
os_memcpy(bss->own_addr, wpa_s->own_addr, ETH_ALEN);
|
|
|
|
bss->driver = wpa_s->driver;
|
|
|
|
bss->drv_priv = wpa_s->drv_priv;
|
|
|
|
bss->iface = ifmsh;
|
2014-09-01 06:23:31 +02:00
|
|
|
bss->mesh_sta_free_cb = mesh_mpm_free_sta;
|
2014-09-01 06:23:21 +02:00
|
|
|
wpa_s->assoc_freq = ssid->frequency;
|
|
|
|
wpa_s->current_ssid = ssid;
|
|
|
|
|
|
|
|
/* setup an AP config for auth processing */
|
|
|
|
conf = hostapd_config_defaults();
|
|
|
|
if (!conf)
|
|
|
|
goto out_free;
|
|
|
|
|
|
|
|
bss->conf = *conf->bss;
|
|
|
|
bss->conf->start_disabled = 1;
|
|
|
|
bss->conf->mesh = MESH_ENABLED;
|
2015-01-16 10:29:17 +01:00
|
|
|
bss->conf->ap_max_inactivity = wpa_s->conf->mesh_max_inactivity;
|
2014-09-01 06:23:21 +02:00
|
|
|
bss->iconf = conf;
|
|
|
|
ifmsh->conf = conf;
|
|
|
|
|
2014-12-19 06:59:52 +01:00
|
|
|
ifmsh->bss[0]->max_plinks = wpa_s->conf->max_peer_links;
|
2014-09-01 06:23:21 +02:00
|
|
|
os_strlcpy(bss->conf->iface, wpa_s->ifname, sizeof(bss->conf->iface));
|
|
|
|
|
|
|
|
mconf = mesh_config_create(ssid);
|
|
|
|
if (!mconf)
|
|
|
|
goto out_free;
|
|
|
|
ifmsh->mconf = mconf;
|
|
|
|
|
|
|
|
/* need conf->hw_mode for supported rates. */
|
|
|
|
if (ssid->frequency == 0) {
|
|
|
|
conf->hw_mode = HOSTAPD_MODE_IEEE80211G;
|
|
|
|
conf->channel = 1;
|
|
|
|
} else {
|
|
|
|
conf->hw_mode = ieee80211_freq_to_chan(ssid->frequency,
|
|
|
|
&conf->channel);
|
|
|
|
}
|
|
|
|
if (conf->hw_mode == NUM_HOSTAPD_MODES) {
|
|
|
|
wpa_printf(MSG_ERROR, "Unsupported mesh mode frequency: %d MHz",
|
|
|
|
ssid->frequency);
|
|
|
|
goto out_free;
|
|
|
|
}
|
|
|
|
|
2014-09-01 06:23:38 +02:00
|
|
|
if (ssid->mesh_basic_rates == NULL) {
|
|
|
|
/*
|
|
|
|
* XXX: Hack! This is so an MPM which correctly sets the ERP
|
|
|
|
* mandatory rates as BSSBasicRateSet doesn't reject us. We
|
|
|
|
* could add a new hw_mode HOSTAPD_MODE_IEEE80211G_ERP, but
|
|
|
|
* this is way easier. This also makes our BSSBasicRateSet
|
|
|
|
* advertised in beacons match the one in peering frames, sigh.
|
|
|
|
*/
|
|
|
|
if (conf->hw_mode == HOSTAPD_MODE_IEEE80211G) {
|
|
|
|
conf->basic_rates = os_malloc(sizeof(basic_rates_erp));
|
|
|
|
if (!conf->basic_rates)
|
|
|
|
goto out_free;
|
|
|
|
os_memcpy(conf->basic_rates, basic_rates_erp,
|
|
|
|
sizeof(basic_rates_erp));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
rate_len = 0;
|
|
|
|
while (1) {
|
|
|
|
if (ssid->mesh_basic_rates[rate_len] < 1)
|
|
|
|
break;
|
|
|
|
rate_len++;
|
|
|
|
}
|
|
|
|
conf->basic_rates = os_calloc(rate_len + 1, sizeof(int));
|
|
|
|
if (conf->basic_rates == NULL)
|
2014-09-01 06:23:21 +02:00
|
|
|
goto out_free;
|
2014-09-01 06:23:38 +02:00
|
|
|
os_memcpy(conf->basic_rates, ssid->mesh_basic_rates,
|
|
|
|
rate_len * sizeof(int));
|
|
|
|
conf->basic_rates[rate_len] = -1;
|
2014-09-01 06:23:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (hostapd_setup_interface(ifmsh)) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
|
|
|
"Failed to initialize hostapd interface for mesh");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa_drv_init_mesh(wpa_s)) {
|
|
|
|
wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh in driver");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mconf->security != MESH_CONF_SEC_NONE) {
|
|
|
|
if (ssid->passphrase == NULL) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
|
|
|
"mesh: Passphrase for SAE not configured");
|
|
|
|
goto out_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
bss->conf->wpa = ssid->proto;
|
|
|
|
bss->conf->wpa_key_mgmt = ssid->key_mgmt;
|
|
|
|
|
|
|
|
if (wpa_s->conf->sae_groups &&
|
|
|
|
wpa_s->conf->sae_groups[0] > 0) {
|
|
|
|
wpas_mesh_copy_groups(bss, wpa_s);
|
|
|
|
} else {
|
|
|
|
bss->conf->sae_groups =
|
|
|
|
os_malloc(sizeof(default_groups));
|
|
|
|
if (!bss->conf->sae_groups)
|
|
|
|
goto out_free;
|
|
|
|
os_memcpy(bss->conf->sae_groups, default_groups,
|
|
|
|
sizeof(default_groups));
|
|
|
|
}
|
|
|
|
|
|
|
|
len = os_strlen(ssid->passphrase);
|
|
|
|
bss->conf->ssid.wpa_passphrase =
|
|
|
|
dup_binstr(ssid->passphrase, len);
|
2014-09-01 06:23:29 +02:00
|
|
|
|
|
|
|
wpa_s->mesh_rsn = mesh_rsn_auth_init(wpa_s, mconf);
|
|
|
|
if (!wpa_s->mesh_rsn)
|
|
|
|
goto out_free;
|
2014-09-01 06:23:21 +02:00
|
|
|
}
|
|
|
|
|
2014-09-01 06:23:36 +02:00
|
|
|
wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf);
|
|
|
|
|
2014-09-01 06:23:21 +02:00
|
|
|
return 0;
|
|
|
|
out_free:
|
|
|
|
wpa_supplicant_mesh_deinit(wpa_s);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void wpa_mesh_notify_peer(struct wpa_supplicant *wpa_s, const u8 *addr,
|
|
|
|
const u8 *ies, size_t ie_len)
|
|
|
|
{
|
|
|
|
struct ieee802_11_elems elems;
|
|
|
|
|
|
|
|
wpa_msg(wpa_s, MSG_INFO,
|
|
|
|
"new peer notification for " MACSTR, MAC2STR(addr));
|
|
|
|
|
|
|
|
if (ieee802_11_parse_elems(ies, ie_len, &elems, 0) == ParseFailed) {
|
|
|
|
wpa_msg(wpa_s, MSG_INFO, "Could not parse beacon from " MACSTR,
|
|
|
|
MAC2STR(addr));
|
2014-03-11 05:07:01 +01:00
|
|
|
return;
|
2014-09-01 06:23:21 +02:00
|
|
|
}
|
2014-03-11 05:07:01 +01:00
|
|
|
wpa_mesh_new_mesh_peer(wpa_s, addr, &elems);
|
2014-09-01 06:23:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-09-01 06:23:32 +02:00
|
|
|
void wpa_supplicant_mesh_add_scan_ie(struct wpa_supplicant *wpa_s,
|
|
|
|
struct wpabuf **extra_ie)
|
|
|
|
{
|
|
|
|
/* EID + 0-length (wildcard) mesh-id */
|
|
|
|
size_t ielen = 2;
|
|
|
|
|
|
|
|
if (wpabuf_resize(extra_ie, ielen) == 0) {
|
|
|
|
wpabuf_put_u8(*extra_ie, WLAN_EID_MESH_ID);
|
|
|
|
wpabuf_put_u8(*extra_ie, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-09-01 06:23:21 +02:00
|
|
|
int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
|
|
|
|
struct wpa_ssid *ssid)
|
|
|
|
{
|
|
|
|
struct wpa_driver_mesh_join_params params;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (!ssid || !ssid->ssid || !ssid->ssid_len || !ssid->frequency) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_supplicant_mesh_deinit(wpa_s);
|
|
|
|
|
|
|
|
os_memset(¶ms, 0, sizeof(params));
|
|
|
|
params.meshid = ssid->ssid;
|
|
|
|
params.meshid_len = ssid->ssid_len;
|
2015-01-10 12:03:45 +01:00
|
|
|
ibss_mesh_setup_freq(wpa_s, ssid, ¶ms.freq);
|
|
|
|
wpa_s->mesh_ht_enabled = !!params.freq.ht_enabled;
|
2014-12-16 10:52:25 +01:00
|
|
|
if (ssid->beacon_int > 0)
|
|
|
|
params.beacon_int = ssid->beacon_int;
|
|
|
|
else if (wpa_s->conf->beacon_int > 0)
|
|
|
|
params.beacon_int = wpa_s->conf->beacon_int;
|
2014-12-19 06:59:52 +01:00
|
|
|
params.max_peer_links = wpa_s->conf->max_peer_links;
|
2014-09-01 06:23:21 +02:00
|
|
|
|
|
|
|
if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) {
|
|
|
|
params.flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH;
|
|
|
|
params.flags |= WPA_DRIVER_MESH_FLAG_AMPE;
|
2014-03-11 05:07:01 +01:00
|
|
|
wpa_s->conf->user_mpm = 1;
|
2014-09-01 06:23:21 +02:00
|
|
|
}
|
|
|
|
|
2014-03-11 05:07:01 +01:00
|
|
|
if (wpa_s->conf->user_mpm) {
|
|
|
|
params.flags |= WPA_DRIVER_MESH_FLAG_USER_MPM;
|
|
|
|
params.conf.flags &= ~WPA_DRIVER_MESH_CONF_FLAG_AUTO_PLINKS;
|
|
|
|
} else {
|
|
|
|
params.flags |= WPA_DRIVER_MESH_FLAG_DRIVER_MPM;
|
|
|
|
params.conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_AUTO_PLINKS;
|
|
|
|
}
|
2015-01-16 10:29:17 +01:00
|
|
|
params.conf.peer_link_timeout = wpa_s->conf->mesh_max_inactivity;
|
2014-09-01 06:23:21 +02:00
|
|
|
|
|
|
|
if (wpa_supplicant_mesh_init(wpa_s, ssid)) {
|
|
|
|
wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh");
|
2015-03-06 19:58:56 +01:00
|
|
|
wpa_drv_leave_mesh(wpa_s);
|
2014-09-01 06:23:21 +02:00
|
|
|
ret = -1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wpa_s->ifmsh) {
|
|
|
|
params.ies = wpa_s->ifmsh->mconf->ies;
|
|
|
|
params.ie_len = wpa_s->ifmsh->mconf->ie_len;
|
|
|
|
params.basic_rates = wpa_s->ifmsh->basic_rates;
|
|
|
|
}
|
|
|
|
|
|
|
|
wpa_msg(wpa_s, MSG_INFO, "joining mesh %s",
|
|
|
|
wpa_ssid_txt(ssid->ssid, ssid->ssid_len));
|
|
|
|
ret = wpa_drv_join_mesh(wpa_s, ¶ms);
|
|
|
|
if (ret)
|
|
|
|
wpa_msg(wpa_s, MSG_ERROR, "mesh join error=%d\n", ret);
|
|
|
|
|
|
|
|
/* hostapd sets the interface down until we associate */
|
|
|
|
wpa_drv_set_operstate(wpa_s, 1);
|
|
|
|
|
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int wpa_supplicant_leave_mesh(struct wpa_supplicant *wpa_s)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
wpa_msg(wpa_s, MSG_INFO, "leaving mesh");
|
|
|
|
|
2014-11-27 16:02:12 +01:00
|
|
|
/* Need to send peering close messages first */
|
|
|
|
wpa_supplicant_mesh_deinit(wpa_s);
|
|
|
|
|
2014-09-01 06:23:21 +02:00
|
|
|
ret = wpa_drv_leave_mesh(wpa_s);
|
|
|
|
if (ret)
|
|
|
|
wpa_msg(wpa_s, MSG_ERROR, "mesh leave error=%d", ret);
|
|
|
|
|
|
|
|
wpa_drv_set_operstate(wpa_s, 1);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2014-09-01 06:23:39 +02:00
|
|
|
|
|
|
|
|
|
|
|
static int mesh_attr_text(const u8 *ies, size_t ies_len, char *buf, char *end)
|
|
|
|
{
|
|
|
|
struct ieee802_11_elems elems;
|
|
|
|
char *mesh_id, *pos = buf;
|
|
|
|
u8 *bss_basic_rate_set;
|
|
|
|
int bss_basic_rate_set_len, ret, i;
|
|
|
|
|
|
|
|
if (ieee802_11_parse_elems(ies, ies_len, &elems, 0) == ParseFailed)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (elems.mesh_id_len < 1)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
mesh_id = os_malloc(elems.mesh_id_len + 1);
|
|
|
|
if (mesh_id == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
os_memcpy(mesh_id, elems.mesh_id, elems.mesh_id_len);
|
|
|
|
mesh_id[elems.mesh_id_len] = '\0';
|
|
|
|
ret = os_snprintf(pos, end - pos, "mesh_id=%s\n", mesh_id);
|
|
|
|
os_free(mesh_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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-09-01 06:23:39 +02:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
if (elems.mesh_config_len > 6) {
|
|
|
|
ret = os_snprintf(pos, end - pos,
|
|
|
|
"active_path_selection_protocol_id=0x%02x\n"
|
|
|
|
"active_path_selection_metric_id=0x%02x\n"
|
|
|
|
"congestion_control_mode_id=0x%02x\n"
|
|
|
|
"synchronization_method_id=0x%02x\n"
|
|
|
|
"authentication_protocol_id=0x%02x\n"
|
|
|
|
"mesh_formation_info=0x%02x\n"
|
|
|
|
"mesh_capability=0x%02x\n",
|
|
|
|
elems.mesh_config[0], elems.mesh_config[1],
|
|
|
|
elems.mesh_config[2], elems.mesh_config[3],
|
|
|
|
elems.mesh_config[4], elems.mesh_config[5],
|
|
|
|
elems.mesh_config[6]);
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-09-01 06:23:39 +02:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
bss_basic_rate_set = os_malloc(elems.supp_rates_len +
|
|
|
|
elems.ext_supp_rates_len);
|
|
|
|
if (bss_basic_rate_set == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
bss_basic_rate_set_len = 0;
|
|
|
|
for (i = 0; i < elems.supp_rates_len; i++) {
|
|
|
|
if (elems.supp_rates[i] & 0x80) {
|
|
|
|
bss_basic_rate_set[bss_basic_rate_set_len++] =
|
|
|
|
(elems.supp_rates[i] & 0x7f) * 5;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (i = 0; i < elems.ext_supp_rates_len; i++) {
|
|
|
|
if (elems.ext_supp_rates[i] & 0x80) {
|
|
|
|
bss_basic_rate_set[bss_basic_rate_set_len++] =
|
|
|
|
(elems.ext_supp_rates[i] & 0x7f) * 5;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (bss_basic_rate_set_len > 0) {
|
|
|
|
ret = os_snprintf(pos, end - pos, "bss_basic_rate_set=%d",
|
|
|
|
bss_basic_rate_set[0]);
|
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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-09-01 06:23:39 +02:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
|
|
|
|
for (i = 1; i < bss_basic_rate_set_len; i++) {
|
|
|
|
ret = os_snprintf(pos, end - pos, " %d",
|
|
|
|
bss_basic_rate_set[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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-09-01 06:23:39 +02: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 10:15:51 +01:00
|
|
|
if (os_snprintf_error(end - pos, ret))
|
2014-09-01 06:23:39 +02:00
|
|
|
return pos - buf;
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
os_free(bss_basic_rate_set);
|
|
|
|
|
|
|
|
return pos - buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int wpas_mesh_scan_result_text(const u8 *ies, size_t ies_len, char *buf,
|
|
|
|
char *end)
|
|
|
|
{
|
|
|
|
return mesh_attr_text(ies, ies_len, buf, end);
|
|
|
|
}
|
2014-11-15 02:35:23 +01:00
|
|
|
|
|
|
|
|
|
|
|
static int wpas_mesh_get_ifname(struct wpa_supplicant *wpa_s, char *ifname,
|
|
|
|
size_t len)
|
|
|
|
{
|
|
|
|
char *ifname_ptr = wpa_s->ifname;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
res = os_snprintf(ifname, len, "mesh-%s-%d", ifname_ptr,
|
|
|
|
wpa_s->mesh_if_idx);
|
|
|
|
if (os_snprintf_error(len, res) ||
|
|
|
|
(os_strlen(ifname) >= IFNAMSIZ &&
|
|
|
|
os_strlen(wpa_s->ifname) < IFNAMSIZ)) {
|
|
|
|
/* Try to avoid going over the IFNAMSIZ length limit */
|
|
|
|
res = os_snprintf(ifname, len, "mesh-%d", wpa_s->mesh_if_idx);
|
|
|
|
if (os_snprintf_error(len, res))
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
wpa_s->mesh_if_idx++;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int wpas_mesh_add_interface(struct wpa_supplicant *wpa_s, char *ifname,
|
|
|
|
size_t len)
|
|
|
|
{
|
|
|
|
struct wpa_interface iface;
|
|
|
|
struct wpa_supplicant *mesh_wpa_s;
|
|
|
|
u8 addr[ETH_ALEN];
|
|
|
|
|
|
|
|
if (ifname[0] == '\0' && wpas_mesh_get_ifname(wpa_s, ifname, len) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (wpa_drv_if_add(wpa_s, WPA_IF_MESH, ifname, NULL, NULL, NULL, addr,
|
|
|
|
NULL) < 0) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
|
|
|
"mesh: Failed to create new mesh interface");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
wpa_printf(MSG_INFO, "mesh: Created virtual interface %s addr "
|
|
|
|
MACSTR, ifname, MAC2STR(addr));
|
|
|
|
|
|
|
|
os_memset(&iface, 0, sizeof(iface));
|
|
|
|
iface.ifname = ifname;
|
|
|
|
iface.driver = wpa_s->driver->name;
|
|
|
|
iface.driver_param = wpa_s->conf->driver_param;
|
|
|
|
iface.ctrl_interface = wpa_s->conf->ctrl_interface;
|
|
|
|
|
2015-03-01 20:50:34 +01:00
|
|
|
mesh_wpa_s = wpa_supplicant_add_iface(wpa_s->global, &iface, wpa_s);
|
2014-11-15 02:35:23 +01:00
|
|
|
if (!mesh_wpa_s) {
|
|
|
|
wpa_printf(MSG_ERROR,
|
|
|
|
"mesh: Failed to create new wpa_supplicant interface");
|
|
|
|
wpa_supplicant_remove_iface(wpa_s->global, wpa_s, 0);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
mesh_wpa_s->mesh_if_created = 1;
|
|
|
|
return 0;
|
|
|
|
}
|