diff options
author | John Crispin <john@openwrt.org> | 2014-04-12 21:22:17 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2014-04-12 21:22:17 +0000 |
commit | 3bc77db5f58e331fc524019d37f4a1c9eb82e2e9 (patch) | |
tree | 7dbba76368c83f07bcd72fef9baed8deaa992868 /package/network/services | |
parent | fca3f32fe86b4b76d4006c7c1bee4a4defbd2c8f (diff) | |
download | mtk-20170518-3bc77db5f58e331fc524019d37f4a1c9eb82e2e9.zip mtk-20170518-3bc77db5f58e331fc524019d37f4a1c9eb82e2e9.tar.gz mtk-20170518-3bc77db5f58e331fc524019d37f4a1c9eb82e2e9.tar.bz2 |
802.11s: fix authsae support in netifd
This patch implements support for 802.11s protected mesh wireless networks (using authsae) in the netifd framework.
Until meshd-nl80211 implements a proper -P option for the PID file, this uses shell backgrounding in order to be able to get the PID for the process.
Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net>
SVN-Revision: 40497
Diffstat (limited to 'package/network/services')
-rw-r--r-- | package/network/services/authsae/files/lib/wifi/authsae.sh | 44 | ||||
-rw-r--r-- | package/network/services/hostapd/files/netifd.sh | 2 |
2 files changed, 25 insertions, 21 deletions
diff --git a/package/network/services/authsae/files/lib/wifi/authsae.sh b/package/network/services/authsae/files/lib/wifi/authsae.sh index daa43eb..d8c5598 100644 --- a/package/network/services/authsae/files/lib/wifi/authsae.sh +++ b/package/network/services/authsae/files/lib/wifi/authsae.sh @@ -1,28 +1,24 @@ authsae_start_interface() { - local device="$1" # to use the correct channel - local vif="$2" - local band + local mcast_rate + local mesh_htmode + local mesh_band + local authsae_conf_file="/var/run/authsae-$ifname.cfg" + local ret=1 - cfgfile="/var/run/authsae-$vif.cfg" - config_get channel "$device" channel - config_get hwmode "$device" hwmode - config_get htmode "$device" htmode - config_get ifname "$vif" ifname - config_get key "$vif" key - config_get mesh_id "$vif" mesh_id - config_get mcast_rate "$vif" mcast_rate "12" + json_get_vars mcast_rate + set_default mcast_rate "12" case "$htmode" in - HT20|HT40+|HT40-) htmode="$htmode";; - NOHT|none|*) htmode="none";; + HT20|HT40+|HT40-) mesh_htmode="$htmode";; + *) mesh_htmode="none";; esac case "$hwmode" in - *g*) band=11g;; - *a*) band=11a;; + *g*) mesh_band=11g;; + *a*) mesh_band=11a;; esac - cat > "$cfgfile" <<EOF + cat > "$authsae_conf_file" <<EOF authsae: { sae: @@ -41,13 +37,21 @@ authsae: passive = 0; debug = 0; mediaopt = 1; - band = "$band"; + band = "$mesh_band"; channel = $channel; - htmode = "$htmode"; + htmode = "$mesh_htmode"; mcast-rate = $mcast_rate; }; }; EOF - ifconfig "$ifname" up - meshd-nl80211 -i "$ifname" -s "$mesh_id" -c "$cfgfile" -B + + /usr/bin/meshd-nl80211 -i "$ifname" -s "$mesh_id" -c "$authsae_conf_file" </dev/null >/dev/null 2>/dev/null & + authsae_pid="$!" + ret="$?" + + echo $authsae_pid > /var/run/authsae-$ifname.pid + wireless_add_process "$authsae_pid" "/usr/bin/meshd-nl80211" 1 + + [ "$ret" != 0 ] && wireless_setup_vif_failed AUTHSAE_FAILED + return $ret } diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh index 1232669..1372b5a 100644 --- a/package/network/services/hostapd/files/netifd.sh +++ b/package/network/services/hostapd/files/netifd.sh @@ -586,5 +586,5 @@ wpa_supplicant_run() { } hostapd_common_cleanup() { - killall hostapd wpa_supplicant + killall hostapd wpa_supplicant meshd-nl80211 } |