X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fnetwork%2Fservices%2Fhostapd%2Ffiles%2Fnetifd.sh;h=23d2e7e83ebe5ca744f40e300fdbfb1014c555c5;hp=930755ffb50c830054d743d1f317fdf32bf3795a;hb=e76433b7738f2b907d4ed255abcefb71bedf8d8b;hpb=beb8e4ba7e52f20868042826ef89c89914e19a41 diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh index 930755ffb5..23d2e7e83e 100644 --- a/package/network/services/hostapd/files/netifd.sh +++ b/package/network/services/hostapd/files/netifd.sh @@ -1,4 +1,4 @@ -hostapd_add_rate() { +wpa_supplicant_add_rate() { local var="$1" local val="$(($2 / 1000))" local sub="$((($2 / 100) % 10))" @@ -6,6 +6,12 @@ hostapd_add_rate() { [ $sub -gt 0 ] && append $var "." } +hostapd_add_rate() { + local var="$1" + local val="$(($2 / 100))" + append $var "$val" " " +} + hostapd_append_wep_key() { local var="$1" @@ -43,9 +49,11 @@ hostapd_add_log_config() { hostapd_common_add_device_config() { config_add_array basic_rate + config_add_array supported_rates config_add_string country - config_add_boolean country_ie + config_add_boolean country_ie doth + config_add_string require_mode hostapd_add_log_config } @@ -57,21 +65,39 @@ hostapd_prepare_device_config() { local base="${config%%.conf}" local base_cfg= - json_get_vars country country_ie beacon_int basic_rate + json_get_vars country country_ie beacon_int doth require_mode hostapd_set_log_options base_cfg set_default country_ie 1 + set_default doth 1 + [ -n "$country" ] && { append base_cfg "country_code=$country" "$N" + [ "$country_ie" -gt 0 ] && append base_cfg "ieee80211d=1" "$N" + [ "$hwmode" = "a" -a "$doth" -gt 0 ] && append base_cfg "ieee80211h=1" "$N" } [ -n "$hwmode" ] && append base_cfg "hw_mode=$hwmode" "$N" local brlist= br + json_get_values basic_rate_list basic_rate for br in $basic_rate_list; do hostapd_add_rate brlist "$br" done + case "$require_mode" in + g) brlist="60 120 240" ;; + n) append base_cfg "require_ht=1" "$N";; + ac) append base_cfg "require_vht=1" "$N";; + esac + + local rlist= r + json_get_values rate_list supported_rates + for r in $rate_list; do + hostapd_add_rate rlist "$r" + done + + [ -n "$rlist" ] && append base_cfg "supported_rates=$rlist" "$N" [ -n "$brlist" ] && append base_cfg "basic_rates=$brlist" "$N" [ -n "$beacon_int" ] && append base_cfg "beacon_int=$beacon_int" "$N" @@ -82,8 +108,8 @@ EOF } hostapd_common_add_bss_config() { - config_add_string bssid ssid - config_add_boolean wds wmm hidden + config_add_string 'bssid:macaddr' 'ssid:string' + config_add_boolean wds wmm uapsd hidden config_add_int maxassoc max_inactivity config_add_boolean disassoc_low_ack isolate short_preamble @@ -95,9 +121,9 @@ hostapd_common_add_bss_config() { config_add_boolean rsn_preauth auth_cache config_add_int ieee80211w - config_add_string auth_server server + config_add_string 'auth_server:host' 'server:host' config_add_string auth_secret - config_add_int auth_port port + config_add_int 'auth_port:port' 'port:port' config_add_string acct_server config_add_string acct_secret @@ -108,21 +134,36 @@ hostapd_common_add_bss_config() { config_add_int dae_port config_add_string nasid + config_add_string ownip config_add_string iapp_interface config_add_string eap_type ca_cert client_cert identity auth priv_key priv_key_pwd - config_add_string key1 key2 key3 key4 password + config_add_int dynamic_vlan vlan_naming + config_add_string vlan_tagged_interface vlan_bridge + + config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey' - config_add_boolean wps_pushbutton wps_label ext_registrar + config_add_string wpa_psk_file + + config_add_boolean wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin + config_add_boolean ieee80211r pmk_r1_push + config_add_int r0_key_lifetime reassociation_deadline + config_add_string mobility_domain r1_key_holder + config_add_array r0kh r1kh + config_add_int ieee80211w_max_timeout ieee80211w_retry_timeout - config_add_string macfilter macfile - config_add_array maclist + config_add_string macfilter 'macfile:file' + config_add_array 'maclist:list(macaddr)' + + config_add_array bssid_blacklist + config_add_array bssid_whitelist config_add_int mcast_rate config_add_array basic_rate + config_add_array supported_rates } hostapd_set_bss_options() { @@ -133,14 +174,15 @@ hostapd_set_bss_options() { wireless_vif_parse_encryption local bss_conf - local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey + local wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wpa_key_mgmt json_get_vars \ wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey \ maxassoc max_inactivity disassoc_low_ack isolate auth_cache \ - wps_pushbutton wps_label ext_registrar \ + wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 \ wps_device_type wps_device_name wps_manufacturer wps_pin \ - macfilter ssid wmm hidden short_preamble + macfilter ssid wmm uapsd hidden short_preamble rsn_preauth \ + iapp_interface set_default isolate 0 set_default maxassoc 0 @@ -149,6 +191,7 @@ hostapd_set_bss_options() { set_default disassoc_low_ack 1 set_default hidden 0 set_default wmm 1 + set_default uapsd 1 append bss_conf "ctrl_interface=/var/run/hostapd" if [ "$isolate" -gt 0 ]; then @@ -165,6 +208,7 @@ hostapd_set_bss_options() { append bss_conf "preamble=$short_preamble" "$N" append bss_conf "wmm_enabled=$wmm" "$N" append bss_conf "ignore_broadcast_ssid=$hidden" "$N" + append bss_conf "uapsd_advertisement_enabled=$uapsd" "$N" [ "$wpa" -gt 0 ] && { [ -n "$wpa_group_rekey" ] && append bss_conf "wpa_group_rekey=$wpa_group_rekey" "$N" @@ -180,7 +224,7 @@ hostapd_set_bss_options() { wps_not_configured=1 ;; psk) - json_get_vars key + json_get_vars key wpa_psk_file if [ ${#key} -lt 8 ]; then wireless_setup_vif_failed INVALID_WPA_PSK return 1 @@ -189,15 +233,22 @@ hostapd_set_bss_options() { else append bss_conf "wpa_passphrase=$key" "$N" fi + [ -n "$wpa_psk_file" ] && { + [ -e "$wpa_psk_file" ] || touch "$wpa_psk_file" + append bss_conf "wpa_psk_file=$wpa_psk_file" "$N" + } wps_possible=1 + append wpa_key_mgmt "WPA-PSK" ;; eap) json_get_vars \ auth_server auth_secret auth_port \ acct_server acct_secret acct_port \ dae_client dae_secret dae_port \ - nasid rsn_preauth iapp_interface \ - eap_reauth_period + ownip \ + eap_reauth_period dynamic_vlan \ + vlan_naming vlan_tagged_interface \ + vlan_bridge # legacy compatibility [ -n "$auth_server" ] || json_get_var auth_server server @@ -208,6 +259,8 @@ hostapd_set_bss_options() { set_default acct_port 1813 set_default dae_port 3799 + set_default vlan_naming 1 + append bss_conf "auth_server_addr=$auth_server" "$N" append bss_conf "auth_server_port=$auth_port" "$N" append bss_conf "auth_server_shared_secret=$auth_secret" "$N" @@ -226,10 +279,19 @@ hostapd_set_bss_options() { append bss_conf "radius_das_client=$dae_client $dae_secret" "$N" } - append bss_conf "nas_identifier=$nasid" "$N" + [ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N" append bss_conf "eapol_key_index_workaround=1" "$N" append bss_conf "ieee8021x=1" "$N" - append bss_conf "wpa_key_mgmt=WPA-EAP" "$N" + append wpa_key_mgmt "WPA-EAP" + + [ -n "$dynamic_vlan" ] && { + append bss_conf "dynamic_vlan=$dynamic_vlan" "$N" + append bss_conf "vlan_naming=$vlan_naming" "$N" + [ -n "$vlan_bridge" ] && \ + append bss_conf "vlan_bridge=$vlan_bridge" "$N" + [ -n "$vlan_tagged_interface" ] && \ + append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N" + } ;; wep) local wep_keyidx=0 @@ -247,6 +309,7 @@ hostapd_set_bss_options() { set_default wps_pushbutton 0 set_default wps_label 0 + set_default wps_pbc_in_m1 0 config_methods= [ "$wps_pushbutton" -gt 0 ] && append config_methods push_button @@ -257,35 +320,72 @@ hostapd_set_bss_options() { set_default wps_device_type "6-0050F204-1" set_default wps_device_name "OpenWrt AP" set_default wps_manufacturer "openwrt.org" - set_default wps_pin "12345670" wps_state=2 [ -n "$wps_configured" ] && wps_state=1 - [ "$ext_registrar" -gt 0 -a -n "$bridge" ] && append bss_conf "upnp_iface=$bridge" "$N" + [ "$ext_registrar" -gt 0 -a -n "$network_bridge" ] && append bss_conf "upnp_iface=$network_bridge" "$N" append bss_conf "eap_server=1" "$N" - append bss_conf "ap_pin=$wps_pin" "$N" + [ -n "$wps_pin" ] && append bss_conf "ap_pin=$wps_pin" "$N" append bss_conf "wps_state=$wps_state" "$N" append bss_conf "ap_setup_locked=0" "$N" append bss_conf "device_type=$wps_device_type" "$N" append bss_conf "device_name=$wps_device_name" "$N" append bss_conf "manufacturer=$wps_manufacturer" "$N" append bss_conf "config_methods=$config_methods" "$N" + [ "$wps_pbc_in_m1" -gt 0 ] && append bss_conf "pbc_in_m1=$wps_pbc_in_m1" "$N" } append bss_conf "ssid=$ssid" "$N" [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N" - [ -n "$iapp_interface" ] && { + [ -n "$iapp_interface" ] && { iapp_interface="$(uci_get_state network "$iapp_interface" ifname "$iapp_interface")" [ -n "$iapp_interface" ] && append bss_conf "iapp_interface=$iapp_interface" "$N" } + if [ "$wpa" -ge "1" ]; then + json_get_vars nasid ieee80211r + set_default ieee80211r 0 + [ -n "$nasid" ] && append bss_conf "nas_identifier=$nasid" "$N" + + if [ "$ieee80211r" -gt "0" ]; then + json_get_vars mobility_domain r0_key_lifetime r1_key_holder \ + reassociation_deadline pmk_r1_push + json_get_values r0kh r0kh + json_get_values r1kh r1kh + + set_default mobility_domain "4f57" + set_default r0_key_lifetime 10000 + set_default r1_key_holder "00004f577274" + set_default reassociation_deadline 1000 + set_default pmk_r1_push 0 + + append bss_conf "mobility_domain=$mobility_domain" "$N" + append bss_conf "r0_key_lifetime=$r0_key_lifetime" "$N" + append bss_conf "r1_key_holder=$r1_key_holder" "$N" + append bss_conf "reassociation_deadline=$reassociation_deadline" "$N" + append bss_conf "pmk_r1_push=$pmk_r1_push" "$N" + + for kh in $r0kh; do + append bss_conf "r0kh=${kh//,/ }" "$N" + done + for kh in $r1kh; do + append bss_conf "r1kh=${kh//,/ }" "$N" + done + + [ "$wpa_key_mgmt" != "${wpa_key_mgmt/EAP/}" ] && append wpa_key_mgmt "FT-EAP" + [ "$wpa_key_mgmt" != "${wpa_key_mgmt/PSK/}" ] && append wpa_key_mgmt "FT-PSK" + fi + + [ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N" + fi + if [ "$wpa" -ge "2" ]; then - if [ -n "$bridge" -a "$rsn_preauth" = 1 ]; then + if [ -n "$network_bridge" -a "$rsn_preauth" = 1 ]; then set_default auth_cache 1 append bss_conf "rsn_preauth=1" "$N" - append bss_conf "rsn_preauth_interfaces=$bridge" "$N" + append bss_conf "rsn_preauth_interfaces=$network_bridge" "$N" else set_default auth_cache 0 fi @@ -294,7 +394,7 @@ hostapd_set_bss_options() { [ "$auth_cache" = 0 ] && append bss_conf "disable_pmksa_caching=1" "$N" # RSN -> allow management frame protection - json_get_var ieee80211w + json_get_var ieee80211w ieee80211w case "$ieee80211w" in [012]) json_get_vars ieee80211w_max_timeout ieee80211w_retry_timeout @@ -356,7 +456,7 @@ hostapd_set_log_options() { set_default log_iapp 1 set_default log_mlme 1 - local log_mask=$(( \ + local log_mask=$(( \ ($log_80211 << 0) | \ ($log_8021x << 1) | \ ($log_radius << 2) | \ @@ -383,7 +483,7 @@ _wpa_supplicant_common() { wpa_supplicant_teardown_interface() { _wpa_supplicant_common "$1" - rm -rf "$_rpath" "$_config" + rm -rf "$_rpath/$1" "$_config" } wpa_supplicant_prepare_interface() { @@ -446,7 +546,7 @@ wpa_supplicant_add_network() { local T=" " local wpa_key_mgmt="WPA-PSK" - local scan_ssid="1" + local scan_ssid="scan_ssid=1" local freq [[ "$_w_mode" = "adhoc" ]] && { @@ -457,12 +557,22 @@ wpa_supplicant_add_network() { append network_data "frequency=$freq" "$N$T" } - scan_ssid=0 + scan_ssid="scan_ssid=0" [ "$_w_driver" = "nl80211" ] || wpa_key_mgmt="WPA-NONE" } - [[ "$_w_mode" = adhoc ]] && append network_data "$_w_modestr" "$N$T" + [[ "$_w_mode" = "mesh" ]] && { + append network_data "mode=5" "$N$T" + [ -n "$channel" ] && { + freq="$(get_freq "$phy" "$channel")" + append network_data "frequency=$freq" "$N$T" + } + wpa_key_mgmt="SAE" + scan_ssid="" + } + + [[ "$_w_mode" = "adhoc" -o "$_w_mode" = "mesh" ]] && append network_data "$_w_modestr" "$N$T" case "$auth_type" in none) ;; @@ -506,46 +616,54 @@ wpa_supplicant_add_network() { ;; esac - case "$wpa" in - 1) - append network_data "proto=WPA" "$N$T" - ;; - 2) - append network_data "proto=RSN" "$N$T" - ;; - esac - - case "$ieee80211w" in - [012]) - [ "$wpa" -ge 2 ] && append network_data "ieee80211w=$ieee80211w" "$N$T" - ;; - esac + [ "$mode" = mesh ] || { + case "$wpa" in + 1) + append network_data "proto=WPA" "$N$T" + ;; + 2) + append network_data "proto=RSN" "$N$T" + ;; + esac + case "$ieee80211w" in + [012]) + [ "$wpa" -ge 2 ] && append network_data "ieee80211w=$ieee80211w" "$N$T" + ;; + esac + } local beacon_int brates mrate [ -n "$bssid" ] && append network_data "bssid=$bssid" "$N$T" [ -n "$beacon_int" ] && append network_data "beacon_int=$beacon_int" "$N$T" + local bssid_blacklist bssid_whitelist + json_get_values bssid_blacklist bssid_blacklist + json_get_values bssid_whitelist bssid_whitelist + + [ -n "$bssid_blacklist" ] && append network_data "bssid_blacklist=$bssid_blacklist" "$N$T" + [ -n "$bssid_whitelist" ] && append network_data "bssid_whitelist=$bssid_whitelist" "$N$T" [ -n "$basic_rate" ] && { local br rate_list= for br in $basic_rate; do - hostapd_add_rate rate_list "$br" + wpa_supplicant_add_rate rate_list "$br" done [ -n "$rate_list" ] && append network_data "rates=$rate_list" "$N$T" } [ -n "$mcast_rate" ] && { local mc_rate= - hostapd_add_rate mc_rate "$mcast_rate" + wpa_supplicant_add_rate mc_rate "$mcast_rate" append network_data "mcast_rate=$mc_rate" "$N$T" } local ht_str - [ -n "$ht" ] && append network_data "htmode=$ht" "$N$T" + [[ "$_w_mode" = adhoc ]] || ibss_htmode= + [ -n "$ibss_htmode" ] && append network_data "htmode=$ibss_htmode" "$N$T" cat >> "$_config" <