aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2009-11-10 13:59:41 (GMT)
committerJouni Malinen <j@w1.fi>2009-11-22 19:20:58 (GMT)
commit075b73ea88bca80b90113bebbfeb70f67708401f (patch)
treed351338b97ba8919a8741f99312ad622d6e92300 /src
parent29d3a90ef8acfac61c378c31c72d5176fecd300d (diff)
downloadhostap-06-075b73ea88bca80b90113bebbfeb70f67708401f.zip
hostap-06-075b73ea88bca80b90113bebbfeb70f67708401f.tar.gz
hostap-06-075b73ea88bca80b90113bebbfeb70f67708401f.tar.bz2
Add wpa_msg_ctrl() for ctrl_interface-only messages
This is like wpa_msg(), but the output is directed only to ctrl_interface listeners. In other words, the output will not be shown on stdout or in syslog. Change scan result reporting to use wpa_msg_ctrl() for CTRL-EVENT-SCAN-RESULTS message at info level and wpa_printf() at debug level to avoid showing scan result events in syslog in the common configuration used with NetworkManager. (cherry picked from commit 69856fadf77e680d01cac09da37e6bb3643ca427)
Diffstat (limited to 'src')
-rw-r--r--src/utils/wpa_debug.c24
-rw-r--r--src/utils/wpa_debug.h15
2 files changed, 39 insertions, 0 deletions
diff --git a/src/utils/wpa_debug.c b/src/utils/wpa_debug.c
index e17cf06..25b9162 100644
--- a/src/utils/wpa_debug.c
+++ b/src/utils/wpa_debug.c
@@ -288,6 +288,30 @@ void wpa_msg(void *ctx, int level, char *fmt, ...)
wpa_msg_cb(ctx, level, buf, len);
os_free(buf);
}
+
+
+void wpa_msg_ctrl(void *ctx, int level, char *fmt, ...)
+{
+ va_list ap;
+ char *buf;
+ const int buflen = 2048;
+ int len;
+
+ if (!wpa_msg_cb)
+ return;
+
+ buf = os_malloc(buflen);
+ if (buf == NULL) {
+ wpa_printf(MSG_ERROR, "wpa_msg_ctrl: Failed to allocate "
+ "message buffer");
+ return;
+ }
+ va_start(ap, fmt);
+ len = vsnprintf(buf, buflen, fmt, ap);
+ va_end(ap);
+ wpa_msg_cb(ctx, level, buf, len);
+ os_free(buf);
+}
#endif /* CONFIG_NO_WPA_MSG */
diff --git a/src/utils/wpa_debug.h b/src/utils/wpa_debug.h
index 2d23f06..01cf474 100644
--- a/src/utils/wpa_debug.h
+++ b/src/utils/wpa_debug.h
@@ -141,6 +141,7 @@ void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf,
#ifdef CONFIG_NO_WPA_MSG
#define wpa_msg(args...) do { } while (0)
+#define wpa_msg_ctrl(args...) do { } while (0)
#define wpa_msg_register_cb(f) do { } while (0)
#else /* CONFIG_NO_WPA_MSG */
/**
@@ -159,6 +160,20 @@ void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf,
*/
void wpa_msg(void *ctx, int level, char *fmt, ...) PRINTF_FORMAT(3, 4);
+/**
+ * wpa_msg_ctrl - Conditional printf for ctrl_iface monitors
+ * @ctx: Pointer to context data; this is the ctx variable registered
+ * with struct wpa_driver_ops::init()
+ * @level: priority level (MSG_*) of the message
+ * @fmt: printf format string, followed by optional arguments
+ *
+ * This function is used to print conditional debugging and error messages.
+ * This function is like wpa_msg(), but it sends the output only to the
+ * 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, char *fmt, ...) PRINTF_FORMAT(3, 4);
+
typedef void (*wpa_msg_cb_func)(void *ctx, int level, const char *txt,
size_t len);