[package] udev: bump to 173

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

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 29d8c72..3fbe734 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -192,16 +192,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;;