diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-10-14 18:16:11 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-10-14 18:16:11 +0000 |
commit | 7541b470206726239051a0453ceeb377d80cb19d (patch) | |
tree | 45af85591d3e4a790539224470fddbe28f6ed6ec /epan/dissectors/packet-lanforge.c | |
parent | c94403e9ba67eae9c04a033957d78533fed254b5 (diff) |
Try to pptimize heuristics slightly.
svn path=/trunk/; revision=52603
Diffstat (limited to 'epan/dissectors/packet-lanforge.c')
-rw-r--r-- | epan/dissectors/packet-lanforge.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c index 20273fc5af..0b6be777b8 100644 --- a/epan/dissectors/packet-lanforge.c +++ b/epan/dissectors/packet-lanforge.c @@ -38,7 +38,7 @@ #include <epan/packet.h> /* magic num used for heuristic */ -static const guint8 lanforge_magic[] = { 0x1a, 0x2b, 0x3c, 0x4d }; +#define LANFORGE_MAGIC 0x1a2b3c4d /* Initialize the protocol and registered fields */ static int proto_lanforge = -1; @@ -73,7 +73,7 @@ static gboolean dissect_lanforge(tvbuff_t *tvb, packet_info *pinfo, proto_tree * nstime_t tstamp; guint32 tss; guint32 tmpi; - guint32 pld_len; + guint32 pld_len, magic; /* check for min size */ if(tvb_length(tvb) < 28) { /* Not a LANforge packet. */ @@ -81,8 +81,10 @@ static gboolean dissect_lanforge(tvbuff_t *tvb, packet_info *pinfo, proto_tree * } /* check for magic number */ - if(tvb_memeql(tvb, 4, lanforge_magic, 4) == -1) { /* Not a LANforge packet. */ - return FALSE; + magic = tvb_get_ntohl(tvb,0); + if(magic != LANFORGE_MAGIC){ + /* Not a LANforge packet. */ + return FALSE; } /* Make entries in Protocol column and Info column on summary display */ |