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

hostapd: Add vlan_file option to netifd.sh 

Other VLAN related options are already being processed in netifd.sh
but the vlan_file option is missing. This option allows the mapping
of vlan IDs to network interfaces and will be used in dynamic VLAN
feature for binding stations to interfaces based on VLAN
assignments. The change is done similarly to the wpa_psk_file
option.

Signed-off-by: Gong Cheng <chengg11@yahoo.com>

SVN-Revision: 46652
lede-17.01
John Crispin 2015-08-17 06:17:13 +00:00
parent 4463bc017b
commit e5488123e6
1 changed files with 6 additions and 1 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

@ -140,6 +140,7 @@ hostapd_common_add_bss_config() {
config_add_int dynamic_vlan vlan_naming config_add_int dynamic_vlan vlan_naming
config_add_string vlan_tagged_interface vlan_bridge config_add_string vlan_tagged_interface vlan_bridge
config_add_string vlan_file
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'
@ -248,7 +249,7 @@ hostapd_set_bss_options() {
ownip \ ownip \
eap_reauth_period dynamic_vlan \ eap_reauth_period dynamic_vlan \
vlan_naming vlan_tagged_interface \ vlan_naming vlan_tagged_interface \
vlan_bridge vlan_bridge vlan_file
# legacy compatibility # legacy compatibility
[ -n "$auth_server" ] || json_get_var auth_server server [ -n "$auth_server" ] || json_get_var auth_server server
@ -291,6 +292,10 @@ hostapd_set_bss_options() {
append bss_conf "vlan_bridge=$vlan_bridge" "$N" 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"
[ -n "$vlan_file" ] && {
[ -e "$vlan_file" ] || touch "$vlan_file"
append bss_conf "vlan_file=$vlan_file" "$N"
}
} }
;; ;;
wep) wep)