aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ethertype.c
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2015-09-06 22:47:05 +0100
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2015-09-08 15:38:55 +0000
commitbc4bc72bd38ad9667bb27baf91eb64c654da6787 (patch)
tree3dc4de61c878eb37a1c25380fa8a9a6fb723d4c7 /epan/dissectors/packet-ethertype.c
parent2de799fb8d8b736d575a2a397136c46dbfb2484c (diff)
Detect mismatched ethertype protocol ID (IPv4) and encapsulated IP packet (IPv6)
Bug: 11458 Change-Id: I66b51654d268196da366b0e9aea6ced0076d4737 Reviewed-on: https://code.wireshark.org/review/10407 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ethertype.c')
-rw-r--r--epan/dissectors/packet-ethertype.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 4c2fcbf931..bf6ce23d8f 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -53,7 +53,7 @@ static dissector_handle_t data_handle;
static int proto_ethertype = -1;
const value_string etype_vals[] = {
- { ETHERTYPE_IP, "IP" },
+ { ETHERTYPE_IP, "IPv4" },
{ ETHERTYPE_IPv6, "IPv6" },
{ ETHERTYPE_VLAN, "802.1Q Virtual LAN" },
{ ETHERTYPE_ARP, "ARP" },