aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd/patches/410-limit_debug_messages.patch
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-05-03 15:20:52 +0200
committerPetr Štetiar <ynezz@true.cz>2020-05-21 08:18:01 +0200
commit0a3ec87a66baa29a9dcb367847a1dcb093d3de16 (patch)
tree8b1165c69ea5e7aee55be52d06fb51d067330fb1 /package/network/services/hostapd/patches/410-limit_debug_messages.patch
parent5ff4b0d0242da8adf83d7d8f00f60198f41afb51 (diff)
downloadupstream-0a3ec87a66baa29a9dcb367847a1dcb093d3de16.tar.gz
upstream-0a3ec87a66baa29a9dcb367847a1dcb093d3de16.tar.bz2
upstream-0a3ec87a66baa29a9dcb367847a1dcb093d3de16.zip
hostapd: update to latest Git hostap_2_9-1238-gdd2daf0848ed
Bump package to latest upstream Git HEAD which is commit dd2daf0848ed ("HE: Process HE 6 GHz band capab from associating HE STA"). Since last update there was 1238 commits done in the upstream tree with 618 files changed, 53399 insertions, 24928 deletions. I didn't bothered to rebase mesh patches as the changes seems not trivial and I don't have enough knowledge of those parts to do/test that properly, so someone else has to forward port them, ideally upstream them so we don't need to bother anymore. I've just deleted them for now: 004-mesh-use-setup-completion-callback-to-complete-mesh-.patch 005-mesh-update-ssid-frequency-as-pri-sec-channel-switch.patch 006-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch 007-mesh-apply-channel-attributes-before-running-Mesh.patch 011-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch 013-mesh-do-not-allow-pri-sec-channel-switch.patch 015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch 016-mesh-fix-channel-switch-error-during-CAC.patch 018-mesh-make-forwarding-configurable.patch Refreshed all other patches, removed upstreamed patches: 051-wpa_supplicant-fix-race-condition-in-mesh-mpm-new-pe.patch 067-0001-AP-Silently-ignore-management-frame-from-unexpected-.patch 070-driver_nl80211-fix-WMM-queue-mapping-for-regulatory-.patch 071-driver_nl80211-fix-regulatory-limits-for-wmm-cwmin-c.patch 090-wolfssl-fix-crypto_bignum_sum.patch 091-0001-wolfssl-Fix-compiler-warnings-on-size_t-printf-forma.patch 091-0002-wolfssl-Fix-crypto_bignum_rand-implementation.patch 091-0003-wolfssl-Do-not-hardcode-include-directory-in-wpa_sup.patch 800-usleep.patch Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> [ipq8065/NBG6817; ipq40xx/MAP-AC2200] Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'package/network/services/hostapd/patches/410-limit_debug_messages.patch')
-rw-r--r--package/network/services/hostapd/patches/410-limit_debug_messages.patch44
1 files changed, 20 insertions, 24 deletions
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 3947eb8611..d2713fc29b 100644
--- 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_
+@@ -636,7 +610,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
+@@ -674,7 +648,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);
+@@ -50,6 +50,17 @@ int wpa_debug_reopen_file(void);
void wpa_debug_close_file(void);
void wpa_debug_setup_stdout(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);
+@@ -70,9 +81,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);
+@@ -84,7 +101,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
+@@ -106,7 +129,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
+@@ -128,8 +157,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
+@@ -145,8 +180,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
+@@ -183,7 +224,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
+@@ -197,8 +243,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.
*/