diff options
author | Bill Meier <wmeier@newsguy.com> | 2008-11-13 01:31:57 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2008-11-13 01:31:57 +0000 |
commit | a042c3aedd2b586aa6fe15cb532eddb072baf866 (patch) | |
tree | 1fa6c56b6f83f0ce618a1e250ddf1f48449a8c64 /epan/dissectors/packet-msrp.c | |
parent | 62d20ccfb676da557c21a14034da416b40dc175c (diff) |
Small changes related to proto_register & proto_reg_handoff
- Move find_dissector_table(...) to proto_reg_handoff;
- Use dissactor_add_handle instead of registering the dissector to tcp port 0;
- Use find_dissector when appropriate.
svn path=/trunk/; revision=26767
Diffstat (limited to 'epan/dissectors/packet-msrp.c')
-rw-r--r-- | epan/dissectors/packet-msrp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index c79c685034..799cb40c58 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -770,9 +770,10 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_reg_handoff_msrp(void) { - msrp_handle = new_create_dissector_handle(dissect_msrp, proto_msrp); - dissector_add("tcp.port", 0, msrp_handle); + msrp_handle = find_dissector("msrp"); + dissector_add_handle("tcp.port", msrp_handle); /* for "decode-as" */ heur_dissector_add("tcp", dissect_msrp_heur, proto_msrp); + media_type_dissector_table = find_dissector_table("media_type"); } void @@ -937,8 +938,6 @@ proto_register_msrp(void) proto_register_field_array(proto_msrp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - media_type_dissector_table = find_dissector_table("media_type"); - msrp_module = prefs_register_protocol(proto_msrp, NULL); prefs_register_bool_preference(msrp_module, "display_raw_text", |