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-pw-satop.c | |
| parent | ebd3dc6907c44d642a76f2a459395ffdb728143b (diff) | |
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-pw-satop.c')
| -rw-r--r-- | epan/dissectors/packet-pw-satop.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c index 36802d95c8..821d8a748b 100644 --- a/epan/dissectors/packet-pw-satop.c +++ b/epan/dissectors/packet-pw-satop.c @@ -63,6 +63,7 @@ static expert_field ei_cw_packet_size_too_small = EI_INIT; static dissector_handle_t pw_padding_handle; static dissector_handle_t pw_satop_udp_handle; +static dissector_handle_t pw_satop_mpls_handle; const char pwc_longname_pw_satop[] = "SAToP (no RTP support)"; @@ -461,19 +462,16 @@ void proto_register_pw_satop(void) proto_register_subtree_array(ett_array, array_length(ett_array)); expert_pwsatop = expert_register_protocol(proto); expert_register_field_array(expert_pwsatop, ei, array_length(ei)); + pw_satop_mpls_handle = register_dissector("pw_satop_mpls", dissect_pw_satop_mpls, proto); pw_satop_udp_handle = register_dissector("pw_satop_udp", dissect_pw_satop_udp, proto); } void proto_reg_handoff_pw_satop(void) { - dissector_handle_t pw_satop_mpls_handle; - pw_padding_handle = find_dissector_add_dependency("pw_padding", proto); /* For Decode As */ - pw_satop_mpls_handle = create_dissector_handle( dissect_pw_satop_mpls, proto ); dissector_add_for_decode_as("mpls.label", pw_satop_mpls_handle); - dissector_add_for_decode_as_with_preference("udp.port", pw_satop_udp_handle); } |