diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-09-22 09:18:21 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-09-22 21:41:09 +0000 |
| commit | a156a0021d42d90130506e7e589ac4782d31bee8 (patch) | |
| tree | d0a32d0f74bddcb21badf8f0adeaafe6d907808d | |
| parent | 0b1fd7e8fb267c19eebe484db31a7240781a7023 (diff) | |
CDP: Add CDP over GRE
http://www.cisco.com/c/en/us/td/docs/wireless/access_point/15-3-3-JB/configuration/guide/cg_book/cg-appA-protfilters.html
Bug:12934
Change-Id: If6498446c86f509a44dc28d3c2e4d86cc61cd167
Reviewed-on: https://code.wireshark.org/review/17853
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-cdp.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-gre.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-gre.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 460d623bd1..d0014059e3 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -1447,7 +1447,8 @@ proto_reg_handoff_cdp(void) cdp_handle = create_dissector_handle(dissect_cdp, proto_cdp); dissector_add_uint("llc.cisco_pid", 0x2000, cdp_handle); dissector_add_uint("chdlc.protocol", 0x2000, cdp_handle); - dissector_add_uint("ppp.protocol", 0x0207, cdp_handle); + dissector_add_uint("ppp.protocol", 0x0207, cdp_handle); + dissector_add_uint("gre.proto", 0x2000, cdp_handle); } /* diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index 52ef0dedc3..8f16057d02 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -126,6 +126,7 @@ const value_string gre_typevals[] = { { ETHERTYPE_ARP, "ARP" }, { SAP_OSINL5, "OSI"}, { GRE_WCCP, "WCCP"}, + { GRE_CISCO_CDP, "CDP (Cisco)"}, { GRE_NHRP, "NHRP"}, { GRE_ERSPAN_88BE, "ERSPAN"}, { GRE_ERSPAN_22EB, "ERSPAN"}, diff --git a/epan/dissectors/packet-gre.h b/epan/dissectors/packet-gre.h index b066182a1c..38df26cfe5 100644 --- a/epan/dissectors/packet-gre.h +++ b/epan/dissectors/packet-gre.h @@ -22,6 +22,7 @@ */ #define GRE_KEEPALIVE 0x0000 +#define GRE_CISCO_CDP 0x2000 #define GRE_NHRP 0x2001 #define GRE_WCCP 0x883E #define GRE_ERSPAN_88BE 0x88BE |