aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-vssmonitoring.c
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2013-04-19 16:40:06 +0000
committerJörg Mayer <jmayer@loplof.de>2013-04-19 16:40:06 +0000
commit3978d46572be0e08a905cb021610fe8f2782c7c4 (patch)
treee4a8bbab095dca5f32b6ba26eb6c6dce6c33719b /epan/dissectors/packet-vssmonitoring.c
parentc5548e107758aca4c681b1baa338d89c11bcf61a (diff)
Slightly improve heuristics to not interpret a zero-filled trailer
as vss data. svn path=/trunk/; revision=48933
Diffstat (limited to 'epan/dissectors/packet-vssmonitoring.c')
-rw-r--r--epan/dissectors/packet-vssmonitoring.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-vssmonitoring.c b/epan/dissectors/packet-vssmonitoring.c
index c2cb65036f..253e60d921 100644
--- a/epan/dissectors/packet-vssmonitoring.c
+++ b/epan/dissectors/packet-vssmonitoring.c
@@ -123,6 +123,12 @@ dissect_vssmonitoring(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
/* The timestamp will be based on the uptime until the TAP is completely booted,
* this takes about 60s, but use 1 hour to be sure
*/
+
+ /* Probably just null data to fill up a short frame.
+ * FIXME: Should be made even stricter.
+ */
+ if (vssmonitoring_time.secs == 0)
+ return 0;
if (vssmonitoring_time.secs > 3600) {
/* Check whether the timestamp in the PCAP header and the VSS-Monitoring