openwrt/upstream - upstream openwrt

	Commit message (Expand)	Author	Age	Files	Lines
*	trying to make README file a bit more helpful	Mirko Vogt	2012-01-21	1	-6/+14
*	remove bison requirement (see [10398] & [14900])	Nicolas Thill	2010-03-05	1	-1/+1
*	change readme to point to scripts/flashing/flash.sh instead of scripts/flash.sh	Felix Fietkau	2008-12-31	1	-2/+2
*	add information about the tex4ht requirement for the docs	Felix Fietkau	2007-02-26	1	-1/+1
*	Update the README to something more realistic	Florian Fainelli	2007-01-05	1	-2/+4
*	finally move buildroot-ng to trunk	Felix Fietkau	2016-03-20	1	-0/+24

From 4bb69d15477e0f2b00e166845341dc933de47c58 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli <ordex@autistici.org> Date: Sun, 3 Jun 2012 18:22:56 +0200 Subject: [PATCHv2 601/602] wpa_supplicant: add new config params to be used with the ibss join command Signed-hostap: Antonio Quartulli <ordex@autistici.org> --- src/drivers/driver.h | 6 +++ wpa_supplicant/config.c | 96 +++++++++++++++++++++++++++++++++++++++ wpa_supplicant/config_ssid.h | 6 +++ wpa_supplicant/wpa_supplicant.c | 23 +++++++--- 4 files changed, 124 insertions(+), 7 deletions(-) --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -19,6 +19,7 @@ #define WPA_SUPPLICANT_DRIVER_VERSION 4 +#include "drivers/nl80211_copy.h" #include "common/defs.h" #define HOSTAPD_CHAN_DISABLED 0x00000001 @@ -351,6 +352,11 @@ struct wpa_driver_associate_params { */ int freq; + int beacon_interval; + int fixed_freq; + unsigned char rates[NL80211_MAX_SUPP_RATES]; + int mcast_rate; + /** * bg_scan_period - Background scan period in seconds, 0 to disable * background scan, or -1 to indicate no change to default driver --- a/wpa_supplicant/config.c +++ b/wpa_supplicant/config.c @@ -14,6 +14,7 @@ #include "rsn_supp/wpa.h" #include "eap_peer/eap.h" #include "p2p/p2p.h" +#include "drivers/nl80211_copy.h" #include "config.h" @@ -1463,6 +1464,97 @@ static char * wpa_config_write_p2p_clien #endif /* CONFIG_P2P */ +static int wpa_config_parse_mcast_rate(const struct parse_data *data, + struct wpa_ssid *ssid, int line, + const char *value) +{ + ssid->mcast_rate = (int)(strtod(value, NULL) * 10); + + return 0; +} + +#ifndef NO_CONFIG_WRITE +static char * wpa_config_write_mcast_rate(const struct parse_data *data, + struct wpa_ssid *ssid) +{ + char *value; + int res; + + if (!ssid->mcast_rate == 0) + return NULL; + + value = os_malloc(6); /* longest: 300.0 */ + if (value == NULL) + return NULL; + res = os_snprintf(value, 5, "%.1f", (double)ssid->mcast_rate / 10); + if (res < 0) { + os_free(value); + return NULL; + } + return value; +} +#endif /* NO_CONFIG_WRITE */ + +static int wpa_config_parse_rates(const struct parse_data *data, + struct wpa_ssid *ssid, int line, + const char *value) +{ + int i; + char *pos, *r, *sptr, *end; + double rate; + + pos = (char *)value; + r = strtok_r(pos, ",", &sptr); + i = 0; + while (pos && i < NL80211_MAX_SUPP_RATES) { + rate = 0.0; + if (r) + rate = strtod(r, &end); + ssid->rates[i] = rate * 2; + if (*end != '\0' || rate * 2 != ssid->rates[i]) + return 1; + + i++; + r = strtok_r(NULL, ",", &sptr); + } + + return 0; +} + +#ifndef NO_CONFIG_WRITE +static char * wpa_config_write_rates(const struct parse_data *data, + struct wpa_ssid *ssid) +{ + char *value, *pos; + int res, i; + + if (ssid->rates[0] <= 0) + return NULL; + + value = os_malloc(6 * NL80211_MAX_SUPP_RATES + 1); + if (value == NULL) + return NULL; + pos = value; + for (i = 0; i < NL80211_MAX_SUPP_RATES - 1; i++) { + res = os_snprintf(pos, 6, "%.1f,", (double)ssid->rates[i] / 2); + if (res < 0) { + os_free(value); + return NULL; + } + pos += res; + } + res = os_snprintf(pos, 6, "%.1f", + (double)ssid->rates[NL80211_MAX_SUPP_RATES - 1] / 2); + if (res < 0) { + os_free(value); + return NULL; + } + + value[6 * NL80211_MAX_SUPP_RATES] = '\0'; + return value; +} +#endif /* NO_CONFIG_WRITE */ + /* Helper macros for network block parser */ #ifdef OFFSET @@ -1638,6 +1730,10 @@ static const struct parse_data ssid_fiel #endif /* CONFIG_HT_OVERRIDES */ { INT(ap_max_inactivity) }, { INT(dtim_period) }, + { INT_RANGE(fixed_freq, 0, 1) }, + { INT_RANGE(beacon_interval, 0, 1000) }, + { FUNC(rates) }, + { FUNC(mcast_rate) }, }; #undef OFFSET --- a/wpa_supplicant/config_ssid.h +++ b/wpa_supplicant/config_ssid.h @@ -11,6 +11,7 @@ #include "common/defs.h" #include "eap_peer/eap_config.h" +#include "drivers/nl80211_copy.h" #define MAX_SSID_LEN 32 @@ -529,6 +530,11 @@ struct wpa_ssid { * disabled_until - Network block disabled until this time if non-zero */ struct os_time disabled_until; + + int fixed_freq; + int beacon_interval; + unsigned char rates[NL80211_MAX_SUPP_RATES]; + double mcast_rate; }; #endif /* CONFIG_SSID_H */ --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1561,15 +1561,24 @@ void wpa_supplicant_associate(struct wpa params.ssid_len = ssid->ssid_len; } - if (ssid->mode == WPAS_MODE_IBSS && ssid->bssid_set && - wpa_s->conf->ap_scan == 2) { - params.bssid = ssid->bssid; - params.fixed_bssid = 1; + if (ssid->mode == WPAS_MODE_IBSS) { + if (ssid->bssid_set && wpa_s->conf->ap_scan == 2) { + params.bssid = ssid->bssid; + params.fixed_bssid = 1; + } + if (ssid->frequency > 0 && params.freq == 0) + /* Initial channel for IBSS */ + params.freq = ssid->frequency; + params.fixed_freq = ssid->fixed_freq; + params.beacon_interval = ssid->beacon_interval; + i = 0; + while (i < NL80211_MAX_SUPP_RATES) { + params.rates[i] = ssid->rates[i]; + i++; + } + params.mcast_rate = ssid->mcast_rate; } - if (ssid->mode == WPAS_MODE_IBSS && ssid->frequency > 0 && - params.freq == 0) - params.freq = ssid->frequency; /* Initial channel for IBSS */ params.wpa_ie = wpa_ie; params.wpa_ie_len = wpa_ie_len; params.pairwise_suite = cipher_pairwise;