X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=tshark.c;h=e63d5833975fd876bd37efd59c62f5cb903b4177;hp=37a963ff1205b089fb9ccfaeae7a318131523f5c;hb=77c9ecc12f924a1816b5ce8b63e2b8394003f25a;hpb=769de8a7b653471bed5f8eccf439c79ee37b7b38 diff --git a/tshark.c b/tshark.c index 37a963ff12..e63d583397 100644 --- a/tshark.c +++ b/tshark.c @@ -51,13 +51,7 @@ # include #endif -#ifdef NEED_STRERROR_H -#include "wsutil/strerror.h" -#endif - -#ifdef HAVE_GETOPT_H -#include -#else +#ifndef HAVE_GETOPT #include "wsutil/wsgetopt.h" #endif @@ -96,14 +90,13 @@ #ifdef _WIN32 #include "capture-wpcap.h" #include "capture_errs.h" -#include +#include #endif /* _WIN32 */ #include "capture_sync.h" #endif /* HAVE_LIBPCAP */ #include "log.h" #include - /* * This is the template for the decode as option; it is shared between the * various functions that output the usage for this parameter. @@ -194,8 +187,8 @@ struct string_elem { static gint string_compare(gconstpointer a, gconstpointer b) { - return strcmp(((struct string_elem *)a)->sstr, - ((struct string_elem *)b)->sstr); + return strcmp(((const struct string_elem *)a)->sstr, + ((const struct string_elem *)b)->sstr); } static void @@ -297,6 +290,8 @@ print_usage(gboolean print_ver) fprintf(output, " -F set the output file type, default is libpcap\n"); fprintf(output, " an empty \"-F\" option will list the file types\n"); fprintf(output, " -V add output of packet tree (Packet Details)\n"); + fprintf(output, " -O Only show packet details of these protocols, comma\n"); + fprintf(output, " separated\n"); fprintf(output, " -S display packets even when writing to a file\n"); fprintf(output, " -x add output of hex and ASCII dump (Packet Bytes)\n"); fprintf(output, " -T pdml|ps|psml|text|fields\n"); @@ -592,7 +587,6 @@ add_decode_as(const gchar *cl_param) case FT_STRING: case FT_STRINGZ: - case FT_EBCDIC: /* The selector for this table is a string. */ break; @@ -689,7 +683,6 @@ add_decode_as(const gchar *cl_param) case FT_STRING: case FT_STRINGZ: - case FT_EBCDIC: /* The selector for this table is a string. */ dissector_change_string(table_name, selector_str, dissector_matching); break; @@ -797,8 +790,6 @@ main(int argc, char *argv[]) #ifdef _WIN32 WSADATA wsaData; - LPWSTR *wc_argv; - int wc_argc, i; #endif /* _WIN32 */ char *gpf_path, *pf_path; @@ -815,11 +806,17 @@ main(int argc, char *argv[]) int status; GList *if_list; gchar *err_str; + guint i; + interface_options interface_opts; #else gboolean capture_option_specified = FALSE; #endif gboolean quiet = FALSE; +#ifdef PCAP_NG_DEFAULT + int out_file_type = WTAP_FILE_PCAPNG; +#else int out_file_type = WTAP_FILE_PCAP; +#endif gboolean out_file_name_res = FALSE; gchar *cf_name = NULL, *rfilter = NULL; #ifdef HAVE_PCAP_OPEN_DEAD @@ -830,6 +827,7 @@ main(int argc, char *argv[]) char badopt; GLogLevelFlags log_flags; int optind_initial; + gchar *output_only = NULL; #ifdef HAVE_LIBPCAP #if defined(_WIN32) || defined(HAVE_PCAP_CREATE) @@ -847,18 +845,12 @@ main(int argc, char *argv[]) #define OPTSTRING_I "" #endif -#define OPTSTRING "a:b:" OPTSTRING_B "c:C:d:De:E:f:F:G:hH:i:" OPTSTRING_I "K:lLnN:o:pPqr:R:s:St:T:u:vVw:W:xX:y:z:" +#define OPTSTRING "a:b:" OPTSTRING_B "c:C:d:De:E:f:F:G:hH:i:" OPTSTRING_I "K:lLnN:o:O:pPqr:R:s:St:T:u:vVw:W:xX:y:z:" static const char optstring[] = OPTSTRING; #ifdef _WIN32 - /* Convert our arg list to UTF-8. */ - wc_argv = CommandLineToArgvW(GetCommandLineW(), &wc_argc); - if (wc_argv && wc_argc == argc) { - for (i = 0; i < argc; i++) { - argv[i] = g_utf16_to_utf8(wc_argv[i], -1, NULL, NULL, NULL); - } - } /* XXX else bail because something is horribly, horribly wrong? */ + arg_list_utf_16to8(argc, argv); #endif /* _WIN32 */ /* @@ -993,6 +985,8 @@ main(int argc, char *argv[]) dissector_dump_decodes(); else if (strcmp(argv[2], "defaultprefs") == 0) write_prefs(NULL); + else if (strcmp(argv[2], "plugins") == 0) + plugins_dump_all(); else if (strcmp(argv[2], "?") == 0) glossary_option_help(); else if (strcmp(argv[2], "-?") == 0) @@ -1017,21 +1011,21 @@ main(int argc, char *argv[]) if (gpf_path != NULL) { if (gpf_open_errno != 0) { cmdarg_err("Can't open global preferences file \"%s\": %s.", - pf_path, strerror(gpf_open_errno)); + pf_path, g_strerror(gpf_open_errno)); } if (gpf_read_errno != 0) { cmdarg_err("I/O error reading global preferences file \"%s\": %s.", - pf_path, strerror(gpf_read_errno)); + pf_path, g_strerror(gpf_read_errno)); } } if (pf_path != NULL) { if (pf_open_errno != 0) { cmdarg_err("Can't open your preferences file \"%s\": %s.", pf_path, - strerror(pf_open_errno)); + g_strerror(pf_open_errno)); } if (pf_read_errno != 0) { cmdarg_err("I/O error reading your preferences file \"%s\": %s.", - pf_path, strerror(pf_read_errno)); + pf_path, g_strerror(pf_read_errno)); } g_free(pf_path); pf_path = NULL; @@ -1046,11 +1040,11 @@ main(int argc, char *argv[]) if (gdp_path != NULL) { if (gdp_open_errno != 0) { cmdarg_err("Could not open global disabled protocols file\n\"%s\": %s.", - gdp_path, strerror(gdp_open_errno)); + gdp_path, g_strerror(gdp_open_errno)); } if (gdp_read_errno != 0) { cmdarg_err("I/O error reading global disabled protocols file\n\"%s\": %s.", - gdp_path, strerror(gdp_read_errno)); + gdp_path, g_strerror(gdp_read_errno)); } g_free(gdp_path); } @@ -1058,12 +1052,12 @@ main(int argc, char *argv[]) if (dp_open_errno != 0) { cmdarg_err( "Could not open your disabled protocols file\n\"%s\": %s.", dp_path, - strerror(dp_open_errno)); + g_strerror(dp_open_errno)); } if (dp_read_errno != 0) { cmdarg_err( "I/O error reading your disabled protocols file\n\"%s\": %s.", dp_path, - strerror(dp_read_errno)); + g_strerror(dp_read_errno)); } g_free(dp_path); } @@ -1202,11 +1196,9 @@ main(int argc, char *argv[]) arg_error = TRUE; #endif break; -#if GLIB_CHECK_VERSION(2,10,0) case 'P': /* Perform two pass analysis */ perform_two_pass_analysis = TRUE; break; -#endif case 'n': /* No name resolution */ gbl_resolv_flags = RESOLV_NONE; break; @@ -1239,6 +1231,9 @@ main(int argc, char *argv[]) break; } break; + case 'O': /* Only output these protocols */ + output_only = g_strdup(optarg); + break; case 'q': /* Quiet */ quiet = TRUE; break; @@ -1264,6 +1259,10 @@ main(int argc, char *argv[]) timestamp_set_type(TS_DELTA_DIS); else if (strcmp(optarg, "e") == 0) timestamp_set_type(TS_EPOCH); + else if (strcmp(optarg, "u") == 0) + timestamp_set_type(TS_UTC); + else if (strcmp(optarg, "ud") == 0) + timestamp_set_type(TS_UTC_WITH_DATE); else { cmdarg_err("Invalid time stamp type \"%s\"", optarg); @@ -1385,19 +1384,30 @@ main(int argc, char *argv[]) if (cf_name != NULL) { if (rfilter != NULL) { cmdarg_err("Read filters were specified both with \"-R\" " - "and with additional command-line arguments"); + "and with additional command-line arguments."); return 1; } rfilter = get_args_as_string(argc, argv, optind); } else { #ifdef HAVE_LIBPCAP - if (global_capture_opts.has_cfilter) { - cmdarg_err("Capture filters were specified both with \"-f\"" - " and with additional command-line arguments"); + if (global_capture_opts.default_options.cfilter) { + cmdarg_err("A default capture filter was specified both with \"-f\"" + " and with additional command-line arguments."); return 1; } - global_capture_opts.has_cfilter = TRUE; - global_capture_opts.cfilter = get_args_as_string(argc, argv, optind); + for (i = 0; i < global_capture_opts.ifaces->len; i++) { + interface_opts = g_array_index(global_capture_opts.ifaces, interface_options, i); + if (interface_opts.cfilter == NULL) { + interface_opts.cfilter = get_args_as_string(argc, argv, optind); + global_capture_opts.ifaces = g_array_remove_index(global_capture_opts.ifaces, i); + g_array_insert_val(global_capture_opts.ifaces, i, interface_opts); + } else { + cmdarg_err("A capture filter was specified both with \"-f\"" + " and with additional command-line arguments."); + return 1; + } + } + global_capture_opts.default_options.cfilter = get_args_as_string(argc, argv, optind); #else capture_option_specified = TRUE; #endif @@ -1443,7 +1453,7 @@ main(int argc, char *argv[]) support in capture files we read). */ #ifdef HAVE_LIBPCAP if (cf_name != NULL) { - if (global_capture_opts.has_cfilter) { + if (global_capture_opts.default_options.cfilter) { cmdarg_err("Only read filters, not capture filters, " "can be specified when reading a capture file."); return 1; @@ -1458,6 +1468,20 @@ main(int argc, char *argv[]) } } + if (output_only != NULL) { + char *ps; + + if (!verbose) { + cmdarg_err("-O requires -V"); + return 1; + } + + output_only_tables = g_hash_table_new (g_str_hash, g_str_equal); + for (ps = strtok (output_only, ","); ps; ps = strtok (NULL, ",")) { + g_hash_table_insert(output_only_tables, (gpointer)ps, (gpointer)ps); + } + } + #ifdef HAVE_LIBPCAP if (list_link_layer_types) { /* We're supposed to list the link-layer types for an interface; @@ -1515,8 +1539,8 @@ main(int argc, char *argv[]) if (global_capture_opts.saving_to_file) { /* They specified a "-w" flag, so we'll be saving to a capture file. */ - /* When capturing, we only support writing libpcap format. */ - if (out_file_type != WTAP_FILE_PCAP) { + /* When capturing, we only support writing pcap or pcap-ng format. */ + if (out_file_type != WTAP_FILE_PCAP && out_file_type != WTAP_FILE_PCAPNG) { cmdarg_err("Live captures can only be saved in libpcap format."); return 1; } @@ -1587,7 +1611,7 @@ main(int argc, char *argv[]) if we're writing to a pipe. */ if (global_capture_opts.saving_to_file && global_capture_opts.output_to_pipe) { - if (have_tap_listeners()) { + if (tap_listeners_require_dissection()) { cmdarg_err("Taps aren't supported when saving to a pipe."); return 1; } @@ -1662,8 +1686,8 @@ main(int argc, char *argv[]) we're using a read filter on the packets; - we're using any taps. */ - do_dissection = print_packet_info || rfcode || have_tap_listeners(); + we're using any taps that need dissection. */ + do_dissection = print_packet_info || rfcode || tap_listeners_require_dissection(); if (cf_name) { /* @@ -1747,24 +1771,27 @@ main(int argc, char *argv[]) /* 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. */ - 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; + guint i; + interface_options interface_opts; + + /* Get the list of link-layer types for the capture devices. */ + for (i = 0; i < global_capture_opts.ifaces->len; i++) { + if_capabilities_t *caps; + + interface_opts = g_array_index(global_capture_opts.ifaces, interface_options, i); + caps = capture_get_if_capabilities(interface_opts.name, interface_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.", interface_opts.name); + return 2; + } + capture_opts_print_if_capabilities(caps, interface_opts.name, interface_opts.monitor_mode); + free_if_capabilities(caps); } - capture_opts_print_if_capabilities(caps, - global_capture_opts.monitor_mode); - free_if_capabilities(caps); return 0; } @@ -1818,10 +1845,10 @@ main(int argc, char *argv[]) g_free(cf_name); -#if GLIB_CHECK_VERSION(2,10,0) - if (cfile.plist_start != NULL) - g_slice_free_chain(frame_data, cfile.plist_start, next); -#endif + if (cfile.frames != NULL) { + free_frame_data_sequence(cfile.frames); + cfile.frames = NULL; + } draw_tap_listeners(TRUE); funnel_dump_all_text_windows(); @@ -1950,6 +1977,8 @@ static gboolean capture(void) { gboolean ret; + guint i; + GString *str = g_string_new(""); #ifdef USE_TSHARK_SELECT fd_set readfds; #endif @@ -2023,9 +2052,40 @@ capture(void) global_capture_opts.state = CAPTURE_PREPARING; - /* Let the user know what interface was chosen. */ - global_capture_opts.iface_descr = get_interface_descriptive_name(global_capture_opts.iface); - fprintf(stderr, "Capturing on %s\n", global_capture_opts.iface_descr); + /* Let the user know which interfaces were chosen. */ + for (i = 0; i < global_capture_opts.ifaces->len; i++) { + interface_options interface_opts; + + interface_opts = g_array_index(global_capture_opts.ifaces, interface_options, i); + interface_opts.descr = get_interface_descriptive_name(interface_opts.name); + global_capture_opts.ifaces = g_array_remove_index(global_capture_opts.ifaces, i); + g_array_insert_val(global_capture_opts.ifaces, i, interface_opts); + } +#ifdef _WIN32 + if (global_capture_opts.ifaces->len < 2) { +#else + if (global_capture_opts.ifaces->len < 4) { +#endif + for (i = 0; i < global_capture_opts.ifaces->len; i++) { + interface_options interface_opts; + + interface_opts = g_array_index(global_capture_opts.ifaces, interface_options, i); + if (i > 0) { + if (global_capture_opts.ifaces->len > 2) { + g_string_append_printf(str, ","); + } + g_string_append_printf(str, " "); + if (i == global_capture_opts.ifaces->len - 1) { + g_string_append_printf(str, "and "); + } + } + g_string_append_printf(str, "%s", interface_opts.descr); + } + } else { + g_string_append_printf(str, "%u interfaces", global_capture_opts.ifaces->len); + } + fprintf(stderr, "Capturing on %s\n", str->str); + g_string_free(str, TRUE); ret = sync_pipe_start(&global_capture_opts); @@ -2099,14 +2159,17 @@ capture_input_error_message(capture_options *capture_opts _U_, char *error_msg, /* capture child detected an capture filter related error */ void -capture_input_cfilter_error_message(capture_options *capture_opts, char *error_message) +capture_input_cfilter_error_message(capture_options *capture_opts, guint i, char *error_message) { dfilter_t *rfcode = NULL; + interface_options interface_opts; + g_assert(i < capture_opts->ifaces->len); + interface_opts = g_array_index(capture_opts->ifaces, interface_options, i); - if (dfilter_compile(capture_opts->cfilter, &rfcode) && rfcode != NULL) { + if (dfilter_compile(interface_opts.cfilter, &rfcode) && rfcode != NULL) { cmdarg_err( - "Invalid capture filter: \"%s\"!\n" + "Invalid capture filter \"%s\" for interface %s!\n" "\n" "That string looks like a valid display filter; however, it isn't a valid\n" "capture filter (%s).\n" @@ -2115,15 +2178,15 @@ capture_input_cfilter_error_message(capture_options *capture_opts, char *error_m "so you can't use most display filter expressions as capture filters.\n" "\n" "See the User's Guide for a description of the capture filter syntax.", - capture_opts->cfilter, error_message); + interface_opts.cfilter, interface_opts.descr, error_message); dfilter_free(rfcode); } else { cmdarg_err( - "Invalid capture filter: \"%s\"!\n" + "Invalid capture filter \"%s\" for interface %s!\n" "\n" "That string isn't a valid capture filter (%s).\n" "See the User's Guide for a description of the capture filter syntax.", - capture_opts->cfilter, error_message); + interface_opts.cfilter, interface_opts.descr, error_message); } } @@ -2324,9 +2387,9 @@ capture_input_closed(capture_options *capture_opts, gchar *msg) if(capture_opts->cf != NULL && ((capture_file *) capture_opts->cf)->wth != NULL) { wtap_close(((capture_file *) capture_opts->cf)->wth); - if(((capture_file *) capture_opts->cf)->user_saved == FALSE){ - ws_unlink(((capture_file *) capture_opts->cf)->filename); - } + if(((capture_file *) capture_opts->cf)->user_saved == FALSE) { + ws_unlink(((capture_file *) capture_opts->cf)->filename); + } } #ifdef USE_BROKEN_G_MAIN_LOOP /*g_main_loop_quit(loop);*/ @@ -2387,25 +2450,26 @@ capture_cleanup(int signum _U_) #endif /* _WIN32 */ #endif /* HAVE_LIBPCAP */ -#if GLIB_CHECK_VERSION(2,10,0) static gboolean process_packet_first_pass(capture_file *cf, gint64 offset, const struct wtap_pkthdr *whdr, union wtap_pseudo_header *pseudo_header, const guchar *pd) { - frame_data *fdata = g_slice_new(frame_data); + frame_data fdlocal; + guint32 framenum; epan_dissect_t edt; gboolean passed; - /* Count this packet. */ - cf->count++; + /* The frame number of this packet is one more than the count of + frames in this packet. */ + framenum = cf->count + 1; /* If we're not running a display filter and we're not printing any packet information, we don't need to do a dissection. This means that all packets can be marked as 'passed'. */ passed = TRUE; - frame_data_init(fdata, cf->count, whdr, offset, cum_bytes); + frame_data_init(&fdlocal, framenum, whdr, offset, cum_bytes); /* If we're going to print packet information, or we're going to run a read filter, or we're going to process taps, set up to @@ -2426,10 +2490,10 @@ process_packet_first_pass(capture_file *cf, if (cf->rfcode) epan_dissect_prime_dfilter(&edt, cf->rfcode); - frame_data_set_before_dissect(fdata, &cf->elapsed_time, + frame_data_set_before_dissect(&fdlocal, &cf->elapsed_time, &first_ts, &prev_dis_ts, &prev_cap_ts); - epan_dissect_run(&edt, pseudo_header, pd, fdata, NULL); + epan_dissect_run(&edt, pseudo_header, pd, &fdlocal, NULL); /* Run the read filter if we have one. */ if (cf->rfcode) @@ -2437,11 +2501,10 @@ process_packet_first_pass(capture_file *cf, } if (passed) { - frame_data_set_after_dissect(fdata, &cum_bytes, &prev_dis_ts); - cap_file_add_fdata(cf, fdata); + frame_data_set_after_dissect(&fdlocal, &cum_bytes, &prev_dis_ts); + frame_data_sequence_add(cf->frames, &fdlocal); + cf->count++; } - else - g_slice_free(frame_data, fdata); if (do_dissection) epan_dissect_cleanup(&edt); @@ -2560,7 +2623,6 @@ process_packet_second_pass(capture_file *cf, frame_data *fdata, } return passed; } -#endif static int load_cap_file(capture_file *cf, char *save_file, int out_file_type, @@ -2576,7 +2638,11 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type, gboolean filtering_tap_listeners; guint tap_flags; +#ifdef PCAP_NG_DEFAULT + linktype = WTAP_ENCAP_PER_PACKET; +#else linktype = wtap_file_encap(cf->wth); +#endif if (save_file != NULL) { /* Get a string that describes what we're writing to */ save_file_string = output_file_description(save_file); @@ -2601,7 +2667,7 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type, case WTAP_ERR_UNSUPPORTED_ENCAP: case WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED: cmdarg_err("The capture file being read can't be written in " - "that format."); + "the format \"%s\".", wtap_encap_short_string(linktype)); break; case WTAP_ERR_CANT_OPEN: @@ -2646,10 +2712,13 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type, tap_flags = union_of_tap_listener_flags(); if (perform_two_pass_analysis) { -#if GLIB_CHECK_VERSION(2,10,0) + guint32 framenum; frame_data *fdata; int old_max_packet_count = max_packet_count; + /* Allocate a frame_data_sequence for all the frames. */ + cf->frames = new_frame_data_sequence(); + while (wtap_read(cf->wth, &err, &err_info, &data_offset)) { if (process_packet_first_pass(cf, data_offset, wtap_phdr(cf->wth), wtap_pseudoheader(cf->wth), wtap_buf_ptr(cf->wth))) { @@ -2674,7 +2743,8 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type, max_packet_count = old_max_packet_count; - for (fdata = cf->plist_start; err == 0 && fdata != NULL; fdata = fdata->next) { + for (framenum = 1; err == 0 && framenum <= cf->count; framenum++) { + fdata = frame_data_sequence_find(cf->frames, framenum); if (wtap_seek_read(cf->wth, fdata->file_off, &cf->pseudo_header, cf->pd, fdata->cap_len, &err, &err_info)) { if (process_packet_second_pass(cf, fdata, @@ -2705,7 +2775,6 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type, } } } -#endif } else { while (wtap_read(cf->wth, &err, &err_info, &data_offset)) { @@ -2766,29 +2835,34 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type, switch (err) { case WTAP_ERR_UNSUPPORTED_ENCAP: - cmdarg_err("\"%s\" has a packet with a network type that TShark doesn't support.\n(%s)", + cmdarg_err("The file \"%s\" has a packet with a network type that TShark doesn't support.\n(%s)", cf->filename, err_info); g_free(err_info); break; case WTAP_ERR_CANT_READ: - cmdarg_err("An attempt to read from \"%s\" failed for some unknown reason.", + cmdarg_err("An attempt to read from the file \"%s\" failed for some unknown reason.", cf->filename); break; case WTAP_ERR_SHORT_READ: - cmdarg_err("\"%s\" appears to have been cut short in the middle of a packet.", + cmdarg_err("The file \"%s\" appears to have been cut short in the middle of a packet.", cf->filename); break; case WTAP_ERR_BAD_RECORD: - cmdarg_err("\"%s\" appears to be damaged or corrupt.\n(%s)", + cmdarg_err("The file \"%s\" appears to be damaged or corrupt.\n(%s)", cf->filename, err_info); g_free(err_info); break; + case WTAP_ERR_DECOMPRESS: + cmdarg_err("The compressed file \"%s\" appears to be damaged or corrupt.\n" + "(%s)", cf->filename, err_info); + break; + default: - cmdarg_err("An error occurred while reading \"%s\": %s.", + cmdarg_err("An error occurred while reading the file \"%s\": %s.", cf->filename, wtap_strerror(err)); break; } @@ -2955,7 +3029,7 @@ write_preamble(capture_file *cf) case WRITE_XML: if (verbose) - write_pdml_preamble(stdout); + write_pdml_preamble(stdout, cf ? cf->filename : NULL); else write_psml_preamble(stdout); return !ferror(stdout); @@ -3004,6 +3078,9 @@ print_columns(capture_file *cf) buf_offset = 0; *line_bufp = '\0'; for (i = 0; i < cf->cinfo.num_cols; i++) { + /* Skip columns not marked as visible. */ + if (!get_column_visible(i)) + continue; switch (cf->cinfo.col_fmt[i]) { case COL_NUMBER: #ifdef HAVE_LIBPCAP @@ -3018,25 +3095,27 @@ print_columns(capture_file *cf) * the same time, sort of like an "Update list of packets * in real time" capture in Wireshark.) */ - if (global_capture_opts.iface != NULL) + if (global_capture_opts.ifaces->len > 0) continue; #endif column_len = strlen(cf->cinfo.col_data[i]); if (column_len < 3) column_len = 3; line_bufp = get_line_buf(buf_offset + column_len); - sprintf(line_bufp + buf_offset, "%3s", cf->cinfo.col_data[i]); + g_snprintf(line_bufp + buf_offset, (int)column_len + 1, "%3s", cf->cinfo.col_data[i]); break; case COL_CLS_TIME: case COL_REL_TIME: case COL_ABS_TIME: - case COL_ABS_DATE_TIME: /* XXX - wider */ + case COL_ABS_DATE_TIME: + case COL_UTC_TIME: + case COL_UTC_DATE_TIME: /* XXX - wider */ column_len = strlen(cf->cinfo.col_data[i]); if (column_len < 10) column_len = 10; line_bufp = get_line_buf(buf_offset + column_len); - sprintf(line_bufp + buf_offset, "%10s", cf->cinfo.col_data[i]); + g_snprintf(line_bufp + buf_offset, (int)column_len + 1, "%10s", cf->cinfo.col_data[i]); break; case COL_DEF_SRC: @@ -3052,7 +3131,7 @@ print_columns(capture_file *cf) if (column_len < 12) column_len = 12; line_bufp = get_line_buf(buf_offset + column_len); - sprintf(line_bufp + buf_offset, "%12s", cf->cinfo.col_data[i]); + g_snprintf(line_bufp + buf_offset, (int)column_len + 1, "%12s", cf->cinfo.col_data[i]); break; case COL_DEF_DST: @@ -3068,13 +3147,13 @@ print_columns(capture_file *cf) if (column_len < 12) column_len = 12; line_bufp = get_line_buf(buf_offset + column_len); - sprintf(line_bufp + buf_offset, "%-12s", cf->cinfo.col_data[i]); + g_snprintf(line_bufp + buf_offset, (int)column_len + 1, "%-12s", cf->cinfo.col_data[i]); break; default: column_len = strlen(cf->cinfo.col_data[i]); line_bufp = get_line_buf(buf_offset + column_len); - strcat(line_bufp + buf_offset, cf->cinfo.col_data[i]); + g_strlcat(line_bufp + buf_offset, cf->cinfo.col_data[i], column_len + 1); break; } buf_offset += column_len; @@ -3085,9 +3164,9 @@ print_columns(capture_file *cf) * * If we printed a network source and are printing a * network destination of the same type next, separate - * them with "->"; if we printed a network destination + * them with " -> "; if we printed a network destination * and are printing a network source of the same type - * next, separate them with "<-"; otherwise separate them + * next, separate them with " <- "; otherwise separate them * with a space. * * We add enough space to the buffer for " <- " or " -> ", @@ -3104,12 +3183,12 @@ print_columns(capture_file *cf) case COL_DEF_DST: case COL_RES_DST: case COL_UNRES_DST: - strcat(line_bufp + buf_offset, " -> "); + g_strlcat(line_bufp + buf_offset, " -> ", 5); buf_offset += 4; break; default: - strcat(line_bufp + buf_offset, " "); + g_strlcat(line_bufp + buf_offset, " ", 5); buf_offset += 1; break; } @@ -3123,12 +3202,12 @@ print_columns(capture_file *cf) case COL_DEF_DL_DST: case COL_RES_DL_DST: case COL_UNRES_DL_DST: - strcat(line_bufp + buf_offset, " -> "); + g_strlcat(line_bufp + buf_offset, " -> ", 5); buf_offset += 4; break; default: - strcat(line_bufp + buf_offset, " "); + g_strlcat(line_bufp + buf_offset, " ", 5); buf_offset += 1; break; } @@ -3142,12 +3221,12 @@ print_columns(capture_file *cf) case COL_DEF_NET_DST: case COL_RES_NET_DST: case COL_UNRES_NET_DST: - strcat(line_bufp + buf_offset, " -> "); + g_strlcat(line_bufp + buf_offset, " -> ", 5); buf_offset += 4; break; default: - strcat(line_bufp + buf_offset, " "); + g_strlcat(line_bufp + buf_offset, " ", 5); buf_offset += 1; break; } @@ -3161,12 +3240,12 @@ print_columns(capture_file *cf) case COL_DEF_SRC: case COL_RES_SRC: case COL_UNRES_SRC: - strcat(line_bufp + buf_offset, " <- "); + g_strlcat(line_bufp + buf_offset, " <- ", 5); buf_offset += 4; break; default: - strcat(line_bufp + buf_offset, " "); + g_strlcat(line_bufp + buf_offset, " ", 5); buf_offset += 1; break; } @@ -3180,12 +3259,12 @@ print_columns(capture_file *cf) case COL_DEF_DL_SRC: case COL_RES_DL_SRC: case COL_UNRES_DL_SRC: - strcat(line_bufp + buf_offset, " <- "); + g_strlcat(line_bufp + buf_offset, " <- ", 5); buf_offset += 4; break; default: - strcat(line_bufp + buf_offset, " "); + g_strlcat(line_bufp + buf_offset, " ", 5); buf_offset += 1; break; } @@ -3199,19 +3278,19 @@ print_columns(capture_file *cf) case COL_DEF_NET_SRC: case COL_RES_NET_SRC: case COL_UNRES_NET_SRC: - strcat(line_bufp + buf_offset, " <- "); + g_strlcat(line_bufp + buf_offset, " <- ", 5); buf_offset += 4; break; default: - strcat(line_bufp + buf_offset, " "); + g_strlcat(line_bufp + buf_offset, " ", 5); buf_offset += 1; break; } break; default: - strcat(line_bufp + buf_offset, " "); + g_strlcat(line_bufp + buf_offset, " ", 5); buf_offset += 1; break; } @@ -3441,7 +3520,7 @@ show_print_file_io_error(int err) default: cmdarg_err("An error occurred while printing packets: %s.", - strerror(err)); + g_strerror(err)); break; } } @@ -3532,6 +3611,15 @@ cf_open_error_message(int err, gchar *err_info, gboolean for_writing, errmsg = "A full header couldn't be written to the file \"%s\"."; break; + case WTAP_ERR_DECOMPRESS: + /* Seen only when opening a capture file for reading. */ + g_snprintf(errmsg_errno, sizeof(errmsg_errno), + "The compressed file \"%%s\" appears to be damaged or corrupt.\n" + "(%s)", err_info); + g_free(err_info); + errmsg = errmsg_errno; + break; + default: g_snprintf(errmsg_errno, sizeof(errmsg_errno), "The file \"%%s\" could not be %s: %s.", @@ -3575,7 +3663,7 @@ static void read_failure_message(const char *filename, int err) { cmdarg_err("An error occurred while reading from the file \"%s\": %s.", - filename, strerror(err)); + filename, g_strerror(err)); } /* @@ -3585,7 +3673,7 @@ static void write_failure_message(const char *filename, int err) { cmdarg_err("An error occurred while writing to the file \"%s\": %s.", - filename, strerror(err)); + filename, g_strerror(err)); } /*