rpcd: iwinfo plugin fixes

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

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index bdfcbb2..005112d 100644 (file)
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -1,3 +1,5 @@
+. /lib/functions/network.sh
+
 wpa_supplicant_add_rate() {
        local var="$1"
        local val="$(($2 / 1000))"
@@ -137,7 +139,7 @@ hostapd_common_add_bss_config() {
        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 eap_type ca_cert client_cert identity anonymous_identity auth priv_key priv_key_pwd
 
        config_add_int dynamic_vlan vlan_naming
        config_add_string vlan_tagged_interface vlan_bridge
@@ -194,6 +196,7 @@ hostapd_set_bss_options() {
        set_default hidden 0
        set_default wmm 1
        set_default uapsd 1
+       set_default eapol_version 0
 
        append bss_conf "ctrl_interface=/var/run/hostapd"
        if [ "$isolate" -gt 0 ]; then
@@ -350,8 +353,9 @@ hostapd_set_bss_options() {
        append bss_conf "ssid=$ssid" "$N"
        [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
        [ -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"
+               local ifname
+               network_get_device ifname "$iapp_interface" || ifname = "$iapp_interface"
+               append bss_conf "iapp_interface=$ifname" "$N"
        }
 
        if [ "$wpa" -ge "1" ]; then
@@ -532,9 +536,15 @@ wpa_supplicant_prepare_interface() {
                _w_modestr="mode=1"
        }
 
+       local country_str=
+       [ -n "$country" ] && {
+               country_str="country=$country"
+       }
+
        wpa_supplicant_teardown_interface "$ifname"
        cat > "$_config" <<EOF
 $ap_scan
+$country_str
 EOF
        return 0
 }
@@ -577,6 +587,9 @@ wpa_supplicant_add_network() {
        }
 
        [[ "$_w_mode" = "mesh" ]] && {
+               json_get_vars mesh_id
+               ssid="${mesh_id}"
+
                append network_data "mode=5" "$N$T"
                [ -n "$channel" ] && {
                        freq="$(get_freq "$phy" "$channel")"
@@ -610,9 +623,10 @@ wpa_supplicant_add_network() {
                        key_mgmt='WPA-EAP'
                        [ "$ieee80211r" -gt 0 ] && key_mgmt="FT-EAP $key_mgmt"
 
-                       json_get_vars eap_type identity ca_cert
+                       json_get_vars eap_type identity anonymous_identity ca_cert
                        [ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T"
                        [ -n "$identity" ] && append network_data "identity=\"$identity\"" "$N$T"
+                       [ -n "$anonymous_identity" ] && append network_data "anonymous_identity=\"$anonymous_identity\"" "$N$T"
                        case "$eap_type" in
                                tls)
                                        json_get_vars client_cert priv_key priv_key_pwd
@@ -620,11 +634,32 @@ wpa_supplicant_add_network() {
                                        append network_data "private_key=\"$priv_key\"" "$N$T"
                                        append network_data "private_key_passwd=\"$priv_key_pwd\"" "$N$T"
                                ;;
-                               peap|ttls)
-                                       json_get_vars auth password
+                               fast|peap|ttls)
+                                       json_get_vars auth password ca_cert2 client_cert2 priv_key2 priv_key2_pwd
                                        set_default auth MSCHAPV2
-                                       append network_data "phase2=\"$auth\"" "$N$T"
-                                       append network_data "password=\"$password\"" "$N$T"
+
+                                       if [ "$auth" = "EAP-TLS" ]; then
+                                               [ -n "$ca_cert2" ] &&
+                                                       append network_data "ca_cert2=\"$ca_cert2\"" "$N$T"
+                                               append network_data "client_cert2=\"$client_cert2\"" "$N$T"
+                                               append network_data "private_key2=\"$priv_key2\"" "$N$T"
+                                               append network_data "private_key2_passwd=\"$priv_key2_pwd\"" "$N$T"
+                                       else
+                                               append network_data "password=\"$password\"" "$N$T"
+                                       fi
+
+                                       phase2proto="auth="
+                                       case "$auth" in
+                                               "auth"*)
+                                                       phase2proto=""
+                                               ;;
+                                               "EAP-"*)
+                                                       auth="$(echo $auth | cut -b 5- )"
+                                                       [ "$eap_type" = "ttls" ] &&
+                                                               phase2proto="autheap="
+                                               ;;
+                                       esac
+                                       append network_data "phase2=\"$phase2proto$auth\"" "$N$T"
                                ;;
                        esac
                        append network_data "eap=$(echo $eap_type | tr 'a-z' 'A-Z')" "$N$T"