diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-12-06 15:15:05 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-12-06 15:15:05 +0000 |
| commit | 35b912bcbf7674f34e934c583ecfcea40c74bf64 (patch) | |
| tree | 2b6163cd88814f08caccd4413b7a88a5e1dcba0f /epan/dissectors/packet-pw-eth.c | |
| parent | f448c1d1c8130e7abc6a9bb0630cfb3a06f3a9bf (diff) | |
Fix "MPLS payload starting with valid-looking ethernet address dissected twice".
Fixes Bug #8043
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8043
svn path=/trunk/; revision=46420
Diffstat (limited to 'epan/dissectors/packet-pw-eth.c')
| -rw-r--r-- | epan/dissectors/packet-pw-eth.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c index 9a4d29c74f..8ad4cab5a8 100644 --- a/epan/dissectors/packet-pw-eth.c +++ b/epan/dissectors/packet-pw-eth.c @@ -155,11 +155,9 @@ dissect_pw_eth_heuristic(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint8 first_nibble = (tvb_get_guint8(tvb, 0) >> 4) & 0x0F; - if (looks_like_plain_eth(tvb)) { + if (looks_like_plain_eth(tvb)) call_dissector(pw_eth_handle_nocw, tvb, pinfo, tree); - } - - if (first_nibble == 0) + else if (first_nibble == 0) call_dissector(pw_eth_handle_cw, tvb, pinfo, tree); else call_dissector(pw_eth_handle_nocw, tvb, pinfo, tree); |