aboutsummaryrefslogtreecommitdiffstats
path: root/packet-chdlc.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2003-01-27 19:28:52 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2003-01-27 19:28:52 +0000
commite4baf0fdf26eb8e9480db8b74ce00343924053c2 (patch)
tree877436ad9dcaef8016fb6f06134516a6cdab508a /packet-chdlc.c
parenta946c0721cb9e8b068523eb5866087aed10499b2 (diff)
From Hannes Gredler: support MPLS over CHDLC.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7004 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-chdlc.c')
-rw-r--r--packet-chdlc.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/packet-chdlc.c b/packet-chdlc.c
index 5fed9aa547..7b27352da4 100644
--- a/packet-chdlc.c
+++ b/packet-chdlc.c
@@ -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