hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hostapd: improve 802.1x dynamic vlan support with bridge names 

In r41872 and r42787 Dynamic VLAN support was reintroduced, but the vlan_bridge
parameter is not read while setting up the config, so the default is used which
is undesirable for some uses.

Signed-off-by: Ben Franske <ben.mm@franske.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43473 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2014-12-01 16:15:20 +00:00
parent 894af53f00
commit b040855a91
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/network/services/hostapd/files/netifd.sh
View File

@ -130,7 +130,7 @@ hostapd_common_add_bss_config() {
config_add_string eap_type ca_cert client_cert identity auth priv_key priv_key_pwd config_add_string eap_type ca_cert client_cert identity auth priv_key priv_key_pwd
config_add_int dynamic_vlan vlan_naming config_add_int dynamic_vlan vlan_naming
config_add_string vlan_tagged_interface config_add_string vlan_tagged_interface vlan_bridge
config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey' config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey'
@ -226,7 +226,8 @@ hostapd_set_bss_options() {
dae_client dae_secret dae_port \ dae_client dae_secret dae_port \
nasid ownip \ nasid ownip \
eap_reauth_period dynamic_vlan \ eap_reauth_period dynamic_vlan \
vlan_naming vlan_tagged_interface vlan_naming vlan_tagged_interface \
vlan_bridge
# legacy compatibility # legacy compatibility
[ -n "$auth_server" ] || json_get_var auth_server server [ -n "$auth_server" ] || json_get_var auth_server server
@ -266,6 +267,8 @@ hostapd_set_bss_options() {
[ -n "$dynamic_vlan" ] && { [ -n "$dynamic_vlan" ] && {
append bss_conf "dynamic_vlan=$dynamic_vlan" "$N" append bss_conf "dynamic_vlan=$dynamic_vlan" "$N"
append bss_conf "vlan_naming=$vlan_naming" "$N" append bss_conf "vlan_naming=$vlan_naming" "$N"
[ -n "$vlan_bridge" ] && \
append bss_conf "vlan_bridge=$vlan_bridge" "$N"
[ -n "$vlan_tagged_interface" ] && \ [ -n "$vlan_tagged_interface" ] && \
append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N" append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
} }