diff options
| -rw-r--r-- | echld/dispatcher.c | 8 | ||||
| -rw-r--r-- | echld/echld-int.h | 2 | ||||
| -rw-r--r-- | echld_test.c | 4 | ||||
| -rw-r--r-- | tfshark.c | 17 |
4 files changed, 17 insertions, 14 deletions
diff --git a/echld/dispatcher.c b/echld/dispatcher.c index 82155f6965..2286fc630a 100644 --- a/echld/dispatcher.c +++ b/echld/dispatcher.c @@ -119,7 +119,7 @@ static long dbg_r = 0; #define DISP_DBG(attrs) ( dispatcher_debug attrs ) #define DISP_DBG_INIT() do { debug_fp = stderr; DCOM(); } while(0) #define DISP_DBG_START(fname) do { debug_fp = fopen(fname,"a"); DCOM(); DISP_DBG((0,"Log Started")); } while(0) -#define DISP_WRITE(FD,BA,CH,T,RH) ( dbg_r = echld_write_frame(FD,BA,CH,T,RH,NULL), DISP_DBG((1,"SND fd=%d ch=%d ty='%s' rh=%d msg='%s'",FD,CH,TY(T),RH, (dbg_r>0?"ok":strerror(errno)))), dbg_r ) +#define DISP_WRITE(FD,BA,CH,T,RH) ( dbg_r = echld_write_frame(FD,BA,CH,T,RH,NULL), DISP_DBG((1,"SND fd=%d ch=%d ty='%s' rh=%d msg='%s'",FD,CH,TY(T),RH, (dbg_r>0?"ok":strerror(errno))))) #define CHLD_SET_STATE(c,st) do { DISP_DBG((1,"Child[%d] State %s => %s",(c)->chld_id, ST((c)->state), ST((st)) )); (c)->state=(st); } while(0) #else #define DISP_DBG(attrs) @@ -486,8 +486,8 @@ static void preinit_epan(char* argv0, int (*main)(int, char **)) { runtime_info_str = g_string_new("Running "); get_runtime_version_info(runtime_info_str, NULL); - version_long_str = g_strdup_printf("%s%s\n%s\n%s\n%s", - version_str, wireshark_gitversion, get_copyright_info(), + version_long_str = g_strdup_printf("Echld %s\n%s\n%s\n%s", + get_ws_vcs_version_info(), get_copyright_info(), comp_info_str->str, runtime_info_str->str); if (error) { @@ -496,7 +496,7 @@ static void preinit_epan(char* argv0, int (*main)(int, char **)) { /* Add it to the information to be reported on a crash. */ ws_add_crash_info("Echld %s\n%s\n%s", - ws_get_version_info(), comp_info_str->str, runtime_info_str->str); + get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str); init_stuff(); diff --git a/echld/echld-int.h b/echld/echld-int.h index 0e04bc2740..29c737bbd9 100644 --- a/echld/echld-int.h +++ b/echld/echld-int.h @@ -70,6 +70,8 @@ #include "wsutil/privileges.h" #include "wsutil/filesystem.h" #include "wsutil/copyright_info.h" +#include "wsutil/ws_version_info.h" +#include "epan/addr_resolv.h" #include "epan/epan.h" #include "epan/prefs.h" #include "epan/ex-opt.h" diff --git a/echld_test.c b/echld_test.c index 9e217f0fef..0cc30b38ab 100644 --- a/echld_test.c +++ b/echld_test.c @@ -134,7 +134,7 @@ static char* new_child_cmd(char** params, char** err) { return NULL; } - child = echld_new(paramsets[ps_id],NULL); + child = echld_new(paramsets[ps_id],NULL,NULL); if (child <= 0) { *err = g_strdup("No child\n"); @@ -377,7 +377,7 @@ int got_param = 0; int main(int argc _U_, char** argv _U_) { struct timeval tv; int tot_cycles = 0; - echld_init_t init = {ECHLD_ENCODING_JSON,argv[0],main,NULL,NULL,NULL,NULL}; + echld_init_t init = {ECHLD_ENCODING_JSON,argv[0],main,NULL,NULL,NULL,NULL,NULL,NULL}; tv.tv_sec = 5; @@ -65,6 +65,7 @@ #include <wsutil/filesystem.h> #include <wsutil/report_err.h> #include <wsutil/copyright_info.h> +#include <wsutil/ws_version_info.h> #include "globals.h" #include <epan/timestamp.h> @@ -197,12 +198,12 @@ print_usage(gboolean print_ver) if (print_ver) { output = stdout; fprintf(output, - "TFShark " VERSION "%s\n" + "TFShark %s\n" "Dump and analyze network traffic.\n" "See http://www.wireshark.org for more information.\n" "\n" "%s", - wireshark_gitversion, get_copyright_info()); + get_ws_vcs_version_info(), get_copyright_info()); } else { output = stderr; } @@ -270,7 +271,7 @@ glossary_option_help(void) output = stdout; - fprintf(output, "TFShark " VERSION "%s\n", wireshark_gitversion); + fprintf(output, "TFShark %s\n", get_ws_vcs_version_info()); fprintf(output, "\n"); fprintf(output, "Usage: tfshark -G [report]\n"); @@ -745,14 +746,14 @@ print_current_user(void) { static void show_version(GString *comp_info_str, GString *runtime_info_str) { - printf("TFShark " VERSION "%s\n" + printf("TFShark %s\n" "\n" "%s" "\n" "%s" "\n" "%s", - wireshark_gitversion, get_copyright_info(), comp_info_str->str, + get_ws_vcs_version_info(), get_copyright_info(), comp_info_str->str, runtime_info_str->str); } @@ -800,12 +801,12 @@ main(int argc, char *argv[]) get_runtime_version_info(runtime_info_str, NULL); /* Add it to the information to be reported on a crash. */ - ws_add_crash_info("TFShark " VERSION "%s\n" + ws_add_crash_info("TFShark %s\n" "\n" "%s" "\n" "%s", - wireshark_gitversion, comp_info_str->str, runtime_info_str->str); + get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str); #ifdef _WIN32 arg_list_utf_16to8(argc, argv); @@ -2112,7 +2113,7 @@ write_preamble(capture_file *cf) switch (output_action) { case WRITE_TEXT: - return print_preamble(print_stream, cf ? cf->filename : NULL, wireshark_gitversion); + return print_preamble(print_stream, cf ? cf->filename : NULL, get_ws_vcs_version_info()); case WRITE_XML: if (print_details) |