diff options
| author | Francesco Fondelli <francesco.fondelli@gmail.com> | 2017-01-10 08:54:52 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-01-28 03:50:09 +0000 |
| commit | 01ddd93a7296b54a2048de74691984a7e78e4cb9 (patch) | |
| tree | 4b32a46c81089a212b89e8ee0d2057acd9f3c62a /epan/dissectors/packet-pw-eth.c | |
| parent | ac68c43414ddd12cdfc24ea459846fc86a2d135c (diff) | |
| download | wireshark-01ddd93a7296b54a2048de74691984a7e78e4cb9.tar.gz | |
MPLS: relax pw_eth_heuristic and improve 1st nibble logic
relax pw_eth_heuristic and, at the same time, improve
the 1st nibble logic in dissect_mpls in order to disambiguate
between Ethernet pseudo-wire without a control word, with the MAC
address's first nibble being 4/6 and IPv4/6 packet.
Bug: 13301
Change-Id: If4697c2e40271d84e2db11a9f64ee60a8657e164
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/19599
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-pw-eth.c')
| -rw-r--r-- | epan/dissectors/packet-pw-eth.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c index 2c245331f7..58f8f3cb65 100644 --- a/epan/dissectors/packet-pw-eth.c +++ b/epan/dissectors/packet-pw-eth.c @@ -108,27 +108,32 @@ dissect_pw_eth_nocw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d } /* - * FF: this function returns TRUE if the first 12 bytes in tvb looks like - * two valid ethernet addresses. FALSE otherwise. + * FF: this function returns 2 if the first 12 bytes in tvb looks like + * two valid ethernet addresses, 1 if either one of them contains a + * registered OUI and 0 otherwise. */ -static gboolean +static int looks_like_plain_eth(tvbuff_t *tvb _U_) { const gchar *manuf_name_da; const gchar *manuf_name_sa; if (tvb_reported_length_remaining(tvb, 0) < 14) { - return FALSE; + return 0; } manuf_name_da = tvb_get_manuf_name_if_known(tvb, 0); manuf_name_sa = tvb_get_manuf_name_if_known(tvb, 6); if (manuf_name_da && manuf_name_sa) { - return TRUE; + return 2; + } + + if (manuf_name_da || manuf_name_sa) { + return 1; } - return FALSE; + return 0; } static int |