diff options
author | Remi Vichery <remi.vichery@gmail.com> | 2015-03-15 14:20:17 +0100 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-03-15 15:37:52 +0000 |
commit | 7696991dc8befa77556b9ebd6a64ad0f45b7d209 (patch) | |
tree | e4b99b28931ef9aa95858c5af78435cc29712ea3 | |
parent | 1d3d90de632b26fb44e8fc8ac8384e5b423fd113 (diff) |
Added MPLS over UDP support
Change-Id: Ifdffdf042908c5b4b25704c56d734e9c942d24f4
Reviewed-on: https://code.wireshark.org/review/7690
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r-- | epan/dissectors/packet-mpls.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-mpls.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index 154477628d..cb6aff6913 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -806,6 +806,7 @@ proto_reg_handoff_mpls(void) dissector_add_uint("juniper.proto", JUNIPER_PROTO_CLNP_MPLS, mpls_handle); dissector_add_for_decode_as("pwach.channel_type", mpls_handle); dissector_add_uint("sflow_245.header_protocol", SFLOW_245_HEADER_MPLS, mpls_handle); + dissector_add_uint("udp.port", UDP_PORT_MPLS_OVER_UDP, mpls_handle); mpls_handle = find_dissector("mplspwcw"); dissector_add_uint( "mpls.label", MPLS_LABEL_INVALID, mpls_handle ); diff --git a/epan/dissectors/packet-mpls.h b/epan/dissectors/packet-mpls.h index 800f4ad8fa..974e784879 100644 --- a/epan/dissectors/packet-mpls.h +++ b/epan/dissectors/packet-mpls.h @@ -48,6 +48,12 @@ enum { /* As RFC 6426:http://tools.ietf.org/html/rfc6426, Section: 7.4 */ #define ACH_TYPE_ONDEMAND_CV 0x0025 +/* MPLS over UDP http://tools.ietf.org/html/draft-ietf-mpls-in-udp-11, + * udp destination port as defined in + * http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=6635 + */ +#define UDP_PORT_MPLS_OVER_UDP 6635 + /* * FF: private data passed from the MPLS dissector to subdissectors * (data parameter). |