diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-01-07 21:31:05 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-01-08 08:15:41 +0000 |
| commit | 3952052426fbf063585b57aefe6b1b2fa57d651d (patch) | |
| tree | 57bd5f6e8b45294d48266c6d2331917bbd875c3d /epan/dissectors/packet-mpls.c | |
| parent | ebd3dc6907c44d642a76f2a459395ffdb728143b (diff) | |
| download | wireshark-3952052426fbf063585b57aefe6b1b2fa57d651d.tar.gz | |
Restore some MPLS registered dissectors.
Per https://ask.wireshark.org/questions/58532/missing-dissector-pw_eth_cw
it appears some MPLS dissectors are still referenced by name and
not just for the dissector table created in
I1e0c3ae784b71c0145b1f1730a97feae8e9f488f.
Change-Id: I27be132f56c879be16f78f76ac0e9688673a47c1
Reviewed-on: https://code.wireshark.org/review/19582
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mpls.c')
| -rw-r--r-- | epan/dissectors/packet-mpls.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index 59e9a206a2..4ea63e589e 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -121,6 +121,7 @@ static expert_field ei_mpls_pw_mcw_error_processing_message = EI_INIT; static expert_field ei_mpls_invalid_label = EI_INIT; static dissector_handle_t mpls_handle; +static dissector_handle_t mpls_pwcw_handle; #if 0 /*not used yet*/ /* @@ -641,6 +642,7 @@ proto_register_mpls(void) expert_register_field_array(expert_mpls, ei, array_length(ei)); mpls_handle = register_dissector("mpls", dissect_mpls, proto_mpls); + mpls_pwcw_handle = register_dissector("mplspwcw", dissect_pw_mcw, proto_pw_mcw ); /* FF: mpls subdissector table is indexed by label */ mpls_subdissector_table = register_dissector_table("mpls.label", @@ -667,8 +669,6 @@ proto_register_mpls(void) void proto_reg_handoff_mpls(void) { - dissector_handle_t mpls_pwcw_handle; - dissector_add_uint("ethertype", ETHERTYPE_MPLS, mpls_handle); dissector_add_uint("ethertype", ETHERTYPE_MPLS_MULTI, mpls_handle); dissector_add_uint("ppp.protocol", PPP_MPLS_UNI, mpls_handle); @@ -688,7 +688,6 @@ proto_reg_handoff_mpls(void) dissector_add_uint_with_preference("udp.port", UDP_PORT_MPLS_OVER_UDP, mpls_handle); dissector_add_uint("vxlan.next_proto", VXLAN_MPLS, mpls_handle); - mpls_pwcw_handle = create_dissector_handle( dissect_pw_mcw, proto_pw_mcw ); dissector_add_uint( "mpls.label", MPLS_LABEL_INVALID, mpls_pwcw_handle ); dissector_ipv6 = find_dissector_add_dependency("ipv6", proto_pw_mcw ); |