From 54b733ce9a0d1cd4ab9b142479368a5e696360be Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 28 Sep 2014 11:37:06 -0700 Subject: Make the time stamp resolution per-packet. Pcap-ng files don't have a per-file time stamp resolution, they have a per-interface time stamp resolution. Add new time stamp resolution types of "unknown" and "per-packet", add the time stamp resolution to struct wtap_pkthdr, have the libwiretap core initialize it to the per-file time stamp resolution, and have pcap-ng do the same thing with the resolution that it does with the packet encapsulation. Get rid of the TS_PREC_AUTO_XXX values; just have TS_PREC_AUTO, which means "use the packet's resolution to determine how many significant digits to display". Rename all the WTAP_FILE_TSPREC_XXX values to WTAP_TSPREC_XXX, as they're also used for per-packet values. Change-Id: If9fd8f799b19836a5104aaa0870a951498886c69 Reviewed-on: https://code.wireshark.org/review/4349 Reviewed-by: Guy Harris --- rawshark.c | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'rawshark.c') diff --git a/rawshark.c b/rawshark.c index 50589f8b0e..a1eb7fa027 100644 --- a/rawshark.c +++ b/rawshark.c @@ -873,35 +873,6 @@ main(int argc, char *argv[]) } } - /* Set timestamp precision; there should arguably be a command-line - option to let the user set this. */ -#if 0 - switch(wtap_file_tsprecision(cfile.wth)) { - case(WTAP_FILE_TSPREC_SEC): - timestamp_set_precision(TS_PREC_AUTO_SEC); - break; - case(WTAP_FILE_TSPREC_DSEC): - timestamp_set_precision(TS_PREC_AUTO_DSEC); - break; - case(WTAP_FILE_TSPREC_CSEC): - timestamp_set_precision(TS_PREC_AUTO_CSEC); - break; - case(WTAP_FILE_TSPREC_MSEC): - timestamp_set_precision(TS_PREC_AUTO_MSEC); - break; - case(WTAP_FILE_TSPREC_USEC): - timestamp_set_precision(TS_PREC_AUTO_USEC); - break; - case(WTAP_FILE_TSPREC_NSEC): - timestamp_set_precision(TS_PREC_AUTO_NSEC); - break; - default: - g_assert_not_reached(); - } -#else - timestamp_set_precision(TS_PREC_AUTO_USEC); -#endif - /* Process the packets in the file */ if (!load_cap_file(&cfile)) { epan_free(cfile.epan); -- cgit v1.2.3