Date: | 2011-08-20 02:13:58 (12 years 7 months ago) |
Author: | jow |
Commit: | 4f0278e702bf179e8982a8fa860fc1f613b81ba1 |
Message: | [package] hostapd: introduce options to configure the logging
behaviour. The config wifi-device section gains the following
settings: * log_level (2) - Defines the minimum message level
* log_80211 (true) - Log 802.11 events * log_8021x (true) - Log
802.1X events * log_radius (true) - Log RADIUS events * log_wpa
(true) - Log WPA events * log_driver (true) - Log driver interface
messages * log_iapp (true) - Log IAPP events * log_mlme (true)
- Log MLME events
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28056 3c298f89-4303-0410-b956-a3cf2f4a3e73 |
Files: |
package/hostapd/Makefile (2 diffs)
package/hostapd/files/hostapd.sh (1 diff)
|
Change Details
package/hostapd/Makefile |
1 | 1 | # |
2 | | # Copyright (C) 2006-2010 OpenWrt.org |
| 2 | # Copyright (C) 2006-2011 OpenWrt.org |
3 | 3 | # |
4 | 4 | # This is free software, licensed under the GNU General Public License v2. |
5 | 5 | # See /LICENSE for more information. |
... | ... | |
9 | 9 | |
10 | 10 | PKG_NAME:=hostapd |
11 | 11 | PKG_VERSION:=20110527 |
12 | | PKG_RELEASE:=1 |
| 12 | PKG_RELEASE:=2 |
13 | 13 | PKG_REV:=ceb34f250af7a7082f18c1e0451dc7fbc0f000f3 |
14 | 14 | |
15 | 15 | PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 |
package/hostapd/files/hostapd.sh |
192 | 192 | fi |
193 | 193 | } |
194 | 194 | |
| 195 | hostapd_set_log_options() { |
| 196 | local var="$1" |
| 197 | local cfg="$2" |
| 198 | local log_level log_80211 log_8021x log_radius log_wpa log_driver log_iapp log_mlme |
| 199 | |
| 200 | config_get log_level "$cfg" log_level 2 |
| 201 | |
| 202 | config_get_bool log_80211 "$cfg" log_80211 1 |
| 203 | config_get_bool log_8021x "$cfg" log_8021x 1 |
| 204 | config_get_bool log_radius "$cfg" log_radius 1 |
| 205 | config_get_bool log_wpa "$cfg" log_wpa 1 |
| 206 | config_get_bool log_driver "$cfg" log_driver 1 |
| 207 | config_get_bool log_iapp "$cfg" log_iapp 1 |
| 208 | config_get_bool log_mlme "$cfg" log_mlme 1 |
| 209 | |
| 210 | local log_mask=$(( \ |
| 211 | ($log_80211 << 0) | \ |
| 212 | ($log_8021x << 1) | \ |
| 213 | ($log_radius << 2) | \ |
| 214 | ($log_wpa << 3) | \ |
| 215 | ($log_driver << 4) | \ |
| 216 | ($log_iapp << 5) | \ |
| 217 | ($log_mlme << 6) \ |
| 218 | )) |
| 219 | |
| 220 | append "$var" "logger_syslog=$log_mask" "$N" |
| 221 | append "$var" "logger_syslog_level=$log_level" "$N" |
| 222 | append "$var" "logger_stdout=$log_mask" "$N" |
| 223 | append "$var" "logger_stdout_level=$log_level" "$N" |
| 224 | } |
| 225 | |
195 | 226 | hostapd_setup_vif() { |
196 | 227 | local vif="$1" |
197 | 228 | local driver="$2" |
| 229 | local ifname device channel hwmode |
| 230 | |
198 | 231 | hostapd_cfg= |
199 | 232 | |
200 | | hostapd_set_bss_options hostapd_cfg "$vif" |
201 | 233 | config_get ifname "$vif" ifname |
202 | 234 | config_get device "$vif" device |
203 | 235 | config_get channel "$device" channel |
204 | 236 | config_get hwmode "$device" hwmode |
| 237 | |
| 238 | hostapd_set_log_options hostapd_cfg "$device" |
| 239 | hostapd_set_bss_options hostapd_cfg "$vif" |
| 240 | |
205 | 241 | case "$hwmode" in |
206 | 242 | *bg|*gdt|*gst|*fh) hwmode=g;; |
207 | 243 | *adt|*ast) hwmode=a;; |
Download the corresponding diff file