"Bytes left to read" is an unsigned quantity. Changed FT_INT64 to FT_UINT64 as sugge...

[obnox/wireshark/wip.git] / epan / frame_data.c

diff --git a/epan/frame_data.c b/epan/frame_data.c
index 4bde07fa33600f27c280303bfa7857cb16cccee1..a233c75127517d98746c503718be30bd9e3b9c5f 100644 (file)
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -143,6 +143,8 @@ frame_data_compare(const frame_data *fdata1, const frame_data *fdata2, int field
             switch (timestamp_get_type()) {
                 case TS_ABSOLUTE:
                 case TS_ABSOLUTE_WITH_DATE:
+                case TS_UTC:
+                case TS_UTC_WITH_DATE:
                 case TS_EPOCH:
                     return COMPARE_TS(abs_ts);
 
@@ -162,6 +164,8 @@ frame_data_compare(const frame_data *fdata1, const frame_data *fdata2, int field
 
         case COL_ABS_TIME:
         case COL_ABS_DATE_TIME:
+        case COL_UTC_TIME:
+        case COL_UTC_DATE_TIME:
             return COMPARE_TS(abs_ts);
 
         case COL_REL_TIME:
@@ -199,6 +203,8 @@ frame_data_init(frame_data *fdata, guint32 num,
   fdata->lnk_t = (gint16) phdr->pkt_encap;
   fdata->abs_ts.secs = phdr->ts.secs;
   fdata->abs_ts.nsecs = phdr->ts.nsecs;
+  fdata->shift_offset.secs = 0;
+  fdata->shift_offset.nsecs = 0;
   fdata->flags.passed_dfilter = 0;
   fdata->flags.encoding = PACKET_CHAR_ENC_CHAR_ASCII;
   fdata->flags.visited = 0;