[package] add usbreset - a small simple utility to send port rests to selected usb...

[openwrt.git] / package / hostapd / files / hostapd.sh

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 7d110db..1006230 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -1,14 +1,20 @@
 hostapd_set_bss_options() {
        local var="$1"
        local vif="$2"
 hostapd_set_bss_options() {
        local var="$1"
        local vif="$2"

-       local enc wpa_group_rekey wps_possible
+       local enc wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wps_possible

 
        config_get enc "$vif" encryption
 
        config_get enc "$vif" encryption

-       config_get wpa_group_rekey "$vif" wpa_group_rekey
+       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 device "$vif" device
        config_get hwmode "$device" hwmode
        config_get_bool ap_isolate "$vif" isolate 0
 
        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"
 
        if [ "$ap_isolate" -gt 0 ]; then
                append "$var" "ap_isolate=$ap_isolate" "$N"


@@ -47,8 +53,8 @@ hostapd_set_bss_options() {
        esac
 
        # enforce CCMP for 11ng and 11na
        esac
 
        # enforce CCMP for 11ng and 11na

-       case "$hwmode" in
-               *ng|*na) crypto="CCMP";;
+       case "$hwmode:$crypto" in
+               *ng:TKIP|*na:TKIP) crypto="CCMP TKIP";;

        esac
 
        # use crypto/auth settings for building the hostapd config
        esac
 
        # use crypto/auth settings for building the hostapd config


@@ -61,25 +67,38 @@ hostapd_set_bss_options() {
                                append "$var" "wpa_passphrase=$psk" "$N"
                        fi
                        wps_possible=1
                                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"

                ;;
                *wpa*)
                        # required fields? formats?
                        # hostapd is particular, maybe a default configuration for failures
                ;;
                *wpa*)
                        # required fields? formats?
                        # hostapd is particular, maybe a default configuration for failures

-                       config_get server "$vif" server
-                       append "$var" "auth_server_addr=$server" "$N"
-                       config_get port "$vif" port
-                       port=${port:-1812}
-                       append "$var" "auth_server_port=$port" "$N"
-                       config_get secret "$vif" key
-                       append "$var" "auth_server_shared_secret=$secret" "$N"
+                       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"
+                       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 nasid "$vif" nasid
                        append "$var" "nas_identifier=$nasid" "$N"
                        append "$var" "eapol_key_index_workaround=1" "$N"
                        config_get nasid "$vif" nasid
                        append "$var" "nas_identifier=$nasid" "$N"
                        append "$var" "eapol_key_index_workaround=1" "$N"

-                       append "$var" "radius_acct_interim_interval=300" "$N"

                        append "$var" "ieee8021x=1" "$N"
                        append "$var" "wpa_key_mgmt=WPA-EAP" "$N"
                        append "$var" "ieee8021x=1" "$N"
                        append "$var" "wpa_key_mgmt=WPA-EAP" "$N"

-                       append "$var" "wpa_group_rekey=300" "$N"
-                       append "$var" "wpa_gmk_rekey=640" "$N"
+                       [ -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
                ;;
                *wep*)
                        config_get key "$vif" key


@@ -98,6 +117,7 @@ hostapd_set_bss_options() {
                                *)
                                        append "$var" "wep_key0=$(prepare_key_wep "$key")" "$N"
                                        append "$var" "wep_default_key=0" "$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
                                ;;
                        esac
                        case "$enc" in


@@ -127,11 +147,23 @@ hostapd_set_bss_options() {
        config_get iapp_interface "$vif" iapp_interface
 
        config_get_bool wps_pbc "$vif" wps_pushbutton 0
        config_get iapp_interface "$vif" iapp_interface
 
        config_get_bool wps_pbc "$vif" wps_pushbutton 0

-       [ -n "$wps_possible" -a "$wps_pbc" -gt 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 "OpenWrt AP"
+               config_get manufacturer "$vif" wps_manufacturer "openwrt.org"
+

                append "$var" "eap_server=1" "$N"
                append "$var" "wps_state=2" "$N"
                append "$var" "ap_setup_locked=1" "$N"
                append "$var" "eap_server=1" "$N"
                append "$var" "wps_state=2" "$N"
                append "$var" "ap_setup_locked=1" "$N"

-               append "$var" "config_methods=push_button" "$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"
        }
 
        append "$var" "ssid=$ssid" "$N"


@@ -167,16 +199,52 @@ hostapd_set_bss_options() {
        fi
 }
 
        fi
 }
 

+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"
 hostapd_setup_vif() {
        local vif="$1"
        local driver="$2"

+       local ifname device channel hwmode
+

        hostapd_cfg=
 
        hostapd_cfg=
 

-       hostapd_set_bss_options hostapd_cfg "$vif"

        config_get ifname "$vif" ifname
        config_get device "$vif" device
        config_get channel "$device" channel
        config_get hwmode "$device" hwmode
        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;;
        case "$hwmode" in
                *bg|*gdt|*gst|*fh) hwmode=g;;
                *adt|*ast) hwmode=a;;


@@ -184,7 +252,6 @@ hostapd_setup_vif() {
        [ "$channel" = auto ] && channel=
        [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
        cat > /var/run/hostapd-$ifname.conf <<EOF
        [ "$channel" = auto ] && channel=
        [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
        cat > /var/run/hostapd-$ifname.conf <<EOF

-ctrl_interface=/var/run/hostapd-$ifname

 driver=$driver
 interface=$ifname
 ${hwmode:+hw_mode=${hwmode#11}}
 driver=$driver
 interface=$ifname
 ${hwmode:+hw_mode=${hwmode#11}}