diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-04-02 23:11:51 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-06-25 16:42:28 +0000 |
| commit | 74e526f1965d8bfd573105e06986e41e97c1d781 (patch) | |
| tree | 8e77b744f290ee1eabb56ce7fed1e8e826c22b31 /epan/dissectors/packet-mpls.c | |
| parent | acc581081e84c93e878a678fbb3655aba253607a (diff) | |
Add proper "Decode As" mechanism for L2TPv3 subdissectors instead of preference.
Change-Id: I87f6f9f40e1c33148de43b53a8881d51416f5d2c
Reviewed-on: https://code.wireshark.org/review/7898
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mpls.c')
| -rw-r--r-- | epan/dissectors/packet-mpls.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index 86265052a0..87aa63245c 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -65,6 +65,7 @@ #include "packet-bfd.h" #include "packet-juniper.h" #include "packet-sflow.h" +#include "packet-l2tp.h" void proto_register_mpls(void); void proto_reg_handoff_mpls(void); @@ -642,6 +643,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("l2tp.pw_type", L2TPv3_PROTOCOL_MPLS, mpls_handle); dissector_add_uint("udp.port", UDP_PORT_MPLS_OVER_UDP, mpls_handle); mpls_pwcw_handle = create_dissector_handle( dissect_pw_mcw, proto_pw_mcw ); |