hostapd: add additional radius options

[openwrt/staging/ynezz.git] / package / network / services / hostapd / files / hostapd.sh

diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index b46d58b4a30bdf9c0a486ea2d92b4119049b2395..7f03396cb5600dc42aa5c8aeab5725203930adf6 100644 (file)
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -266,7 +266,7 @@ hostapd_common_add_bss_config() {
        config_add_array domain_match domain_match2 domain_suffix_match domain_suffix_match2
        config_add_string ieee80211w_mgmt_cipher
 
-       config_add_int dynamic_vlan vlan_naming
+       config_add_int dynamic_vlan vlan_naming vlan_no_bridge
        config_add_string vlan_tagged_interface vlan_bridge
        config_add_string vlan_file
 
@@ -316,7 +316,7 @@ hostapd_common_add_bss_config() {
        config_add_int iw_ipaddr_type_availability iw_gas_address3
        config_add_string iw_hessid iw_network_auth_type iw_qos_map_set
        config_add_array iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
-       config_add_array iw_anqp_elem
+       config_add_array iw_anqp_elem iw_venue_name iw_venue_url
 
        config_add_boolean hs20 disable_dgaf osen
        config_add_int anqp_domain_id
@@ -327,12 +327,18 @@ hostapd_common_add_bss_config() {
        config_add_array hs20_conn_capab
        config_add_string osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp
 
+       config_add_string hs20_t_c_server_url
+
        config_add_array airtime_sta_weight
        config_add_int airtime_bss_weight airtime_bss_limit
 
        config_add_boolean multicast_to_unicast per_sta_vif
 
        config_add_array hostapd_bss_options
+
+       config_add_boolean request_cui
+       config_add_array radius_auth_req_attr
+       config_add_array radius_acct_req_attr
 }
 
 hostapd_set_vlan_file() {
@@ -396,10 +402,22 @@ append_iw_nai_realm() {
        [ -n "$1" ] && append bss_conf "nai_realm=$1" "$N"
 }
 
+append_iw_venue_name() {
+       append bss_conf "venue_name=$1" "$N"
+}
+
+append_iw_venue_url() {
+       append bss_conf "venue_url=$1" "$N"
+}
+
 append_hs20_oper_friendly_name() {
        append bss_conf "hs20_oper_friendly_name=$1" "$N"
 }
 
+append_osu_provider_friendly_name() {
+       append bss_conf "osu_friendly_name=$1" "$N"
+}
+
 append_osu_provider_service_desc() {
        append bss_conf "osu_service_desc=$1" "$N"
 }
@@ -429,7 +447,7 @@ append_osu_icon() {
 }
 
 append_osu_provider() {
-       local cfgtype osu_server_uri osu_friendly_name osu_nai osu_nai2 osu_method_list 
+       local cfgtype osu_server_uri osu_friendly_name osu_nai osu_nai2 osu_method_list
 
        config_load wireless
        config_get cfgtype "$1" TYPE
@@ -447,6 +465,7 @@ append_osu_provider() {
        append bss_conf "osu_method_list=$osu_method_list" "$N"
 
        config_list_foreach "$1" osu_service_desc append_osu_provider_service_desc
+       config_list_foreach "$1" osu_friendly_name append_osu_friendly_name
        config_list_foreach "$1" osu_icon append_osu_icon
 
        append bss_conf "$N"
@@ -456,6 +475,14 @@ append_hs20_conn_capab() {
        [ -n "$1" ] && append bss_conf "hs20_conn_capab=$1" "$N"
 }
 
+append_radius_acct_req_attr() {
+       append bss_conf "radius_acct_req_attr=$1" "$N"
+}
+
+append_radius_auth_req_attr() {
+       append bss_conf "radius_auth_req_attr=$1" "$N"
+}
+
 append_airtime_sta_weight() {
        [ -n "$1" ] && append bss_conf "airtime_sta_weight=$1" "$N"
 }
@@ -547,6 +574,7 @@ hostapd_set_bss_options() {
                        append bss_conf "acct_server_shared_secret=$acct_secret" "$N"
                [ -n "$acct_interval" ] && \
                        append bss_conf "radius_acct_interim_interval=$acct_interval" "$N"
+               json_for_each_item append_radius_acct_req_attr radius_acct_req_attr
        }
 
        case "$auth_type" in
@@ -601,7 +629,7 @@ hostapd_set_bss_options() {
                                auth_server auth_secret auth_port \
                                dae_client dae_secret dae_port \
                                ownip radius_client_addr \
-                               eap_reauth_period
+                               eap_reauth_period request_cui
 
                        # radius can provide VLAN ID for clients
                        vlan_possible=1
@@ -613,18 +641,20 @@ hostapd_set_bss_options() {
 
                        set_default auth_port 1812
                        set_default dae_port 3799
-
+                       set_default request_cui 0
 
                        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"
 
+                       [ "$request_cui" -gt 0 ] && append bss_conf "radius_request_cui=$request_cui" "$N"
                        [ -n "$eap_reauth_period" ] && append bss_conf "eap_reauth_period=$eap_reauth_period" "$N"
 
                        [ -n "$dae_client" -a -n "$dae_secret" ] && {
                                append bss_conf "radius_das_port=$dae_port" "$N"
                                append bss_conf "radius_das_client=$dae_client $dae_secret" "$N"
                        }
+                       json_for_each_item append_radius_auth_req_attr radius_auth_req_attr
 
                        [ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N"
                        [ -n "$radius_client_addr" ] && append bss_conf "radius_client_addr=$radius_client_addr" "$N"
@@ -666,7 +696,7 @@ hostapd_set_bss_options() {
                set_default wps_independent 1
 
                wps_state=2
-               [ -n "$wps_configured" ] && wps_state=1
+               [ -n "$wps_not_configured" ] && wps_state=1
 
                [ "$ext_registrar" -gt 0 -a -n "$network_bridge" ] && append bss_conf "upnp_iface=$network_bridge" "$N"
 
@@ -733,7 +763,7 @@ hostapd_set_bss_options() {
                        append bss_conf "ftm_responder=1" "$N"
                        [ "$stationary_ap" -eq "1" ] && append bss_conf "stationary_ap=1" "$N"
                        [ -n "$lci" ] && append bss_conf "lci=$lci" "$N"
-                       [ -n "$civic" ] && append bss_conf "lci=$civic" "$N"
+                       [ -n "$civic" ] && append bss_conf "civic=$civic" "$N"
                }
        fi
 
@@ -743,7 +773,7 @@ hostapd_set_bss_options() {
 
                if [ "$ieee80211r" -gt "0" ]; then
                        json_get_vars mobility_domain ft_psk_generate_local ft_over_ds reassociation_deadline
-                       
+
                        set_default mobility_domain "$(echo "$ssid" | md5sum | head -c 4)"
                        set_default ft_over_ds 1
                        set_default reassociation_deadline 1000
@@ -856,13 +886,17 @@ hostapd_set_bss_options() {
        }
 
        [ -n "$vlan_possible" -a -n "$dynamic_vlan" ] && {
-               json_get_vars vlan_naming vlan_tagged_interface vlan_bridge vlan_file
+               json_get_vars vlan_naming vlan_tagged_interface vlan_bridge vlan_file vlan_no_bridge
                set_default vlan_naming 1
                [ -z "$vlan_file" ] && set_default vlan_file /var/run/hostapd-$ifname.vlan
                append bss_conf "dynamic_vlan=$dynamic_vlan" "$N"
                append bss_conf "vlan_naming=$vlan_naming" "$N"
-               [ -n "$vlan_bridge" ] && \
+               if [ -n "$vlan_bridge" ]; then
                        append bss_conf "vlan_bridge=$vlan_bridge" "$N"
+               else
+                       set_default vlan_no_bridge 1
+               fi
+               append bss_conf "vlan_no_bridge=$vlan_no_bridge" "$N"
                [ -n "$vlan_tagged_interface" ] && \
                        append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
                [ -n "$vlan_file" ] && {
@@ -875,6 +909,7 @@ hostapd_set_bss_options() {
        json_get_vars iw_hessid iw_venue_group iw_venue_type iw_network_auth_type
        json_get_vars iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
        json_get_vars iw_anqp_elem iw_qos_map_set iw_ipaddr_type_availability iw_gas_address3
+       json_get_vars iw_venue_name iw_venue_url
 
        set_default iw_enabled 0
        if [ "$iw_enabled" = "1" ]; then
@@ -903,6 +938,8 @@ hostapd_set_bss_options() {
                json_for_each_item append_iw_roaming_consortium iw_roaming_consortium
                json_for_each_item append_iw_anqp_elem iw_anqp_elem
                json_for_each_item append_iw_nai_realm iw_nai_realm
+               json_for_each_item append_iw_venue_name iw_venue_name
+               json_for_each_item append_iw_venue_url iw_venue_url
 
                iw_domain_name_conf=
                json_for_each_item append_iw_domain_name iw_domain_name
@@ -917,9 +954,11 @@ hostapd_set_bss_options() {
 
 
        local hs20 disable_dgaf osen anqp_domain_id hs20_deauth_req_timeout \
-               osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp
+               osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp \
+               hs20_t_c_server_url
        json_get_vars hs20 disable_dgaf osen anqp_domain_id hs20_deauth_req_timeout \
-               osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp
+               osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp \
+               hs20_t_c_server_url
 
        set_default hs20 0
        set_default disable_dgaf $hs20
@@ -938,8 +977,9 @@ hostapd_set_bss_options() {
                [ -n "$hs20_operating_class" ] && append bss_conf "hs20_operating_class=$hs20_operating_class" "$N"
                [ -n "$hs20_t_c_filename" ] && append bss_conf "hs20_t_c_filename=$hs20_t_c_filename" "$N"
                [ -n "$hs20_t_c_timestamp" ] && append bss_conf "hs20_t_c_timestamp=$hs20_t_c_timestamp" "$N"
-               json_for_each_item append_hs20_conn_capab hs20_conn_capab
+               [ -n "$hs20_t_c_server_url" ] && append bss_conf "hs20_t_c_server_url=$hs20_t_c_server_url" "$N"
                json_for_each_item append_hs20_oper_friendly_name hs20_oper_friendly_name
+               json_for_each_item append_hs20_conn_capab hs20_conn_capab
                json_for_each_item append_osu_provider osu_provider
                json_for_each_item append_operator_icon operator_icon
        fi
@@ -1368,7 +1408,7 @@ wpa_supplicant_add_network() {
                append network_data "mcast_rate=$mc_rate" "$N$T"
        }
 
-       if [ "$key_mgnt" = "WPS" ]; then
+       if [ "$key_mgmt" = "WPS" ]; then
                echo "wps_cred_processing=1" >> "$_config"
        else
                cat >> "$_config" <<EOF