jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move debug level string conversion functions to wpa_debug.c

Browse source 
This makes it possible to use these helper functions from hostapd as
well as the current use in wpa_supplicant.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2015-08-03 17:44:55 +03:00 committed by Jouni Malinen
parent 84bcb4e7a9
commit ab62f96f55
3 changed files with 42 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/utils/wpa_debug.c
View file

@ -819,3 +819,42 @@ void hostapd_logger(void *ctx, const u8 *addr, unsigned int module, int level,
bin_clear_free(buf, buflen); bin_clear_free(buf, buflen);
} }
#endif /* CONFIG_NO_HOSTAPD_LOGGER */ #endif /* CONFIG_NO_HOSTAPD_LOGGER */
const char * debug_level_str(int level)
{
switch (level) {
case MSG_EXCESSIVE:
return "EXCESSIVE";
case MSG_MSGDUMP:
return "MSGDUMP";
case MSG_DEBUG:
return "DEBUG";
case MSG_INFO:
return "INFO";
case MSG_WARNING:
return "WARNING";
case MSG_ERROR:
return "ERROR";
default:
return "?";
}
}
int str_to_debug_level(const char *s)
{
if (os_strcasecmp(s, "EXCESSIVE") == 0)
return MSG_EXCESSIVE;
if (os_strcasecmp(s, "MSGDUMP") == 0)
return MSG_MSGDUMP;
if (os_strcasecmp(s, "DEBUG") == 0)
return MSG_DEBUG;
if (os_strcasecmp(s, "INFO") == 0)
return MSG_INFO;
if (os_strcasecmp(s, "WARNING") == 0)
return MSG_WARNING;
if (os_strcasecmp(s, "ERROR") == 0)
return MSG_ERROR;
return -1;
}

3
src/utils/wpa_debug.h
View file

@ -364,4 +364,7 @@ static inline void wpa_debug_close_linux_tracing(void)
#define WPA_ASSERT(a) do { } while (0) #define WPA_ASSERT(a) do { } while (0)
#endif #endif
const char * debug_level_str(int level);
int str_to_debug_level(const char *s);
#endif /* WPA_DEBUG_H */ #endif /* WPA_DEBUG_H */

39
wpa_supplicant/ctrl_iface.c
View file

@ -2136,45 +2136,6 @@ static int wpa_supplicant_ctrl_iface_blacklist(struct wpa_supplicant *wpa_s,
} }
static const char * debug_level_str(int level)
{
switch (level) {
case MSG_EXCESSIVE:
return "EXCESSIVE";
case MSG_MSGDUMP:
return "MSGDUMP";
case MSG_DEBUG:
return "DEBUG";
case MSG_INFO:
return "INFO";
case MSG_WARNING:
return "WARNING";
case MSG_ERROR:
return "ERROR";
default:
return "?";
}
}
static int str_to_debug_level(const char *s)
{
if (os_strcasecmp(s, "EXCESSIVE") == 0)
return MSG_EXCESSIVE;
if (os_strcasecmp(s, "MSGDUMP") == 0)
return MSG_MSGDUMP;
if (os_strcasecmp(s, "DEBUG") == 0)
return MSG_DEBUG;
if (os_strcasecmp(s, "INFO") == 0)
return MSG_INFO;
if (os_strcasecmp(s, "WARNING") == 0)
return MSG_WARNING;
if (os_strcasecmp(s, "ERROR") == 0)
return MSG_ERROR;
return -1;
}
static int wpa_supplicant_ctrl_iface_log_level(struct wpa_supplicant *wpa_s, static int wpa_supplicant_ctrl_iface_log_level(struct wpa_supplicant *wpa_s,
char *cmd, char *buf, char *cmd, char *buf,
size_t buflen) size_t buflen)