hostapd: add configurable debug message minimum priority to cut down on bloat generat...

SVN-Revision: 30666

diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in
index a88f977c19861aa0ad6da0c52fed6b0a170448ca..810c5a09a9499d325faaa389a9fd90fcbb3f0cf6 100644 (file)
--- a/package/hostapd/Config.in
+++ b/package/hostapd/Config.in
@@ -26,6 +26,17 @@ config WPA_RFKILL_SUPPORT
        depends PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini
        default n
 
+config WPA_MSG_MIN_PRIORITY
+       int "Minimum debug message priority"
+       default 3
+       help
+         Useful values are:
+           0 = all messages
+               1 = raw message dumps
+               2 = most debugging messages
+               3 = info messages
+               4 = warnings
+               5 = errors
 
 config DRIVER_WEXT_SUPPORT
        bool

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 774d08e13f0b566249df24d5fc2e02bc84430786..782cf73f1b99eb01159956a924a83b795c34c24e 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -53,6 +53,8 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
 
 include $(INCLUDE_DIR)/package.mk
 
+STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(CONFIG_WPA_MSG_MIN_PRIORITY)
+
 ifneq ($(CONFIG_DRIVER_11N_SUPPORT),)
   HOSTAPD_IEEE80211N:=y
 endif
@@ -218,7 +220,8 @@ TARGET_CPPFLAGS := \
        $(TARGET_CPPFLAGS) \
        -I$(STAGING_DIR)/usr/include/madwifi \
        -DCONFIG_LIBNL20 \
-       -D_GNU_SOURCE
+       -D_GNU_SOURCE \
+       $(if $(CONFIG_WPA_MSG_MIN_PRIORITY),-DCONFIG_MSG_MIN_PRIORITY=$(CONFIG_WPA_MSG_MIN_PRIORITY))
 
 TARGET_CFLAGS += -ffunction-sections -fdata-sections
 TARGET_LDFLAGS += -Wl,--gc-sections

