hostapd: update to 2023-03-29

[openwrt/staging/dedeckeh.git] / package / network / services / hostapd / patches / 410-limit_debug_messages.patch

diff --git a/package/network/services/hostapd/patches/410-limit_debug_messages.patch b/package/network/services/hostapd/patches/410-limit_debug_messages.patch
index 3947eb86118bb9008d26fc6dc0b39cc7aa97f0f9..48a5589200f1985d952aa2e23f8dbd7db74cb081 100644 (file)
--- a/package/network/services/hostapd/patches/410-limit_debug_messages.patch
+++ b/package/network/services/hostapd/patches/410-limit_debug_messages.patch
@@ -9,41 +9,37 @@
  {
        va_list ap;
  
-@@ -253,8 +253,8 @@ void wpa_printf(int level, const char *f
+@@ -255,7 +255,7 @@ 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 len, int show, int only_syslog)
  {
        size_t i;
- 
-@@ -380,20 +380,8 @@ static void _wpa_hexdump(int level, cons
+@@ -382,19 +382,7 @@ static void _wpa_hexdump(int level, cons
  #endif /* CONFIG_ANDROID_LOG */
  }
  
 -void wpa_hexdump(int level, const char *title, const void *buf, size_t len)
 -{
--      _wpa_hexdump(level, title, buf, len, 1);
+-      _wpa_hexdump(level, title, buf, len, 1, 0);
 -}
 -
 -
 -void wpa_hexdump_key(int level, const char *title, const void *buf, size_t len)
 -{
--      _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys);
+-      _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys, 0);
 -}
 -
 -
 -static void _wpa_hexdump_ascii(int level, const char *title, const void *buf,
--                             size_t len, int show)
 +void _wpa_hexdump_ascii(int level, const char *title, const void *buf,
-+                      size_t len, int show)
+                              size_t len, int show)
  {
        size_t i, llen;
-       const u8 *pos = buf;
-@@ -506,20 +494,6 @@ static void _wpa_hexdump_ascii(int level
+@@ -507,20 +495,6 @@ file_done:
  }
  
  
@@ -64,7 +60,7 @@
  #ifdef CONFIG_DEBUG_FILE
  static char *last_path = NULL;
  #endif /* CONFIG_DEBUG_FILE */
-@@ -635,7 +609,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_
+@@ -644,7 +618,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_
  }
  
  
@@ -73,7 +69,7 @@
  {
        va_list ap;
        char *buf;
-@@ -673,7 +647,7 @@ void wpa_msg(void *ctx, int level, const
+@@ -682,7 +656,7 @@ void wpa_msg(void *ctx, int level, const
  }
  
  
@@ -84,13 +80,13 @@
        char *buf;
 --- a/src/utils/wpa_debug.h
 +++ b/src/utils/wpa_debug.h
-@@ -52,6 +52,17 @@ int wpa_debug_reopen_file(void);
- void wpa_debug_close_file(void);
+@@ -51,6 +51,17 @@ void wpa_debug_close_file(void);
  void wpa_debug_setup_stdout(void);
+ void wpa_debug_stop_log(void);
  
 +/* internal */
 +void _wpa_hexdump(int level, const char *title, const u8 *buf,
-+                size_t len, int show);
++                size_t len, int show, int only_syslog);
 +void _wpa_hexdump_ascii(int level, const char *title, const void *buf,
 +                      size_t len, int show);
 +extern int wpa_debug_show_keys;
@@ -102,7 +98,7 @@
  /**
   * wpa_debug_printf_timestamp - Print timestamp for debug output
   *
-@@ -72,9 +83,15 @@ void wpa_debug_print_timestamp(void);
+@@ -71,9 +82,15 @@ void wpa_debug_print_timestamp(void);
   *
   * Note: New line '\n' is added to the end of the text when printing to stdout.
   */
@@ -119,7 +115,7 @@
  /**
   * wpa_hexdump - conditional hex dump
   * @level: priority level (MSG_*) of the message
-@@ -86,7 +103,13 @@ PRINTF_FORMAT(2, 3);
+@@ -85,7 +102,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.
   */
@@ -129,12 +125,12 @@
 +      if (level < CONFIG_MSG_MIN_PRIORITY)
 +              return;
 +
-+      _wpa_hexdump(level, title, buf, len, 1);
++      _wpa_hexdump(level, title, buf, len, 1, 1);
 +}
  
  static inline void wpa_hexdump_buf(int level, const char *title,
                                   const struct wpabuf *buf)
-@@ -108,7 +131,13 @@ static inline void wpa_hexdump_buf(int l
+@@ -107,7 +130,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.
   */
@@ -144,12 +140,12 @@
 +      if (level < CONFIG_MSG_MIN_PRIORITY)
 +              return;
 +
-+      _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys);
++      _wpa_hexdump(level, title, buf, len, wpa_debug_show_keys, 1);
 +}
  
  static inline void wpa_hexdump_buf_key(int level, const char *title,
                                       const struct wpabuf *buf)
-@@ -130,8 +159,14 @@ static inline void wpa_hexdump_buf_key(i
+@@ -129,8 +158,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.
   */
@@ -166,7 +162,7 @@
  
  /**
   * wpa_hexdump_ascii_key - conditional hex dump, hide keys
-@@ -147,8 +182,14 @@ void wpa_hexdump_ascii(int level, const
+@@ -146,8 +181,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.
   */
@@ -183,7 +179,7 @@
  
  /*
   * wpa_dbg() behaves like wpa_msg(), but it can be removed from build to reduce
-@@ -185,7 +226,12 @@ void wpa_hexdump_ascii_key(int level, co
+@@ -184,7 +225,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.
   */
@@ -197,7 +193,7 @@
  
  /**
   * wpa_msg_ctrl - Conditional printf for ctrl_iface monitors
-@@ -199,8 +245,13 @@ void wpa_msg(void *ctx, int level, const
+@@ -198,8 +244,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.
   */