aboutsummaryrefslogtreecommitdiffstats
path: root/dumpcap.c
diff options
context:
space:
mode:
authorJoão Valverde <j@v6e.pt>2021-12-02 16:33:45 +0000
committerJoão Valverde <j@v6e.pt>2021-12-03 12:30:53 +0000
commite921b804d0174b2bb5a118df8b454c0dc2e69369 (patch)
tree641c6457402144c306a6872bb8d39690738dc9c5 /dumpcap.c
parent5d30f773917f08cecee64d31db97ef420f8ef647 (diff)
Fix logging with extcaps
Extcaps require a log file when invoked in child mode. It also has a specific flag to enable debugging, other that the wslog options. Fix the logging to: 1. Enable debug log level if --debug is used. 2. Do not emit messages to the stderr if debug is enabled. This brings extcap logging to the same feature level it had before wslog replaced GLib logging.
Diffstat (limited to 'dumpcap.c')
-rw-r--r--dumpcap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dumpcap.c b/dumpcap.c
index 0c92995106..2691fb6958 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -5581,10 +5581,10 @@ dumpcap_log_writer(const char *domain, enum ws_log_level level,
{
#if defined(DEBUG_DUMPCAP) || defined(DEBUG_CHILD_DUMPCAP)
#ifdef DEBUG_DUMPCAP
- ws_log_default_writer(domain, level, timestamp, file, line, func, user_format, user_ap, NULL);
+ ws_log_console_writer(domain, level, timestamp, file, line, func, user_format, user_ap, NULL);
#endif
#ifdef DEBUG_CHILD_DUMPCAP
- ws_log_default_writer(domain, level, timestamp, file, line, func, user_format, user_ap, NULL);
+ ws_log_console_writer(domain, level, timestamp, file, line, func, user_format, user_ap, NULL);
#endif
#else
/* Messages goto stderr or to parent especially formatted if dumpcap
@@ -5594,7 +5594,7 @@ dumpcap_log_writer(const char *domain, enum ws_log_level level,
sync_pipe_errmsg_to_parent(2, msg, "");
g_free(msg);
} else {
- ws_log_default_writer(domain, level, timestamp, file, line, func, user_format, user_ap, NULL);
+ ws_log_console_writer(domain, level, timestamp, file, line, func, user_format, user_ap);
}
#endif
}