Index: epan/column-utils.c =================================================================== --- epan/column-utils.c (revision 20034) +++ epan/column-utils.c (working copy) @@ -779,6 +779,53 @@ strcpy(cinfo->col_expr_val[col],cinfo->col_buf[col]); } +static void +col_set_epoch_time(frame_data *fd, column_info *cinfo, int col) +{ + struct tm *tmp; + time_t then; + + COL_CHECK_REF_TIME(fd, cinfo, col); + + + switch(timestamp_get_precision()) { + case(TS_PREC_FIXED_SEC): + case(TS_PREC_AUTO_SEC): + display_epoch_time(cinfo->col_buf[col], COL_MAX_LEN, + fd->abs_ts.secs, fd->abs_ts.nsecs / 1000000000, SECS); + break; + case(TS_PREC_FIXED_DSEC): + case(TS_PREC_AUTO_DSEC): + display_epoch_time(cinfo->col_buf[col], COL_MAX_LEN, + fd->abs_ts.secs, fd->abs_ts.nsecs / 100000000, DSECS); + break; + case(TS_PREC_FIXED_CSEC): + case(TS_PREC_AUTO_CSEC): + display_epoch_time(cinfo->col_buf[col], COL_MAX_LEN, + fd->abs_ts.secs, fd->abs_ts.nsecs / 10000000, CSECS); + break; + case(TS_PREC_FIXED_MSEC): + case(TS_PREC_AUTO_MSEC): + display_epoch_time(cinfo->col_buf[col], COL_MAX_LEN, + fd->abs_ts.secs, fd->abs_ts.nsecs / 1000000, MSECS); + break; + case(TS_PREC_FIXED_USEC): + case(TS_PREC_AUTO_USEC): + display_epoch_time(cinfo->col_buf[col], COL_MAX_LEN, + fd->abs_ts.secs, fd->abs_ts.nsecs / 1000, USECS); + break; + case(TS_PREC_FIXED_NSEC): + case(TS_PREC_AUTO_NSEC): + display_epoch_time(cinfo->col_buf[col], COL_MAX_LEN, + fd->abs_ts.secs, fd->abs_ts.nsecs, NSECS); + break; + default: + g_assert_not_reached(); + } + cinfo->col_data[col] = cinfo->col_buf[col]; + strcpy(cinfo->col_expr[col],"frame.time_delta"); + strcpy(cinfo->col_expr_val[col],cinfo->col_buf[col]); +} /* Set the format of the variable time format. XXX - this is called from "file.c" when the user changes the time format they want for "command-line-specified" time; it's a bit ugly @@ -805,6 +852,9 @@ case TS_DELTA: col_set_delta_time(fd, cinfo, col); break; + case TS_EPOCH: + col_set_epoch_time(fd, cinfo, col); + break; case TS_NOT_SET: /* code is missing for this case, but I don't know which [jmayer20051219] */ g_assert(FALSE); Index: epan/column.c =================================================================== --- epan/column.c (revision 20034) +++ epan/column.c (working copy) @@ -373,6 +373,37 @@ g_assert_not_reached(); } break; + case(TS_EPOCH): + /* This is enough to represent 2^63 (signed 64-bit integer) + fractions */ + switch(precision) { + case(TS_PREC_AUTO_SEC): + case(TS_PREC_FIXED_SEC): + return "0000000000000000000"; + break; + case(TS_PREC_AUTO_DSEC): + case(TS_PREC_FIXED_DSEC): + return "0000000000000000000.0"; + break; + case(TS_PREC_AUTO_CSEC): + case(TS_PREC_FIXED_CSEC): + return "0000000000000000000.00"; + break; + case(TS_PREC_AUTO_MSEC): + case(TS_PREC_FIXED_MSEC): + return "0000000000000000000.000"; + break; + case(TS_PREC_AUTO_USEC): + case(TS_PREC_FIXED_USEC): + return "0000000000000000000.000000"; + break; + case(TS_PREC_AUTO_NSEC): + case(TS_PREC_FIXED_NSEC): + return "0000000000000000000.000000000"; + break; + default: + g_assert_not_reached(); + } + break; case(TS_NOT_SET): return "0000.000000"; break; Index: epan/timestamp.h =================================================================== --- epan/timestamp.h (revision 20034) +++ epan/timestamp.h (working copy) @@ -29,10 +29,12 @@ * Type of time-stamp shown in the summary display. */ typedef enum { - TS_RELATIVE, + TS_RELATIVE, /* Since start of capture */ TS_ABSOLUTE, TS_ABSOLUTE_WITH_DATE, - TS_DELTA, + TS_DELTA, /* Since previous packet */ + TS_EPOCH, /* Seconds (and fractions) since epoch */ + /* * Special value used for the command-line setting in Wireshark, to indicate * that no value has been set from the command line. Index: epan/to_str.c =================================================================== --- epan/to_str.c (revision 20034) +++ epan/to_str.c (working copy) @@ -546,6 +546,61 @@ } } + +void +display_epoch_time(gchar *buf, int buflen, time_t sec, gint32 frac, + time_res_t units) +{ + const char *sign; + + + double elapsed_secs; + /* This should be OK as we are linked to GNU C Library which explicitly + * defines time_t to be zero at epoch time; using difftime guards against any + * other issues. + */ + elapsed_secs = difftime(sec,(time_t)0); + + /* This code copied from display_signed_time; keep it in case anyone is looking + at captures from before 1970 (???). + If the fractional part of the time stamp is negative, + print its absolute value and, if the seconds part isn't + (the seconds part should be zero in that case), stick + a "-" in front of the entire time stamp. */ + sign = ""; + if (frac < 0) { + frac = -frac; + if (elapsed_secs >= 0) + sign = "-"; + } + switch (units) { + + case SECS: + g_snprintf(buf, buflen, "%s%0.0f", sign, elapsed_secs); + break; + + case DSECS: + g_snprintf(buf, buflen, "%s%0.0f.%01d", sign, elapsed_secs, frac); + break; + + case CSECS: + g_snprintf(buf, buflen, "%s%0.0f.%02d", sign, elapsed_secs, frac); + break; + + case MSECS: + g_snprintf(buf, buflen, "%s%0.0f.%03d", sign, elapsed_secs, frac); + break; + + case USECS: + g_snprintf(buf, buflen, "%s%0.0f.%06d", sign, elapsed_secs, frac); + break; + + case NSECS: + g_snprintf(buf, buflen, "%s%0.0f.%09d", sign, elapsed_secs, frac); + break; + } +} + /* * Display a relative time as days/hours/minutes/seconds. */ Index: epan/to_str.h =================================================================== --- epan/to_str.h (revision 20034) +++ epan/to_str.h (working copy) @@ -72,6 +72,8 @@ extern gchar* abs_time_to_str(nstime_t*); extern gchar* abs_time_secs_to_str(time_t); extern void display_signed_time(gchar *, int, gint32, gint32, time_res_t); +extern void display_epoch_time(gchar *, int, time_t, gint32, time_res_t); + extern gchar* rel_time_to_str(nstime_t*); extern gchar* rel_time_to_secs_str(nstime_t*); extern gchar* oid_to_str(const guint8*, gint); Index: gtk/main.c =================================================================== --- gtk/main.c (revision 20034) +++ gtk/main.c (working copy) @@ -1243,7 +1243,7 @@ fprintf(output, "User interface:\n"); fprintf(output, " -g go to specified packet number after \"-r\"\n"); fprintf(output, " -m set the font name used for most text\n"); - fprintf(output, " -t ad|a|r|d output format of time stamps (def: r: rel. to first)\n"); + fprintf(output, " -t ad|a|r|d|e output format of time stamps (def: r: rel. to first)\n"); fprintf(output, " -X : eXtension options, see man page for details\n"); fprintf(output, " -z show various statistics, see man page for details\n"); @@ -2622,6 +2622,8 @@ timestamp_set_type(TS_ABSOLUTE_WITH_DATE); else if (strcmp(optarg, "d") == 0) timestamp_set_type(TS_DELTA); + else if (strcmp(optarg, "e") == 0) + timestamp_set_type(TS_EPOCH); else { cmdarg_err("Invalid time stamp type \"%s\"", optarg); cmdarg_err_cont("It must be \"r\" for relative, \"a\" for absolute,"); Index: gtk/menu.c =================================================================== --- gtk/menu.c (revision 20034) +++ gtk/menu.c (working copy) @@ -120,6 +120,7 @@ static void timestamp_absolute_date_cb(GtkWidget *w _U_, gpointer d _U_); static void timestamp_relative_cb(GtkWidget *w _U_, gpointer d _U_); static void timestamp_delta_cb(GtkWidget *w _U_, gpointer d _U_); +static void timestamp_epoch_cb(GtkWidget *w _U_, gpointer d _U_); static void timestamp_auto_cb(GtkWidget *w _U_, gpointer d _U_); static void timestamp_sec_cb(GtkWidget *w _U_, gpointer d _U_); static void timestamp_dsec_cb(GtkWidget *w _U_, gpointer d _U_); @@ -475,6 +476,8 @@ 0, "/View/Time Display Format/Date and Time of Day: 1970-01-01 01:02:03.123456", NULL), ITEM_FACTORY_ENTRY("/View/Time Display Format/Seconds Since Previous Packet: 1.123456", NULL, timestamp_delta_cb, 0, "/View/Time Display Format/Date and Time of Day: 1970-01-01 01:02:03.123456", NULL), + ITEM_FACTORY_ENTRY("/View/Time Display Format/Seconds Since Epoch Time: 123.123456", NULL, timestamp_epoch_cb, + 0, "/View/Time Display Format/Date and Time of Day: 1970-01-01 01:02:03.123456", NULL), ITEM_FACTORY_ENTRY("/View/Time Display Format/", NULL, NULL, 0, "", NULL), ITEM_FACTORY_ENTRY("/View/Time Display Format/Automatic (File Format Precision)", NULL, timestamp_auto_cb, 0, "", NULL), @@ -1646,6 +1649,16 @@ } static void +timestamp_epoch_cb(GtkWidget *w _U_, gpointer d _U_) +{ + if (recent.gui_time_format != TS_EPOCH) { + timestamp_set_type(TS_EPOCH); + recent.gui_time_format = TS_EPOCH; + cf_change_time_formats(&cfile); + } +} + +static void timestamp_auto_cb(GtkWidget *w _U_, gpointer d _U_) { if (recent.gui_time_precision != TS_PREC_AUTO) { @@ -1893,6 +1906,12 @@ recent.gui_time_format = -1; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE); break; + case(TS_EPOCH): + menu = gtk_item_factory_get_widget(main_menu_factory, + "/View/Time Display Format/Seconds Since Epoch Time: 123.123456"); + recent.gui_time_format = -1; + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE); + break; default: g_assert_not_reached(); } Index: gtk/packet_list.c =================================================================== --- gtk/packet_list.c (revision 20034) +++ gtk/packet_list.c (working copy) @@ -162,6 +162,7 @@ case TS_ABSOLUTE: case TS_ABSOLUTE_WITH_DATE: + case TS_EPOCH: return COMPARE_TS(abs_ts); case TS_RELATIVE: Index: gtk/recent.c =================================================================== --- gtk/recent.c (revision 20034) +++ gtk/recent.c (working copy) @@ -76,7 +76,7 @@ recent_settings_t recent; static const char *ts_type_text[] = - { "RELATIVE", "ABSOLUTE", "ABSOLUTE_WITH_DATE", "DELTA", NULL }; + { "RELATIVE", "ABSOLUTE", "ABSOLUTE_WITH_DATE", "DELTA", "EPOCH", NULL }; static const char *ts_precision_text[] = { "AUTO", "SEC", "DSEC", "CSEC", "MSEC", "USEC", "NSEC", NULL }; @@ -207,7 +207,7 @@ recent.packet_list_colorize == TRUE ? "TRUE" : "FALSE"); fprintf(rf, "\n# Timestamp display format.\n"); - fprintf(rf, "# One of: RELATIVE, ABSOLUTE, ABSOLUTE_WITH_DATE, DELTA\n"); + fprintf(rf, "# One of: RELATIVE, ABSOLUTE, ABSOLUTE_WITH_DATE, DELTA, EPOCH\n"); fprintf(rf, RECENT_GUI_TIME_FORMAT ": %s\n", ts_type_text[recent.gui_time_format]); Index: tshark.c =================================================================== --- tshark.c (revision 20034) +++ tshark.c (working copy) @@ -276,7 +276,7 @@ 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 output format of text output (def: text)\n"); - fprintf(output, " -t ad|a|r|d output format of time stamps (def: r: rel. to first)\n"); + fprintf(output, " -t ad|a|r|d|e output format of time stamps (def: r: rel. to first)\n"); fprintf(output, " -l flush output after each packet\n"); fprintf(output, " -q be more quiet on stdout (e.g. when using statistics)\n"); fprintf(output, " -X : eXtension options, see the man page for details\n"); @@ -1011,6 +1011,8 @@ timestamp_set_type(TS_ABSOLUTE_WITH_DATE); else if (strcmp(optarg, "d") == 0) timestamp_set_type(TS_DELTA); + else if (strcmp(optarg, "e") == 0) + timestamp_set_type(TS_EPOCH); else { cmdarg_err("Invalid time stamp type \"%s\"", optarg);