osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Make dumpcap complile again and other minor improvements. 

svn path=/trunk/; revision=19624
This commit is contained in:
Jaap Keuter 2006-10-20 06:24:56 +00:00
parent dd63bac75b
commit 22a949a42f
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dumpcap.c
View File

@ -193,13 +193,17 @@ cmdarg_err_cont(const char *fmt, ...)
BOOL WINAPI ConsoleCtrlHandlerRoutine(DWORD dwCtrlType)
{
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_INFO,
"Console: Ctrl+C");
"Console: Control signal");
g_log(LOG_DOMAIN_CAPTURE_CHILD, G_LOG_LEVEL_DEBUG,
"Console: Ctrl+C CtrlType: %u", dwCtrlType);
"Console: Control signal, CtrlType: %u", dwCtrlType);
capture_loop_stop();
return TRUE;
/* Keep capture running if we're a service and a user logs off */
if (capture_child || (dwCtrlType != CTRL_LOGOFF_EVENT)) {
capture_loop_stop();
return TRUE;
} else {
return FALSE;
}
}
#endif
@ -274,7 +278,7 @@ main(int argc, char *argv[])
/* Assemble the run-time version information string */
runtime_info_str = g_string_new("Running ");
get_runtime_version_info(runtime_info_str);
get_runtime_version_info(runtime_info_str, NULL);
/* the default_log_handler will use stdout, which makes trouble in */
/* capture child mode, as it uses stdout for it's sync_pipe */

2
gtk/main.c
View File

@ -2033,8 +2033,6 @@ get_gui_runtime_info(GString *str)
{
#ifdef HAVE_AIRPCAP
get_runtime_airpcap_version(str);
#else
g_string_append(str, "without AirPcap");
#endif
}

1
version_info.c
View File

@ -465,6 +465,7 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
#endif
/* Additional application-dependent information */
break_point = add_word_wrap_break_point(str);
if (additional_info) {
end_item_and_break(str, ",", break_point);
break_point = add_word_wrap_break_point(str);