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-hdlc.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-hdlc.c')
| -rw-r--r-- | epan/dissectors/packet-pw-hdlc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c index d323b7c328..915095141e 100644 --- a/epan/dissectors/packet-pw-hdlc.c +++ b/epan/dissectors/packet-pw-hdlc.c @@ -42,6 +42,8 @@ void proto_reg_handoff_pw_hdlc(void); static dissector_handle_t ppp_handle; static dissector_handle_t fr_handle; +static dissector_handle_t pw_hdlc_nocw_fr_handle; +static dissector_handle_t pw_ppp_handle; static gint proto_pw_hdlc_nocw_fr = -1; static gint proto_pw_hdlc_nocw_hdlc_ppp = -1; @@ -218,16 +220,14 @@ void proto_register_pw_hdlc(void) proto_register_field_array(proto_pw_hdlc_nocw_fr, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + + pw_hdlc_nocw_fr_handle = register_dissector("pw_hdlc_nocw_fr", dissect_pw_hdlc_nocw_fr, proto_pw_hdlc_nocw_fr ); + pw_ppp_handle = register_dissector("pw_hdlc_nocw_hdlc_ppp", dissect_pw_hdlc_nocw_hdlc_ppp, proto_pw_hdlc_nocw_hdlc_ppp ); } void proto_reg_handoff_pw_hdlc(void) { - dissector_handle_t pw_fr_handle, pw_ppp_handle; - - pw_fr_handle = create_dissector_handle( dissect_pw_hdlc_nocw_fr, proto_pw_hdlc_nocw_fr ); - dissector_add_for_decode_as( "mpls.label", pw_fr_handle ); - - pw_ppp_handle = create_dissector_handle( dissect_pw_hdlc_nocw_hdlc_ppp, proto_pw_hdlc_nocw_hdlc_ppp ); + dissector_add_for_decode_as( "mpls.label", pw_hdlc_nocw_fr_handle ); dissector_add_for_decode_as( "mpls.label", pw_ppp_handle ); ppp_handle = find_dissector_add_dependency( "ppp", proto_pw_hdlc_nocw_hdlc_ppp ); |