Blame wireshark-0018-Copy-over-from-Trunk.patch

3a1a1b
From: Bill Meier <wmeier@newsguy.com>
3a1a1b
Date: Tue, 17 Dec 2013 21:18:15 +0000
3a1a1b
Subject: [PATCH] Copy over from Trunk
3a1a1b
3a1a1b
 ------------------------------------------------------------------------
3a1a1b
 r54181 | wmeier | 2013-12-17 10:02:47 -0500 (Tue, 17 Dec 2013) | 8 lines
3a1a1b
3a1a1b
 From "bd": Fix " Wireshark stops showing new packets but dumpcap keeps writing them to the temp file"
3a1a1b
3a1a1b
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9571
3a1a1b
3a1a1b
 From me: Fixed in a slightly different manner than sugested in the patch attached to the bug.
3a1a1b
 ------------------------------------------------------------------------
3a1a1b
3a1a1b
svn path=/trunk-1.10/; revision=54196
3a1a1b
3a1a1b
diff --git a/dumpcap.c b/dumpcap.c
3a1a1b
index 4d42e71..7098f0c 100644
3a1a1b
--- a/dumpcap.c
3a1a1b
+++ b/dumpcap.c
3a1a1b
@@ -3653,8 +3653,8 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct
3a1a1b
         if ((cur_time - upd_time) > DUMPCAP_UPD_TIME) { /* wrap just causes an extra update */
3a1a1b
 #else
3a1a1b
         gettimeofday(&cur_time, NULL);
3a1a1b
-        if ((cur_time.tv_sec * 1000000 + cur_time.tv_usec) >
3a1a1b
-            (upd_time.tv_sec * 1000000 + upd_time.tv_usec + DUMPCAP_UPD_TIME*1000)) {
3a1a1b
+        if (((guint64)cur_time.tv_sec * 1000000 + cur_time.tv_usec) >
3a1a1b
+            ((guint64)upd_time.tv_sec * 1000000 + upd_time.tv_usec + DUMPCAP_UPD_TIME*1000)) {
3a1a1b
 #endif
3a1a1b
 
3a1a1b
             upd_time = cur_time;