diff --git a/package/hostapd/patches/770-limit_debug_messages.patch b/package/hostapd/patches/770-limit_debug_messages.patch
new file mode 100644 (file)
index 0000000..42e0003
--- /dev/null
+++ b/package/hostapd/patches/770-limit_debug_messages.patch
@@ -0,0 +1,213 @@
+--- a/src/utils/wpa_debug.c
++++ b/src/utils/wpa_debug.c
+@@ -129,7 +129,7 @@ static int syslog_priority(int level)
+  *
+  * Note: New line '\n' is added to the end of the text when printing to stdout.
+  */
+-void wpa_printf(int level, const char *fmt, ...)
++void _wpa_printf(int level, const char *fmt, ...)
+ {
+       va_list ap;
+ 
+@@ -160,8 +160,8 @@ void wpa_printf(int level, const char *f
+ }
+ 
+ 
+-static void _wpa_hexdump(int level, const char *title, const u8 *buf,
+-                       size_t len, int show)
++void _wpa_hexdump(int level, const char *title, const u8 *buf,
++                size_t len, int show)
+ {
+       size_t i;
+       if (level < wpa_debug_level)
+@@ -197,20 +197,9 @@ static void _wpa_hexdump(int level, cons
+ #endif /* CONFIG_DEBUG_FILE */
+ }
+ 
+-void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len)
+-{
+-      _wpa_hexdump(level, title, buf, len, 1);
+-}
+-
+-
+-void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len)
+-{
+-      _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys);
+-}
+ 
+-
+-static void _wpa_hexdump_ascii(int level, const char *title, const u8 *buf,
+-                             size_t len, int show)
++void _wpa_hexdump_ascii(int level, const char *title, const u8 *buf,
++                      size_t len, int show)
+ {
+       size_t i, llen;
+       const u8 *pos = buf;
+@@ -294,19 +283,6 @@ static void _wpa_hexdump_ascii(int level
+ }
+ 
+ 
+-void wpa_hexdump_ascii(int level, const char *title, const u8 *buf, size_t len)
+-{
+-      _wpa_hexdump_ascii(level, title, buf, len, 1);
+-}
+-
+-
+-void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf,
+-                         size_t len)
+-{
+-      _wpa_hexdump_ascii(level, title, buf, len, wpa_debug_show_keys);
+-}
+-
+-
+ #ifdef CONFIG_DEBUG_FILE
+ static char *last_path = NULL;
+ #endif /* CONFIG_DEBUG_FILE */
+@@ -391,7 +367,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_
+ }
+ 
+ 
+-void wpa_msg(void *ctx, int level, const char *fmt, ...)
++void _wpa_msg(void *ctx, int level, const char *fmt, ...)
+ {
+       va_list ap;
+       char *buf;
+@@ -425,7 +401,7 @@ void wpa_msg(void *ctx, int level, const
+ }
+ 
+ 
+-void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
++void _wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
+ {
+       va_list ap;
+       char *buf;
+--- a/src/utils/wpa_debug.h
++++ b/src/utils/wpa_debug.h
+@@ -75,6 +75,17 @@ int wpa_debug_open_file(const char *path
+ int wpa_debug_reopen_file(void);
+ void wpa_debug_close_file(void);
+ 
++/* internal */
++void _wpa_hexdump(int level, const char *title, const u8 *buf,
++                size_t len, int show);
++void _wpa_hexdump_ascii(int level, const char *title, const u8 *buf,
++                      size_t len, int show);
++extern int wpa_debug_show_keys;
++
++#ifndef CONFIG_MSG_MIN_PRIORITY
++#define CONFIG_MSG_MIN_PRIORITY 0
++#endif
++
+ /**
+  * wpa_debug_printf_timestamp - Print timestamp for debug output
+  *
+@@ -95,9 +106,15 @@ void wpa_debug_print_timestamp(void);
+  *
+  * Note: New line '\n' is added to the end of the text when printing to stdout.
+  */
+-void wpa_printf(int level, const char *fmt, ...)
++void _wpa_printf(int level, const char *fmt, ...)
+ PRINTF_FORMAT(2, 3);
+ 
++#define wpa_printf(level, ...)                                                \
++      do {                                                            \
++              if (level >= CONFIG_MSG_MIN_PRIORITY)                   \
++                      _wpa_printf(level, __VA_ARGS__);                \
++      } while(0)
++
+ /**
+  * wpa_hexdump - conditional hex dump
+  * @level: priority level (MSG_*) of the message
+@@ -109,7 +126,13 @@ PRINTF_FORMAT(2, 3);
+  * output may be directed to stdout, stderr, and/or syslog based on
+  * configuration. The contents of buf is printed out has hex dump.
+  */
+-void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len);
++static inline void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len)
++{
++      if (level < CONFIG_MSG_MIN_PRIORITY)
++              return;
++
++      _wpa_hexdump(level, title, buf, len, 1);
++}
+ 
+ static inline void wpa_hexdump_buf(int level, const char *title,
+                                  const struct wpabuf *buf)
+@@ -131,7 +154,13 @@ static inline void wpa_hexdump_buf(int l
+  * like wpa_hexdump(), but by default, does not include secret keys (passwords,
+  * etc.) in debug output.
+  */
+-void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len);
++static inline void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len)
++{
++      if (level < CONFIG_MSG_MIN_PRIORITY)
++              return;
++
++      _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys);
++}
+ 
+ static inline void wpa_hexdump_buf_key(int level, const char *title,
+                                      const struct wpabuf *buf)
+@@ -153,8 +182,14 @@ static inline void wpa_hexdump_buf_key(i
+  * the hex numbers and ASCII characters (for printable range) are shown. 16
+  * bytes per line will be shown.
+  */
+-void wpa_hexdump_ascii(int level, const char *title, const u8 *buf,
+-                     size_t len);
++static inline void wpa_hexdump_ascii(int level, const char *title,
++                                   const u8 *buf, size_t len)
++{
++      if (level < CONFIG_MSG_MIN_PRIORITY)
++              return;
++
++      _wpa_hexdump_ascii(level, title, buf, len, 1);
++}
+ 
+ /**
+  * wpa_hexdump_ascii_key - conditional hex dump, hide keys
+@@ -170,8 +205,14 @@ void wpa_hexdump_ascii(int level, const 
+  * bytes per line will be shown. This works like wpa_hexdump_ascii(), but by
+  * default, does not include secret keys (passwords, etc.) in debug output.
+  */
+-void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf,
+-                         size_t len);
++static inline void wpa_hexdump_ascii_key(int level, const char *title,
++                                       const u8 *buf, size_t len)
++{
++      if (level < CONFIG_MSG_MIN_PRIORITY)
++              return;
++
++      _wpa_hexdump_ascii(level, title, buf, len, wpa_debug_show_keys);
++}
+ 
+ /*
+  * wpa_dbg() behaves like wpa_msg(), but it can be removed from build to reduce
+@@ -206,7 +247,12 @@ void wpa_hexdump_ascii_key(int level, co
+  *
+  * Note: New line '\n' is added to the end of the text when printing to stdout.
+  */
+-void wpa_msg(void *ctx, int level, const char *fmt, ...) PRINTF_FORMAT(3, 4);
++void _wpa_msg(void *ctx, int level, const char *fmt, ...) PRINTF_FORMAT(3, 4);
++#define wpa_msg(ctx, level, ...)                                      \
++      do {                                                            \
++              if (level >= CONFIG_MSG_MIN_PRIORITY)                   \
++                      _wpa_msg(ctx, level, __VA_ARGS__);              \
++      } while(0)
+ 
+ /**
+  * wpa_msg_ctrl - Conditional printf for ctrl_iface monitors
+@@ -220,8 +266,13 @@ void wpa_msg(void *ctx, int level, const
+  * attached ctrl_iface monitors. In other words, it can be used for frequent
+  * events that do not need to be sent to syslog.
+  */
+-void wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
++void _wpa_msg_ctrl(void *ctx, int level, const char *fmt, ...)
+ PRINTF_FORMAT(3, 4);
++#define wpa_msg_ctrl(ctx, level, ...)                                 \
++      do {                                                            \
++              if (level >= CONFIG_MSG_MIN_PRIORITY)                   \
++                      _wpa_msg_ctrl(ctx, level, __VA_ARGS__);         \
++      } while(0)
+ 
+ typedef void (*wpa_msg_cb_func)(void *ctx, int level, const char *txt,
+                               size_t len);