summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-gre.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2016-05-18 22:55:26 +0200
committerMichael Mann <mmann78@netscape.net>2016-05-18 21:35:26 +0000
commit51004b96e3356ba10615745ddc8df9f60ed85085 (patch)
tree9d6d6919c9a5d6a95f7b1a81b88f1bb4cdb88667 /epan/dissectors/packet-gre.c
parent239ed442ac7a74deb99f26397f4563e8d72a336d (diff)
downloadwireshark-51004b96e3356ba10615745ddc8df9f60ed85085.tar.gz
GRE: add support for ARP
Protocol type 0x0806 is registered for ARP according to RFC 1701 Bug: 12456 Change-Id: Iccdf582b16c54817a977b87be9f2b03c2f650d2a Reviewed-on: https://code.wireshark.org/review/15498 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-gre.c')
-rw-r--r--epan/dissectors/packet-gre.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c
index b431b9ea38..4c1dbc08f7 100644
--- a/epan/dissectors/packet-gre.c
+++ b/epan/dissectors/packet-gre.c
@@ -122,6 +122,7 @@ const value_string gre_typevals[] = {
{ GRE_KEEPALIVE, "Possible GRE keepalive packet" },
{ ETHERTYPE_PPP, "PPP" },
{ ETHERTYPE_IP, "IP" },
+ { ETHERTYPE_ARP, "ARP" },
{ SAP_OSINL5, "OSI"},
{ GRE_WCCP, "WCCP"},
{ GRE_NHRP, "NHRP"},