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

LDP support for draft-martini-l2circuit-encap-mpls for 

Ethernet-over-MPLS, from Aamer Akhter.

svn path=/trunk/; revision=4971
This commit is contained in:
Guy Harris 2002-03-18 18:56:53 +00:00
parent 0c7d8b3b30
commit da785cee2e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -779,6 +779,8 @@ Aamer Akhter <aakhter[AT]cisco.com> {
Support for additional BGP extended communities
LDP support for draft-martini-l2circuit-trans-mpls, LDP status
code updates, and small LDP cleanups
LDP support for draft-martini-l2circuit-encap-mpls for
Ethernet-over-MPLS
}
Pekka Savola <pekkas[AT]netcore.fi> {

10
packet-mpls.c
View File

@ -3,7 +3,7 @@
*
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
*
* $Id: packet-mpls.c,v 1.25 2002/01/21 07:36:37 guy Exp $
* $Id: packet-mpls.c,v 1.26 2002/03/18 18:56:53 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -109,6 +109,7 @@ static hf_register_info mplsf_info[] = {
static dissector_handle_t ipv4_handle;
static dissector_handle_t ipv6_handle;
static dissector_handle_t eth_handle;
/*
* Given a 4-byte MPLS label starting at offset "offset", in tvbuff "tvb",
@ -184,9 +185,11 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ipvers = (tvb_get_guint8(tvb, offset) >> 4) & 0x0F;
if (ipvers == 6) {
call_dissector(ipv6_handle, next_tvb, pinfo, tree);
call_dissector(ipv6_handle, next_tvb, pinfo, tree);
} else if (ipvers == 4) {
call_dissector(ipv4_handle, next_tvb, pinfo, tree);
} else {
call_dissector(ipv4_handle, next_tvb, pinfo, tree);
call_dissector(eth_handle, next_tvb, pinfo, tree);
}
}
@ -213,6 +216,7 @@ proto_reg_handoff_mpls(void)
*/
ipv4_handle = find_dissector("ip");
ipv6_handle = find_dissector("ipv6");
eth_handle = find_dissector("eth");
mpls_handle = create_dissector_handle(dissect_mpls, proto_mpls);
dissector_add("ethertype", ETHERTYPE_MPLS, mpls_handle);