hostapd: remove unused hostapd-common-old package
authorFelix Fietkau <nbd@nbd.name>
Fri, 5 Aug 2016 09:02:50 +0000 (11:02 +0200)
committerFelix Fietkau <nbd@nbd.name>
Fri, 5 Aug 2016 09:02:57 +0000 (11:02 +0200)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/network/services/hostapd/Makefile
package/network/services/hostapd/files/hostapd.sh [deleted file]
package/network/services/hostapd/files/wpa_supplicant.sh [deleted file]

index 5edea14..5caf3e3 100644 (file)
@@ -254,12 +254,6 @@ define Package/hostapd-common
   CATEGORY:=Network
 endef
 
-define Package/hostapd-common-old
-  TITLE:=hostapd/wpa_supplicant common support files (legacy drivers)
-  SECTION:=net
-  CATEGORY:=Network
-endef
-
 define Package/eapol-test
   TITLE:=802.1x authentication test utility
   SECTION:=net
@@ -376,12 +370,6 @@ define Package/hostapd-common/install
        $(INSTALL_DATA) ./files/netifd.sh $(1)/lib/netifd/hostapd.sh
 endef
 
-define Package/hostapd-common-old/install
-       $(INSTALL_DIR) $(1)/lib/wifi
-       $(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/wifi/hostapd.sh
-       $(INSTALL_DATA) ./files/wpa_supplicant.sh $(1)/lib/wifi/wpa_supplicant.sh
-endef
-
 define Package/hostapd/install
        $(call Install/hostapd,$(1))
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/
@@ -439,5 +427,4 @@ $(eval $(call BuildPackage,wpa-supplicant-p2p))
 $(eval $(call BuildPackage,wpa-cli))
 $(eval $(call BuildPackage,hostapd-utils))
 $(eval $(call BuildPackage,hostapd-common))
-$(eval $(call BuildPackage,hostapd-common-old))
 $(eval $(call BuildPackage,eapol-test))
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
deleted file mode 100644 (file)
index 9c1ba0f..0000000
+++ /dev/null
@@ -1,399 +0,0 @@
-. /lib/functions/network.sh
-
-hostapd_set_bss_options() {
-       local var="$1"
-       local vif="$2"
-       local enc wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wps_possible wpa_key_mgmt
-
-       config_get enc "$vif" encryption "none"
-       config_get wep_rekey        "$vif" wep_rekey        # 300
-       config_get wpa_group_rekey  "$vif" wpa_group_rekey  # 300
-       config_get wpa_pair_rekey   "$vif" wpa_pair_rekey   # 300
-       config_get wpa_master_rekey "$vif" wpa_master_rekey # 640
-       config_get_bool ap_isolate "$vif" isolate 0
-       config_get_bool disassoc_low_ack "$vif" disassoc_low_ack 1
-       config_get max_num_sta "$vif" max_num_sta 0
-       config_get max_inactivity "$vif" max_inactivity 0
-       config_get_bool preamble "$vif" short_preamble 1
-
-       config_get device "$vif" device
-       config_get hwmode "$device" hwmode
-       config_get phy "$device" phy
-
-       append "$var" "ctrl_interface=/var/run/hostapd-$phy" "$N"
-
-       if [ "$ap_isolate" -gt 0 ]; then
-               append "$var" "ap_isolate=$ap_isolate" "$N"
-       fi
-       if [ "$max_num_sta" -gt 0 ]; then
-               append "$var" "max_num_sta=$max_num_sta" "$N"
-       fi
-       if [ "$max_inactivity" -gt 0 ]; then
-               append "$var" "ap_max_inactivity=$max_inactivity" "$N"
-       fi
-       append "$var" "disassoc_low_ack=$disassoc_low_ack" "$N"
-       if [ "$preamble" -gt 0 ]; then
-               append "$var" "preamble=$preamble" "$N"
-       fi
-
-       # Examples:
-       # psk-mixed/tkip        => WPA1+2 PSK, TKIP
-       # wpa-psk2/tkip+aes     => WPA2 PSK, CCMP+TKIP
-       # wpa2/tkip+aes         => WPA2 RADIUS, CCMP+TKIP
-       # ...
-
-       # TODO: move this parsing function somewhere generic, so that
-       # later it can be reused by drivers that don't use hostapd
-
-       # crypto defaults: WPA2 vs WPA1
-       case "$enc" in
-               wpa2*|*psk2*)
-                       wpa=2
-                       crypto="CCMP"
-               ;;
-               *mixed*)
-                       wpa=3
-                       crypto="CCMP TKIP"
-               ;;
-               *)
-                       wpa=1
-                       crypto="TKIP"
-               ;;
-       esac
-
-       # explicit override for crypto setting
-       case "$enc" in
-               *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) crypto="CCMP TKIP";;
-               *aes|*ccmp) crypto="CCMP";;
-               *tkip) crypto="TKIP";;
-       esac
-
-       # enforce CCMP for 11ng and 11na
-       case "$hwmode:$crypto" in
-               *ng:TKIP|*na:TKIP) crypto="CCMP TKIP";;
-       esac
-
-       # use crypto/auth settings for building the hostapd config
-       case "$enc" in
-               none)
-                       wps_possible=1
-                       wpa=0
-                       crypto=
-                       # Here we make the assumption that if we're in open mode
-                       # with WPS enabled, we got to be in unconfigured state.
-                       wps_not_configured=1
-               ;;
-               *psk*)
-                       config_get psk "$vif" key
-                       if [ ${#psk} -eq 64 ]; then
-                               append "$var" "wpa_psk=$psk" "$N"
-                       else
-                               append "$var" "wpa_passphrase=$psk" "$N"
-                       fi
-                       wps_possible=1
-                       [ -n "$wpa_group_rekey"  ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N"
-                       [ -n "$wpa_pair_rekey"   ] && append "$var" "wpa_ptk_rekey=$wpa_pair_rekey"    "$N"
-                       [ -n "$wpa_master_rekey" ] && append "$var" "wpa_gmk_rekey=$wpa_master_rekey"  "$N"
-                       append wpa_key_mgmt "WPA-PSK"
-               ;;
-               *wpa*|*8021x*)
-                       # required fields? formats?
-                       # hostapd is particular, maybe a default configuration for failures
-                       config_get auth_server "$vif" auth_server
-                       [ -z "$auth_server" ] && config_get auth_server "$vif" server
-                       append "$var" "auth_server_addr=$auth_server" "$N"
-                       config_get auth_port "$vif" auth_port
-                       [ -z "$auth_port" ] && config_get auth_port "$vif" port
-                       auth_port=${auth_port:-1812}
-                       append "$var" "auth_server_port=$auth_port" "$N"
-                       config_get auth_secret "$vif" auth_secret
-                       [ -z "$auth_secret" ] && config_get auth_secret "$vif" key
-                       append "$var" "auth_server_shared_secret=$auth_secret" "$N"
-                       # You don't really want to enable this unless you are doing
-                       # some corner case testing or are using OpenWrt as a work around
-                       # for some systematic issues.
-                       config_get_bool auth_cache "$vif" auth_cache 0
-                       config_get rsn_preauth "$vif" rsn_preauth
-                       [ "$auth_cache" -gt 0 ] || [[ "$rsn_preauth" = 1 ]] || append "$var" "disable_pmksa_caching=1" "$N"
-                       [ "$auth_cache" -gt 0 ] || [[ "$rsn_preauth" = 1 ]] || append "$var" "okc=0" "$N"
-                       config_get acct_server "$vif" acct_server
-                       [ -n "$acct_server" ] && append "$var" "acct_server_addr=$acct_server" "$N"
-                       config_get acct_port "$vif" acct_port
-                       [ -n "$acct_port" ] && acct_port=${acct_port:-1813}
-                       [ -n "$acct_port" ] && append "$var" "acct_server_port=$acct_port" "$N"
-                       config_get acct_secret "$vif" acct_secret
-                       [ -n "$acct_secret" ] && append "$var" "acct_server_shared_secret=$acct_secret" "$N"
-                       config_get eap_reauth_period "$vif" eap_reauth_period
-                       [ -n "$eap_reauth_period" ] && append "$var" "eap_reauth_period=$eap_reauth_period" "$N"
-                       config_get dae_client "$vif" dae_client
-                       config_get dae_secret "$vif" dae_secret
-                       [ -n "$dae_client" -a -n "$dae_secret" ] && {
-                               config_get dae_port  "$vif" dae_port
-                               append "$var" "radius_das_port=${dae_port:-3799}" "$N"
-                               append "$var" "radius_das_client=$dae_client $dae_secret" "$N"
-                       }
-                       config_get ownip "$vif" ownip
-                       append "$var" "own_ip_addr=$ownip" "$N"
-                       append "$var" "eapol_key_index_workaround=1" "$N"
-                       append "$var" "ieee8021x=1" "$N"
-                       append wpa_key_mgmt "WPA-EAP"
-                       [ -n "$wpa_group_rekey"  ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N"
-                       [ -n "$wpa_pair_rekey"   ] && append "$var" "wpa_ptk_rekey=$wpa_pair_rekey"    "$N"
-                       [ -n "$wpa_master_rekey" ] && append "$var" "wpa_gmk_rekey=$wpa_master_rekey"  "$N"
-               ;;
-               *wep*)
-                       config_get key "$vif" key
-                       key="${key:-1}"
-                       case "$key" in
-                               [1234])
-                                       for idx in 1 2 3 4; do
-                                               local zidx
-                                               zidx=$(($idx - 1))
-                                               config_get ckey "$vif" "key${idx}"
-                                               [ -n "$ckey" ] && \
-                                                       append "$var" "wep_key${zidx}=$(prepare_key_wep "$ckey")" "$N"
-                                       done
-                                       append "$var" "wep_default_key=$((key - 1))"  "$N"
-                               ;;
-                               *)
-                                       append "$var" "wep_key0=$(prepare_key_wep "$key")" "$N"
-                                       append "$var" "wep_default_key=0" "$N"
-                                       [ -n "$wep_rekey" ] && append "$var" "wep_rekey_period=$wep_rekey" "$N"
-                               ;;
-                       esac
-                       case "$enc" in
-                               *shared*)
-                                       auth_algs=2
-                               ;;
-                               *mixed*)
-                                       auth_algs=3
-                               ;;
-                       esac
-                       wpa=0
-                       crypto=
-               ;;
-               *)
-                       wpa=0
-                       crypto=
-               ;;
-       esac
-       append "$var" "auth_algs=${auth_algs:-1}" "$N"
-       append "$var" "wpa=$wpa" "$N"
-       [ -n "$crypto" ] && append "$var" "wpa_pairwise=$crypto" "$N"
-       [ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N"
-
-       config_get ssid "$vif" ssid
-       config_get bridge "$vif" bridge
-       config_get ieee80211d "$vif" ieee80211d
-       config_get iapp_interface "$vif" iapp_interface
-
-       config_get_bool wps_pbc "$vif" wps_pushbutton 0
-       config_get_bool wps_label "$vif" wps_label 0
-
-       config_get config_methods "$vif" wps_config
-       [ "$wps_pbc" -gt 0 ] && append config_methods push_button
-
-       [ -n "$wps_possible" -a -n "$config_methods" ] && {
-               config_get device_type "$vif" wps_device_type "6-0050F204-1"
-               config_get device_name "$vif" wps_device_name "Lede AP"
-               config_get manufacturer "$vif" wps_manufacturer "www.lede-project.org"
-               config_get wps_pin "$vif" wps_pin
-
-               config_get_bool ext_registrar "$vif" ext_registrar 0
-               [ "$ext_registrar" -gt 0 -a -n "$bridge" ] && append "$var" "upnp_iface=$bridge" "$N"
-
-               append "$var" "eap_server=1" "$N"
-               [ -n "$wps_pin" ] && append "$var" "ap_pin=$wps_pin" "$N"
-               append "$var" "wps_state=${wps_not_configured:-2}" "$N"
-               append "$var" "ap_setup_locked=0" "$N"
-               append "$var" "device_type=$device_type" "$N"
-               append "$var" "device_name=$device_name" "$N"
-               append "$var" "manufacturer=$manufacturer" "$N"
-               append "$var" "config_methods=$config_methods" "$N"
-       }
-
-       append "$var" "ssid=$ssid" "$N"
-       [ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N"
-       [ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N"
-       [ -n "$iapp_interface" ] && {
-               local ifname
-               network_get_device ifname "$iapp_interface" || ifname = "$iapp_interface"
-               append bss_conf "iapp_interface=$ifname" "$N"
-       }
-
-       if [ "$wpa" -ge "1" ]
-       then
-               config_get nasid "$vif" nasid
-               [ -n "$nasid" ] && append "$var" "nas_identifier=$nasid" "$N"
-
-               config_get_bool ieee80211r "$vif" ieee80211r 0
-               if [ "$ieee80211r" -gt 0 ]
-               then
-                       config_get mobility_domain "$vif" mobility_domain "4f57"
-                       config_get r0_key_lifetime "$vif" r0_key_lifetime "10000"
-                       config_get r1_key_holder "$vif" r1_key_holder "00004f577274"
-                       config_get reassociation_deadline "$vif" reassociation_deadline "1000"
-                       config_get r0kh "$vif" r0kh
-                       config_get r1kh "$vif" r1kh
-                       config_get_bool pmk_r1_push "$vif" pmk_r1_push 0
-
-                       append "$var" "mobility_domain=$mobility_domain" "$N"
-                       append "$var" "r0_key_lifetime=$r0_key_lifetime" "$N"
-                       append "$var" "r1_key_holder=$r1_key_holder" "$N"
-                       append "$var" "reassociation_deadline=$reassociation_deadline" "$N"
-                       append "$var" "pmk_r1_push=$pmk_r1_push" "$N"
-
-                       for kh in $r0kh; do
-                               "$var" "r0kh=${kh//,/ }" "$N"
-                       done
-                       for kh in $r1kh; do
-                               "$var" "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 "$var" "wpa_key_mgmt=$wpa_key_mgmt"
-       fi
-
-       if [ "$wpa" -ge "2" ]
-       then
-               # RSN -> allow preauthentication. You have two
-               # options, rsn_preauth for production or rsn_preauth_testing
-               # for validation / testing.
-               if [ -n "$bridge" -a "$rsn_preauth" = 1 ]
-               then
-                       append "$var" "rsn_preauth=1" "$N"
-                       append "$var" "rsn_preauth_interfaces=$bridge" "$N"
-                       append "$var" "okc=1" "$N"
-               else
-                       # RSN preauthentication testings hould disable
-                       # Opportunistic Key Caching (okc) as otherwise the PMKSA
-                       # entry for a test could come from the Opportunistic Key Caching
-                       config_get rsn_preauth_testing "$vif" rsn_preauth_testing
-                       if [ -n "$bridge" -a "$rsn_preauth_testing" = 1 ]
-                       then
-                               append "$var" "rsn_preauth=1" "$N"
-                               append "$var" "rsn_preauth_interfaces=$bridge" "$N"
-                               append "$var" "okc=0" "$N"
-                       fi
-               fi
-
-               # RSN -> allow management frame protection
-               config_get ieee80211w "$vif" ieee80211w
-               case "$ieee80211w" in
-                       [012])
-                               append "$var" "ieee80211w=$ieee80211w" "$N"
-                               [ "$ieee80211w" -gt "0" ] && {
-                                       config_get ieee80211w_max_timeout "$vif" ieee80211w_max_timeout
-                                       config_get ieee80211w_retry_timeout "$vif" ieee80211w_retry_timeout
-                                       [ -n "$ieee80211w_max_timeout" ] && \
-                                               append "$var" "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
-                                       [ -n "$ieee80211w_retry_timeout" ] && \
-                                               append "$var" "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N"
-                               }
-                       ;;
-               esac
-       fi
-
-       config_get macfile "$vif" macfile
-       config_get maclist "$vif" maclist
-       if [ -z "$macfile" ]
-       then
-               # if no macfile has been specified, fallback to the default name
-               # and truncate file to avoid aggregating entries over time
-               macfile="/var/run/hostapd-$ifname.maclist"
-               echo "" > "$macfile"
-       else
-               if [ -n "$maclist" ]
-               then
-                       # to avoid to overwrite the original file, make a copy
-                       # before appending the entries specified by the maclist
-                       # option
-                       cp $macfile $macfile.maclist
-                       macfile=$macfile.maclist
-               fi
-       fi
-
-       if [ -n "$maclist" ]
-       then
-               for mac in $maclist; do
-                       echo "$mac" >> $macfile
-               done
-       fi
-
-       config_get macfilter "$vif" macfilter
-       case "$macfilter" in
-               allow)
-                       append "$var" "macaddr_acl=1" "$N"
-                       append "$var" "accept_mac_file=$macfile" "$N"
-                       ;;
-               deny)
-                       append "$var" "macaddr_acl=0" "$N"
-                       append "$var" "deny_mac_file=$macfile" "$N"
-                       ;;
-       esac
-}
-
-hostapd_set_log_options() {
-       local var="$1"
-       local cfg="$2"
-       local log_level log_80211 log_8021x log_radius log_wpa log_driver log_iapp log_mlme
-
-       config_get log_level "$cfg" log_level 2
-
-       config_get_bool log_80211  "$cfg" log_80211  1
-       config_get_bool log_8021x  "$cfg" log_8021x  1
-       config_get_bool log_radius "$cfg" log_radius 1
-       config_get_bool log_wpa    "$cfg" log_wpa    1
-       config_get_bool log_driver "$cfg" log_driver 1
-       config_get_bool log_iapp   "$cfg" log_iapp   1
-       config_get_bool log_mlme   "$cfg" log_mlme   1
-
-       local log_mask=$((       \
-               ($log_80211  << 0) | \
-               ($log_8021x  << 1) | \
-               ($log_radius << 2) | \
-               ($log_wpa    << 3) | \
-               ($log_driver << 4) | \
-               ($log_iapp   << 5) | \
-               ($log_mlme   << 6)   \
-       ))
-
-       append "$var" "logger_syslog=$log_mask" "$N"
-       append "$var" "logger_syslog_level=$log_level" "$N"
-       append "$var" "logger_stdout=$log_mask" "$N"
-       append "$var" "logger_stdout_level=$log_level" "$N"
-}
-
-hostapd_setup_vif() {
-       local vif="$1"
-       local driver="$2"
-       local ifname device channel hwmode
-
-       hostapd_cfg=
-
-       config_get ifname "$vif" ifname
-       config_get device "$vif" device
-       config_get channel "$device" channel
-       config_get hwmode "$device" hwmode
-
-       hostapd_set_log_options hostapd_cfg "$device"
-       hostapd_set_bss_options hostapd_cfg "$vif"
-
-       case "$hwmode" in
-               *bg|*gdt|*gst|*fh) hwmode=g;;
-               *adt|*ast) hwmode=a;;
-       esac
-       [ "$channel" = auto ] && channel=
-       [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
-       cat > /var/run/hostapd-$ifname.conf <<EOF
-driver=$driver
-interface=$ifname
-${hwmode:+hw_mode=${hwmode#11}}
-${channel:+channel=$channel}
-$hostapd_cfg
-EOF
-       hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf
-}
diff --git a/package/network/services/hostapd/files/wpa_supplicant.sh b/package/network/services/hostapd/files/wpa_supplicant.sh
deleted file mode 100644 (file)
index b678484..0000000
+++ /dev/null
@@ -1,194 +0,0 @@
-wpa_supplicant_setup_vif() {
-       local vif="$1"
-       local driver="$2"
-       local key="$key"
-       local options="$3"
-       local freq=""
-       local ht="$5"
-       local ap_scan=""
-       local scan_ssid="1"
-       [ -n "$4" ] && freq="frequency=$4"
-
-       config_get enc "$vif" encryption
-       config_get key "$vif" key
-
-       local net_cfg bridge
-       config_get bridge "$vif" bridge
-       [ -z "$bridge" ] && {
-               net_cfg="$(find_net_config "$vif")"
-               [ -z "$net_cfg" ] || bridge="$(bridge_interface "$net_cfg")"
-               config_set "$vif" bridge "$bridge"
-       }
-
-       local mode ifname wds modestr=""
-       config_get mode "$vif" mode
-       config_get ifname "$vif" ifname
-       config_get_bool wds "$vif" wds 0
-       [ -z "$bridge" ] || [ "$mode" = ap ] || [ "$mode" = sta -a $wds -eq 1 ] || {
-               echo "wpa_supplicant_setup_vif($ifname): Refusing to bridge $mode mode interface"
-               return 1
-       }
-       [ "$mode" = "adhoc" ] && {
-               modestr="mode=1"
-               scan_ssid="0"
-               ap_scan="ap_scan=2"
-       }
-
-       key_mgmt='NONE'
-       case "$enc" in
-               *none*) ;;
-               *wep*)
-                       config_get key "$vif" key
-                       key="${key:-1}"
-                       case "$key" in
-                               [1234])
-                                       for idx in 1 2 3 4; do
-                                               local zidx
-                                               zidx=$(($idx - 1))
-                                               config_get ckey "$vif" "key${idx}"
-                                               [ -n "$ckey" ] && \
-                                                       append "wep_key${zidx}" "wep_key${zidx}=$(prepare_key_wep "$ckey")"
-                                       done
-                                       wep_tx_keyidx="wep_tx_keyidx=$((key - 1))"
-                               ;;
-                               *)
-                                       wep_key0="wep_key0=$(prepare_key_wep "$key")"
-                                       wep_tx_keyidx="wep_tx_keyidx=0"
-                               ;;
-                       esac
-               ;;
-               *psk*)
-                       key_mgmt='WPA-PSK'
-                       # if you want to use PSK with a non-nl80211 driver you
-                       # have to use WPA-NONE and wext driver for wpa_s
-                       [ "$mode" = "adhoc" -a "$driver" != "nl80211" ] && {
-                               key_mgmt='WPA-NONE'
-                               driver='wext'
-                       }
-                       if [ ${#key} -eq 64 ]; then
-                               passphrase="psk=${key}"
-                       else
-                               passphrase="psk=\"${key}\""
-                       fi
-                       case "$enc" in
-                               *psk2*)
-                                       proto='proto=RSN'
-                                       config_get ieee80211w "$vif" ieee80211w
-                               ;;
-                               *psk*)
-                                       proto='proto=WPA'
-                               ;;
-                       esac
-               ;;
-               *wpa*|*8021x*)
-                       proto='proto=WPA2'
-                       key_mgmt='WPA-EAP'
-                       config_get ieee80211w "$vif" ieee80211w
-                       config_get ca_cert "$vif" ca_cert
-                       config_get eap_type "$vif" eap_type
-                       ca_cert=${ca_cert:+"ca_cert=\"$ca_cert\""}
-                       case "$eap_type" in
-                               tls)
-                                       pairwise='pairwise=CCMP'
-                                       group='group=CCMP'
-                                       config_get identity "$vif" identity
-                                       config_get client_cert "$vif" client_cert
-                                       config_get priv_key "$vif" priv_key
-                                       config_get priv_key_pwd "$vif" priv_key_pwd
-                                       identity="identity=\"$identity\""
-                                       client_cert="client_cert=\"$client_cert\""
-                                       priv_key="private_key=\"$priv_key\""
-                                       priv_key_pwd="private_key_passwd=\"$priv_key_pwd\""
-                               ;;
-                               peap|ttls)
-                                       config_get auth "$vif" auth
-                                       config_get identity "$vif" identity
-                                       config_get password "$vif" password
-                                       phase2="phase2=\"auth=${auth:-MSCHAPV2}\""
-                                       identity="identity=\"$identity\""
-                                       password="${password:+password=\"$password\"}"
-                               ;;
-                       esac
-                       eap_type="eap=$(echo $eap_type | tr 'a-z' 'A-Z')"
-               ;;
-       esac
-
-       case "$ieee80211w" in
-               [012])
-                       ieee80211w="ieee80211w=$ieee80211w"
-               ;;
-       esac
-
-       local fixed_freq bssid1 beacon_int brates mrate
-       config_get ifname "$vif" ifname
-       config_get bridge "$vif" bridge
-       config_get ssid "$vif" ssid
-       config_get bssid "$vif" bssid
-       bssid1=${bssid:+"bssid=$bssid"}
-       beacon_int=${beacon_int:+"beacon_int=$beacon_int"}
-
-       local br brval brsub brstr
-       [ -n "$basic_rate_list" ] && {
-               for br in $basic_rate_list; do
-                       brval="$(($br / 1000))"
-                       brsub="$((($br / 100) % 10))"
-                       [ "$brsub" -gt 0 ] && brval="$brval.$brsub"
-                       [ -n "$brstr" ] && brstr="$brstr,"
-                       brstr="$brstr$brval"
-               done
-               brates=${basic_rate_list:+"rates=$brstr"}
-       }
-
-       local mcval=""
-       [ -n "$mcast_rate" ] && {
-               mcval="$(($mcast_rate / 1000))"
-               mcsub="$(( ($mcast_rate / 100) % 10 ))"
-               [ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub"
-               mrate=${mcast_rate:+"mcast_rate=$mcval"}
-       }
-
-       local ht_str
-       [ -n "$ht" ] && ht_str="htmode=$ht"
-
-       rm -rf /var/run/wpa_supplicant-$ifname
-       cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
-ctrl_interface=/var/run/wpa_supplicant-$ifname
-$ap_scan
-network={
-       $modestr
-       scan_ssid=$scan_ssid
-       ssid="$ssid"
-       $bssid1
-       key_mgmt=$key_mgmt
-       $proto
-       $freq
-       ${fixed:+"fixed_freq=1"}
-       $beacon_int
-       $brates
-       $mrate
-       $ht_str
-       $ieee80211w
-       $passphrase
-       $pairwise
-       $group
-       $eap_type
-       $ca_cert
-       $client_cert
-       $priv_key
-       $priv_key_pwd
-       $phase2
-       $identity
-       $password
-       $wep_key0
-       $wep_key1
-       $wep_key2
-       $wep_key3
-       $wep_tx_keyidx
-}
-EOF
-       if [ -n "$proto" -o "$key_mgmt" = "NONE" ]; then
-               wpa_supplicant ${bridge:+ -b $bridge} -B -P "/var/run/wifi-${ifname}.pid" -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf $options
-       else
-               return 0
-       fi
-}