Reduce log level of hexdumps to verbose

Revert "Reduce log level of hexdumps to verbose"

Add a menuconfig option to enable or disable the logging in wpa_supplicant

Clarify help message
customer/11kv_v4.0_xiaomi
GOPTIONS\pfrost 2019-07-26 15:56:40 +01:00 zatwierdzone przez liuzhifu
rodzic 9a7ba5e6fc
commit e5b52ae423
3 zmienionych plików z 28 dodań i 16 usunięć

Wyświetl plik

@ -25,4 +25,15 @@ menu "Supplicant"
button bit without setting virtual/physical display/button bit which button bit without setting virtual/physical display/button bit which
will cause M2 validation fail, bypassing WPS-Config method validation. will cause M2 validation fail, bypassing WPS-Config method validation.
config WPA_DEBUG_PRINT
bool "Print debug messages from WPA Supplicant"
default n
help
Select this option to print logging information from WPA supplicant,
this includes handshake information and key hex dumps depending
on the project logging level.
Enabling this could increase the build size ~60kb
depending on the project logging level.
endmenu endmenu

Wyświetl plik

@ -47,6 +47,7 @@ void wpa_debug_close_file(void);
*/ */
void wpa_debug_print_timestamp(void); void wpa_debug_print_timestamp(void);
#ifdef DEBUG_PRINT
/** /**
* wpa_printf - conditional printf * wpa_printf - conditional printf
* @level: priority level (MSG_*) of the message * @level: priority level (MSG_*) of the message
@ -58,21 +59,6 @@ void wpa_debug_print_timestamp(void);
* *
* Note: New line '\n' is added to the end of the text when printing to stdout. * Note: New line '\n' is added to the end of the text when printing to stdout.
*/ */
#define DEBUG_PRINT
#define MSG_PRINT
/**
* wpa_hexdump - conditional hex dump
* @level: priority level (MSG_*) of the message
* @title: title of for the message
* @buf: data buffer to be dumped
* @len: length of the buf
*
* This function is used to print conditional debugging and error messages. The
* output may be directed to stdout, stderr, and/or syslog based on
* configuration. The contents of buf is printed out has hex dump.
*/
#ifdef DEBUG_PRINT
#define wpa_printf(level,fmt, args...) ESP_LOG_LEVEL_LOCAL(level, TAG, fmt, ##args) #define wpa_printf(level,fmt, args...) ESP_LOG_LEVEL_LOCAL(level, TAG, fmt, ##args)
void wpa_dump_mem(char* desc, uint8_t *addr, uint16_t len); void wpa_dump_mem(char* desc, uint8_t *addr, uint16_t len);
@ -85,7 +71,17 @@ static inline void wpa_hexdump_ascii_key(int level, const char *title, const u8
{ {
} }
/**
* wpa_hexdump - conditional hex dump
* @level: priority level (MSG_*) of the message
* @title: title of for the message
* @buf: data buffer to be dumped
* @len: length of the buf
*
* This function is used to print conditional debugging and error messages. The
* 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); void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len);
static inline void wpa_hexdump_buf(int level, const char *title, static inline void wpa_hexdump_buf(int level, const char *title,
@ -151,6 +147,7 @@ void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf,
#else #else
#define wpa_printf(level,fmt, args...) #define wpa_printf(level,fmt, args...)
#define wpa_hexdump(...) #define wpa_hexdump(...)
#define wpa_dump_mem(...)
#define wpa_hexdump_buf(...) #define wpa_hexdump_buf(...)
#define wpa_hexdump_key(...) #define wpa_hexdump_key(...)
#define wpa_hexdump_buf_key(...) #define wpa_hexdump_buf_key(...)

Wyświetl plik

@ -24,4 +24,8 @@
#define CONFIG_TLSV12 #define CONFIG_TLSV12
#endif #endif
#if CONFIG_WPA_DEBUG_PRINT
#define DEBUG_PRINT
#endif
#endif /* _SUPPLICANT_OPT_H */ #endif /* _SUPPLICANT_OPT_H */