From 20128275db311f8395004d774e5580b4fa815988 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Thu, 19 Mar 2009 01:54:09 +0000 Subject: - Move register_dissector(...) from proto_reg_handoff() to proto_register(); - Use dissector_add_handle("udp",...) rather than dissector_add(""udp",0,...) svn path=/trunk/; revision=27794 --- epan/dissectors/packet-ehs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-ehs.c') diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c index cbe2e81bb1..b8930e7290 100644 --- a/epan/dissectors/packet-ehs.c +++ b/epan/dissectors/packet-ehs.c @@ -208,7 +208,7 @@ static int hf_ehs_dz_udsm_num_pkts_xmtd_rollover = -1; /* handle to ccsds packet dissector */ -static dissector_handle_t ccsds_handle = (dissector_handle_t)-1; +static dissector_handle_t ccsds_handle; /* Initialize the subtree pointers */ static gint ett_ehs = -1; @@ -1906,6 +1906,9 @@ proto_register_ehs(void) proto_register_field_array(proto_ehs, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + /* XX: Does this dissector need to be publicly registered ?? */ + register_dissector ( "ehs", dissect_ehs, proto_ehs ); + } @@ -1916,8 +1919,7 @@ proto_register_ehs(void) void proto_reg_handoff_ehs(void) { - register_dissector ( "ehs", dissect_ehs, proto_ehs ); - dissector_add ( "udp.port", 0, find_dissector("ehs") ); + dissector_add_handle ( "udp.port", find_dissector("ehs") ); /* for 'decode as' */ ccsds_handle = find_dissector ( "ccsds" ); } -- cgit v1.2.3