#endif
#ifdef NEED_STRERROR_H
-#include "strerror.h"
+#include "wsutil/strerror.h"
#endif
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#else
-#include "wsgetopt.h"
+#include "wsutil/wsgetopt.h"
#endif
#include <glib.h>
static output_fields_t* output_fields = NULL;
-/*
- * Standard secondary message for unexpected errors.
- */
-static const char please_report[] =
- "Please report this to the Wireshark developers";
-
#ifdef HAVE_LIBPCAP
/*
* TRUE if we're to print packet counts to keep track of captured packets.
static gboolean infoprint; /* if TRUE, print capture info after clearing infodelay */
#endif /* SIGINFO */
-static int capture(void);
+static gboolean capture(void);
static void report_counts(void);
#ifdef _WIN32
static BOOL WINAPI capture_cleanup(DWORD);
fprintf(output, " -I capture in monitor mode, if available\n");
#endif
#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
- fprintf(output, " -B <buffer size> size of kernel buffer (def: platform-dependent)\n");
+ fprintf(output, " -B <buffer size> size of kernel buffer (def: 1MB)\n");
#endif
fprintf(output, " -y <link type> link layer type (def: first appropriate)\n");
fprintf(output, " -D print list of interfaces and exit\n");
fprintf(output, " -E<fieldsoption>=<value> set options for output when -Tfields selected:\n");
fprintf(output, " header=y|n switch headers on and off\n");
fprintf(output, " separator=/t|/s|<char> select tab, space, printable character as separator\n");
+ fprintf(output, " occurrence=f|l|a print first, last or all occurrences of each field\n");
+ fprintf(output, " aggregator=,|/s|<char> select comma, space, printable character as aggregator\n");
fprintf(output, " quote=d|s|n select double, single, no quotes for values\n");
fprintf(output, " -t ad|a|r|d|dd|e output format of time stamps (def: r: rel. to first)\n");
fprintf(output, " -u s|hms output format of seconds (def: s: seconds)\n");
fprintf(output, " -v display version info and exit\n");
fprintf(output, " -o <name>:<value> ... override preference setting\n");
fprintf(output, " -K <keytab> keytab file to use for kerberos decryption\n");
+ fprintf(output, " -G [report] dump one of several available reports and exit\n");
+ fprintf(output, " default report=\"fields\"\n");
+ fprintf(output, " use \"-G ?\" for more help\n");
+}
+
+static void
+glossary_option_help(void)
+{
+ FILE *output;
+
+ output = stdout;
+
+ fprintf(output, "TShark " VERSION "%s\n", wireshark_svnversion);
+
+ fprintf(output, "\n");
+ fprintf(output, "Usage: tshark -G [report]\n");
+ fprintf(output, "\n");
+ fprintf(output, "Glossary table reports:\n");
+ fprintf(output, " -G [fields] dump glossary in original format and exit\n");
+ fprintf(output, " -G fields2 dump glossary in format 2 and exit\n");
+ fprintf(output, " -G fields3 dump glossary in format 3 and exit\n");
+ fprintf(output, " -G protocols dump protocols in registration database and exit\n");
+ fprintf(output, " -G values dump value, range, true/false strings and exit\n");
+ fprintf(output, " -G decodes dump \"layer type\"/\"decode as\" associations and exit\n");
+ fprintf(output, "\n");
+ fprintf(output, "Preference reports:\n");
+ fprintf(output, " -G defaultprefs dump default preferences and exit\n");
+ fprintf(output, " -G currentprefs dump current preferences and exit\n");
+ fprintf(output, "\n");
+
}
/*
int gdp_open_errno, gdp_read_errno;
int dp_open_errno, dp_read_errno;
int err;
+ int exit_status = 0;
#ifdef HAVE_LIBPCAP
gboolean list_link_layer_types = FALSE;
gboolean start_capture = FALSE;
set_profile_name (optarg);
} else {
cmdarg_err("Configuration Profile \"%s\" does not exist", optarg);
- exit(1);
+ return 1;
}
break;
case 'X':
dissector_dump_decodes();
else if (strcmp(argv[2], "defaultprefs") == 0)
write_prefs(NULL);
+ else if (strcmp(argv[2], "?") == 0)
+ glossary_option_help();
+ else if (strcmp(argv[2], "-?") == 0)
+ glossary_option_help();
else if (strcmp(argv[2], "currentprefs") == 0) {
read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path,
&pf_open_errno, &pf_read_errno, &pf_path);
write_prefs(NULL);
} else {
- cmdarg_err("Invalid \"%s\" option for -G flag", argv[2]);
- exit(1);
+ cmdarg_err("Invalid \"%s\" option for -G flag, enter -G ? for more help.", argv[2]);
+ return 1;
}
}
- exit(0);
+ return 0;
}
/* Set the C-language locale to the native environment. */
#ifdef HAVE_LIBPCAP
status = capture_opts_add_opt(&global_capture_opts, opt, optarg, &start_capture);
if(status != 0) {
- exit(status);
+ return status;
}
#else
capture_option_specified = TRUE;
break;
case 'd': /* Decode as rule */
if (!add_decode_as(optarg))
- exit(1);
+ return 1;
break;
#if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS)
case 'K': /* Kerberos keytab file */
cmdarg_err("There are no interfaces on which a capture can be done");
break;
}
- exit(2);
+ return 2;
}
capture_opts_print_interfaces(if_list);
free_interface_list(if_list);
- exit(0);
+ return 0;
#else
capture_option_specified = TRUE;
arg_error = TRUE;
if(!output_fields_set_option(output_fields, optarg)) {
cmdarg_err("\"%s\" is not a valid field output option=value pair.", optarg);
output_fields_list_options(stderr);
- exit(1);
+ return 1;
}
break;
case 'F':
if (out_file_type < 0) {
cmdarg_err("\"%s\" isn't a valid capture file type", optarg);
list_capture_types();
- exit(1);
+ return 1;
}
break;
case 'h': /* Print help and exit */
print_usage(TRUE);
- exit(0);
+ return 0;
break;
case 'l': /* "Line-buffer" standard output */
/* This isn't line-buffering, strictly speaking, it's just
cmdarg_err("-N specifies unknown resolving option '%c';",
badopt);
cmdarg_err_cont( " Valid options are 'm', 'n', 't', and 'C'");
- exit(1);
+ return 1;
}
break;
case 'o': /* Override preference from command line */
case PREFS_SET_SYNTAX_ERR:
cmdarg_err("Invalid -o flag \"%s\"", optarg);
- exit(1);
+ return 1;
break;
case PREFS_SET_NO_SUCH_PREF:
case PREFS_SET_OBSOLETE:
cmdarg_err("-o flag \"%s\" specifies unknown preference", optarg);
- exit(1);
+ return 1;
break;
}
break;
optarg);
cmdarg_err_cont("It must be \"r\" for relative, \"a\" for absolute,");
cmdarg_err_cont("\"ad\" for absolute with date, or \"d\" for delta.");
- exit(1);
+ return 1;
}
break;
case 'T': /* printing Type */
} else {
cmdarg_err("Invalid -T parameter.");
cmdarg_err_cont("It must be \"ps\", \"text\", \"pdml\", \"psml\" or \"fields\".");
- exit(1);
+ return 1;
}
break;
case 'u': /* Seconds type */
else {
cmdarg_err("Invalid seconds type \"%s\"", optarg);
cmdarg_err_cont("It must be \"s\" for seconds or \"hms\" for hours, minutes and seconds.");
- exit(1);
+ return 1;
}
break;
case 'v': /* Show version and exit */
GString *runtime_info_str;
/* Assemble the compile-time version information string */
comp_info_str = g_string_new("Compiled ");
- get_compiled_version_info(comp_info_str, get_epan_compiled_version_info);
+ get_compiled_version_info(comp_info_str, epan_get_compiled_version_info);
/* Assemble the run-time version information string */
runtime_info_str = g_string_new("Running ");
show_version(comp_info_str, runtime_info_str);
g_string_free(comp_info_str, TRUE);
g_string_free(runtime_info_str, TRUE);
- exit(0);
+ return 0;
break;
}
case 'V': /* Verbose */
cmdarg_err("invalid -z argument.");
cmdarg_err_cont(" -z argument must be one of :");
list_stat_cmd_args();
- exit(1);
+ return 1;
}
break;
default:
default:
print_usage(TRUE);
}
- exit(1);
+ return 1;
break;
}
}
if(WRITE_FIELDS != output_action && 0 != output_fields_num_fields(output_fields)) {
cmdarg_err("Output fields were specified with \"-e\", "
"but \"-Tfields\" was not specified.");
- exit(1);
+ return 1;
} else if(WRITE_FIELDS == output_action && 0 == output_fields_num_fields(output_fields)) {
cmdarg_err("\"-Tfields\" was specified, but no fields were "
"specified with \"-e\".");
- exit(1);
+ return 1;
}
/* If no capture filter or read filter has been specified, and there are
if (rfilter != NULL) {
cmdarg_err("Read filters were specified both with \"-R\" "
"and with additional command-line arguments");
- exit(1);
+ return 1;
}
rfilter = get_args_as_string(argc, argv, optind);
} else {
if (global_capture_opts.has_cfilter) {
cmdarg_err("Capture filters were specified both with \"-f\""
" and with additional command-line arguments");
- exit(1);
+ return 1;
}
global_capture_opts.has_cfilter = TRUE;
global_capture_opts.cfilter = get_args_as_string(argc, argv, optind);
if (strcmp(global_capture_opts.save_file, "-") == 0 && print_packet_info) {
cmdarg_err("You can't write both raw packet data and dissected packets"
" to the standard output.");
- exit(1);
+ return 1;
}
}
#else
#endif
if (arg_error) {
print_usage(FALSE);
- exit(1);
+ return 1;
}
/* We don't support capture filters when reading from a capture file
if (global_capture_opts.has_cfilter) {
cmdarg_err("Only read filters, not capture filters, "
"can be specified when reading a capture file.");
- exit(1);
+ return 1;
}
}
#endif
if (print_hex) {
if (output_action != WRITE_TEXT) {
cmdarg_err("Raw packet hex data can only be printed as text or PostScript");
- exit(1);
+ return 1;
}
}
if (cf_name) {
/* Yes - that's bogus. */
cmdarg_err("You can't specify -L and a capture file to be read.");
- exit(1);
+ return 1;
}
/* No - did they specify a ring buffer option? */
if (global_capture_opts.multi_files_on) {
cmdarg_err("Ring buffer requested, but a capture isn't being done.");
- exit(1);
+ return 1;
}
} else {
if (cf_name) {
if (global_capture_opts.multi_files_on) {
cmdarg_err("Multiple capture files requested, but "
"a capture isn't being done.");
- exit(1);
+ return 1;
}
if (global_capture_opts.has_file_duration) {
cmdarg_err("Switching capture files after a time interval was specified, but "
"a capture isn't being done.");
- exit(1);
+ return 1;
}
if (global_capture_opts.has_ring_num_files) {
cmdarg_err("A ring buffer of capture files was specified, but "
"a capture isn't being done.");
- exit(1);
+ return 1;
}
if (global_capture_opts.has_autostop_files) {
cmdarg_err("A maximum number of capture files was specified, but "
"a capture isn't being done.");
- exit(1);
+ return 1;
}
/* Note: TShark now allows the restriction of a _read_ file by packet count
if (global_capture_opts.has_autostop_duration) {
cmdarg_err("A maximum capture time was specified, but "
"a capture isn't being done.");
- exit(1);
+ return 1;
}
} else {
/*
/* When capturing, we only support writing libpcap format. */
if (out_file_type != WTAP_FILE_PCAP) {
cmdarg_err("Live captures can only be saved in libpcap format.");
- exit(1);
+ return 1;
}
if (global_capture_opts.multi_files_on) {
/* Multiple-file mode doesn't work under certain conditions:
if (strcmp(global_capture_opts.save_file, "-") == 0) {
cmdarg_err("Multiple capture files requested, but "
"the capture is being written to the standard output.");
- exit(1);
+ return 1;
}
if (global_capture_opts.output_to_pipe) {
cmdarg_err("Multiple capture files requested, but "
"the capture file is a pipe.");
- exit(1);
+ return 1;
}
if (!global_capture_opts.has_autostop_filesize &&
!global_capture_opts.has_file_duration) {
cmdarg_err("Multiple capture files requested, but "
"no maximum capture file size or duration was specified.");
- exit(1);
+ return 1;
}
}
+ /* Currently, we don't support read filters when capturing
+ and saving the packets. */
+ if (rfilter != NULL) {
+ cmdarg_err("Read filters aren't supported when capturing and saving the captured packets.");
+ return 1;
+ }
} else {
/* They didn't specify a "-w" flag, so we won't be saving to a
capture file. Check for options that only make sense if
if (global_capture_opts.has_autostop_filesize) {
cmdarg_err("Maximum capture file size specified, but "
"capture isn't being saved to a file.");
- exit(1);
+ return 1;
}
if (global_capture_opts.multi_files_on) {
cmdarg_err("Multiple capture files requested, but "
"the capture isn't being saved to a file.");
- exit(1);
+ return 1;
}
}
}
of the filter. We can now process all the "-z" arguments. */
start_requested_stats();
+#ifdef HAVE_LIBPCAP
+ /* We currently don't support taps, or printing dissected packets,
+ if we're writing to a pipe. */
+ if (global_capture_opts.saving_to_file &&
+ global_capture_opts.output_to_pipe) {
+ if (have_tap_listeners()) {
+ cmdarg_err("Taps aren't supported when saving to a pipe.");
+ return 1;
+ }
+ if (print_packet_info) {
+ cmdarg_err("Printing dissected packets isn't supported when saving to a pipe.");
+ return 1;
+ }
+ }
+#endif
+
/* disabled protocols as per configuration file */
if (gdp_path == NULL && dp_path == NULL) {
set_disabled_protos_list();
}
}
#endif
- exit(2);
+ return 2;
}
}
cfile.rfcode = rfcode;
if (cf_open(&cfile, cf_name, FALSE, &err) != CF_OK) {
epan_cleanup();
- exit(2);
+ return 2;
}
/* Set timestamp precision; there should arguably be a command-line
err = load_cap_file(&cfile, NULL, out_file_type, 0, 0);
#endif
if (err != 0) {
- epan_cleanup();
- exit(2);
+ /* We still dump out the results of taps, etc., as we might have
+ read some packets; however, we exit with an error status. */
+ exit_status = 2;
}
} else {
/* No capture file specified, so we're supposed to do a live capture
detailed_err = cant_load_winpcap_err("TShark");
cmdarg_err_cont("%s", detailed_err);
g_free(detailed_err);
- exit(2);
+ return 2;
}
#endif
/* trim the interface name and exit if that failed */
if (!capture_opts_trim_iface(&global_capture_opts,
(prefs_p->capture_device) ? get_if_name(prefs_p->capture_device) : NULL)) {
- exit(2);
+ return 2;
}
/* if requested, list the link layer types and exit */
if (list_link_layer_types) {
/* Get the list of link-layer types for the capture device. */
- GList *lt_list;
- gchar *err_str;
-
- lt_list = capture_pcap_linktype_list(global_capture_opts.iface, &err_str);
- if (lt_list == NULL) {
- if (err_str != NULL) {
- cmdarg_err("The list of data link types for the capture device \"%s\" could not be obtained (%s)."
- "Please check to make sure you have sufficient permissions, and that\n"
- "you have the proper interface or pipe specified.\n", global_capture_opts.iface, err_str);
- g_free(err_str);
- } else
- cmdarg_err("The capture device \"%s\" has no data link types.", global_capture_opts.iface);
- exit(2);
+ if_capabilities_t *caps;
+
+ caps = capture_get_if_capabilities(global_capture_opts.iface,
+ global_capture_opts.monitor_mode,
+ &err_str);
+ if (caps == NULL) {
+ cmdarg_err("%s", err_str);
+ g_free(err_str);
+ return 2;
+ }
+ if (caps->data_link_types == NULL) {
+ cmdarg_err("The capture device \"%s\" has no data link types.", global_capture_opts.iface);
+ return 2;
}
- capture_opts_print_link_layer_types(lt_list);
- free_pcap_linktype_list(lt_list);
- exit(0);
+ capture_opts_print_if_capabilities(caps,
+ global_capture_opts.monitor_mode);
+ free_if_capabilities(caps);
+ return 0;
}
if (print_packet_info) {
if (!write_preamble(NULL)) {
- err = errno;
- show_print_file_io_error(err);
- return err;
+ show_print_file_io_error(errno);
+ return 2;
}
} else if (!quiet) {
/*
/* For now, assume libpcap gives microsecond precision. */
timestamp_set_precision(TS_PREC_AUTO_USEC);
+ /*
+ * XXX - this returns FALSE if an error occurred, but it also
+ * returns FALSE if the capture stops because a time limit
+ * was reached (and possibly other limits), so we can't assume
+ * it means an error.
+ *
+ * The capture code is a bit twisty, so it doesn't appear to
+ * be an easy fix. We just ignore the return value for now.
+ * Instead, pass on the exit status from the capture child.
+ */
capture();
+ exit_status = global_capture_opts.fork_child_status;
if (print_packet_info) {
if (!write_finale()) {
#else
/* No - complain. */
cmdarg_err("This version of TShark was not built with support for capturing packets.");
- exit(2);
+ return 2;
#endif
}
output_fields_free(output_fields);
output_fields = NULL;
- return 0;
+ return exit_status;
}
/*#define USE_BROKEN_G_MAIN_LOOP*/
#ifdef HAVE_LIBPCAP
-static int
+static gboolean
capture(void)
{
gboolean ret;
/* Catch a CTRL+C event and, if we get it, clean up and exit. */
SetConsoleCtrlHandler(capture_cleanup, TRUE);
#else /* _WIN32 */
- /* Catch SIGINT and SIGTERM and, if we get either of them, clean up
- and exit. */
+ /* Catch SIGINT and SIGTERM and, if we get either of them,
+ clean up and exit. If SIGHUP isn't being ignored, catch
+ it too and, if we get it, clean up and exit.
+
+ We restart any read that was in progress, so that it doesn't
+ disrupt reading from the sync pipe. The signal handler tells
+ the capture child to finish; it will report that it finished,
+ or will exit abnormally, so we'll stop reading from the sync
+ pipe, pick up the exit status, and quit. */
action.sa_handler = capture_cleanup;
- action.sa_flags = 0;
+ action.sa_flags = SA_RESTART;
sigemptyset(&action.sa_mask);
sigaction(SIGTERM, &action, NULL);
sigaction(SIGINT, &action, NULL);
#ifdef SIGINFO
/* Catch SIGINFO and, if we get it and we're capturing to a file in
- quiet mode, report the number of packets we've captured. */
+ quiet mode, report the number of packets we've captured.
+
+ Again, restart any read that was in progress, so that it doesn't
+ disrupt reading from the sync pipe. */
action.sa_handler = report_counts_siginfo;
- action.sa_flags = 0;
+ action.sa_flags = SA_RESTART;
sigemptyset(&action.sa_mask);
sigaction(SIGINFO, &action, NULL);
#endif /* SIGINFO */
if (!ret)
return FALSE;
- /* the actual capture loop
- *
- * XXX - glib doesn't seem to provide any event based loop handling.
- *
- * XXX - for whatever reason,
- * calling g_main_loop_new() ends up in 100% cpu load.
- *
- * But that doesn't matter: in UNIX we can use select() to find an input
- * source with something to do.
- *
- * But that doesn't matter because we're in a CLI (that doesn't need to
- * update a GUI or something at the same time) so it's OK if we block
- * trying to read from the pipe.
- *
- * So all the stuff in USE_TSHARK_SELECT could be removed unless I'm
- * wrong (but I leave it there in case I am...).
- */
+ /* the actual capture loop
+ *
+ * XXX - glib doesn't seem to provide any event based loop handling.
+ *
+ * XXX - for whatever reason,
+ * calling g_main_loop_new() ends up in 100% cpu load.
+ *
+ * But that doesn't matter: in UNIX we can use select() to find an input
+ * source with something to do.
+ *
+ * But that doesn't matter because we're in a CLI (that doesn't need to
+ * update a GUI or something at the same time) so it's OK if we block
+ * trying to read from the pipe.
+ *
+ * So all the stuff in USE_TSHARK_SELECT could be removed unless I'm
+ * wrong (but I leave it there in case I am...).
+ */
#ifdef USE_TSHARK_SELECT
FD_ZERO(&readfds);
#ifdef SIGINFO
/*
- * Prevent a SIGINFO handler from writing to stdout while we're
- * doing so; instead, have it just set a flag telling us to print
- * that information when we're done.
+ * Prevent a SIGINFO handler from writing to the standard error while
+ * we're doing so or writing to the standard output; instead, have it
+ * just set a flag telling us to print that information when we're done.
*/
infodelay = TRUE;
#endif /* SIGINFO */
if(do_dissection) {
while (to_read-- && cf->wth) {
+ wtap_cleareof(cf->wth);
ret = wtap_read(cf->wth, &err, &err_info, &data_offset);
if(ret == FALSE) {
/* read from file failed, tell the capture child to stop */
}
-/* capture child closed its side of the pipe, do the required cleanup */
+/*
+ * Capture child closed its side of the pipe, report any error and
+ * do the required cleanup.
+ */
void
-capture_input_closed(capture_options *capture_opts)
+capture_input_closed(capture_options *capture_opts, gchar *msg)
{
+ if (msg != NULL)
+ fprintf(stderr, "tshark: %s\n", msg);
+
report_counts();
if(capture_opts->cf != NULL && ((capture_file *) capture_opts->cf)->wth != NULL) {
and quit, just as we handle SIGINT, SIGHUP, and SIGTERM in that
way on UNIX.
- However, as handlers run in a new thread, we can't just longjmp
- out; we have to set "ld.go" to FALSE, and must return TRUE so that
- no other handler - such as one that would terminate the process -
- gets called.
+ We must return TRUE so that no other handler - such as one that would
+ terminate the process - gets called.
XXX - for some reason, typing ^C to TShark, if you run this in
a Cygwin console window in at least some versions of Cygwin,
{
/* tell the capture child to stop */
sync_pipe_stop(&global_capture_opts);
+
+ /* don't stop our own loop already here, otherwise status messages and
+ * cleanup wouldn't be done properly. The child will indicate the stop of
+ * everything by calling capture_input_closed() later */
}
#endif /* _WIN32 */
#endif /* HAVE_LIBPCAP */
}
if (err != 0) {
- /* Print a message noting that the read failed somewhere along the line. */
+ /*
+ * Print a message noting that the read failed somewhere along the line.
+ *
+ * If we're printing packet data, and the standard output and error are
+ * going to the same place, flush the standard output, so everything
+ * buffered up is written, and then print a newline to the standard error
+ * before printing the error message, to separate it from the packet
+ * data. (Alas, that only works on UN*X; st_dev is meaningless, and
+ * the _fstat() documentation at Microsoft doesn't indicate whether
+ * st_ino is even supported.)
+ */
+#ifndef _WIN32
+ if (print_packet_info) {
+ struct stat stat_stdout, stat_stderr;
+
+ if (fstat(1, &stat_stdout) == 0 && fstat(2, &stat_stderr) == 0) {
+ if (stat_stdout.st_dev == stat_stderr.st_dev &&
+ stat_stdout.st_ino == stat_stderr.st_ino) {
+ fflush(stdout);
+ fprintf(stderr, "\n");
+ }
+ }
+ }
+#endif
switch (err) {
case WTAP_ERR_UNSUPPORTED_ENCAP: