diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-05-18 22:55:26 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-05-18 21:35:26 +0000 |
| commit | 51004b96e3356ba10615745ddc8df9f60ed85085 (patch) | |
| tree | 9d6d6919c9a5d6a95f7b1a81b88f1bb4cdb88667 | |
| parent | 239ed442ac7a74deb99f26397f4563e8d72a336d (diff) | |
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>
| -rw-r--r-- | epan/dissectors/packet-arp.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-gre.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 50b2375d48..15ab85bc67 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -2034,6 +2034,7 @@ proto_reg_handoff_arp(void) dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_ARP_1201, arp_handle); dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_RARP_1201, arp_handle); dissector_add_uint("ax25.pid", AX25_P_ARP, arp_handle); + dissector_add_uint("gre.proto", ETHERTYPE_ARP, arp_handle); register_capture_dissector("ethertype", ETHERTYPE_ARP, capture_arp, proto_arp); register_capture_dissector("ax25.pid", AX25_P_ARP, capture_arp, proto_arp); } 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"}, |