osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Hannes Gredler: support MPLS over CHDLC. 

svn path=/trunk/; revision=7004
This commit is contained in:
Guy Harris 2003-01-27 19:28:52 +00:00
parent 1a66f9aec9
commit ca679be5d7
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -701,6 +701,7 @@ Hannes Gredler <hannes[AT]juniper.net> {
Decode the sample rate factor in cflowd5 headers
Support OSI over CHDLC
Show the type value for OSI protocols symbolically in GRE
Support MPLS over CHDLC
}
Inoue <inoue[AT]ainet.or.jp> {

26
packet-chdlc.c
View File

@ -1,7 +1,7 @@
/* packet-chdlc.c
* Routines for Cisco HDLC packet disassembly
*
* $Id: packet-chdlc.c,v 1.18 2003/01/11 10:16:22 guy Exp $
* $Id: packet-chdlc.c,v 1.19 2003/01/27 19:28:52 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -87,17 +87,19 @@ static const value_string chdlc_address_vals[] = {
};
const value_string chdlc_vals[] = {
{0x2000, "Cisco Discovery Protocol"},
{ETHERTYPE_IP, "IP"},
{CISCO_SLARP, "SLARP"},
{ETHERTYPE_DEC_LB, "DEC LanBridge"},
{CHDLCTYPE_BPDU, "Spanning Tree BPDU"},
{ETHERTYPE_ATALK, "Appletalk"},
{ETHERTYPE_AARP, "AARP"},
{ETHERTYPE_IPX, "Netware IPX/SPX"},
{ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" },
{CHDLCTYPE_OSI, "OSI" },
{0, NULL}
{0x2000, "Cisco Discovery Protocol"},
{ETHERTYPE_IP, "IP"},
{CISCO_SLARP, "SLARP"},
{ETHERTYPE_DEC_LB, "DEC LanBridge"},
{CHDLCTYPE_BPDU, "Spanning Tree BPDU"},
{ETHERTYPE_ATALK, "Appletalk"},
{ETHERTYPE_AARP, "AARP"},
{ETHERTYPE_IPX, "Netware IPX/SPX"},
{ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" },
{CHDLCTYPE_OSI, "OSI" },
{ETHERTYPE_MPLS, "MPLS unicast"},
{ETHERTYPE_MPLS_MULTI, "MPLS multicast"},
{0, NULL}
};
void

4
packet-mpls.c
View File

@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
* $Id: packet-mpls.c,v 1.28 2002/08/28 21:00:22 jmayer Exp $
* $Id: packet-mpls.c,v 1.29 2003/01/27 19:28:52 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -217,4 +217,6 @@ proto_reg_handoff_mpls(void)
mpls_handle = create_dissector_handle(dissect_mpls, proto_mpls);
dissector_add("ethertype", ETHERTYPE_MPLS, mpls_handle);
dissector_add("ppp.protocol", PPP_MPLS_UNI, mpls_handle);
dissector_add("chdlctype", ETHERTYPE_MPLS, mpls_handle);
dissector_add("chdlctype", ETHERTYPE_MPLS_MULTI, mpls_handle);
}