osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Alexis La Goutte 2016-09-22 09:18:21 +02:00 committed by Michael Mann
parent 0b1fd7e8fb
commit a156a0021d
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-cdp.c
View File

@ -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);
}
/*

1
epan/dissectors/packet-gre.c
View File

@ -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"},

1
epan/dissectors/packet-gre.h
View File

@ -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