osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

- 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
This commit is contained in:
Bill Meier 2009-03-19 01:54:09 +00:00
parent 0230af331b
commit 20128275db
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-ccsds.c
View File

@ -436,7 +436,7 @@ dissect_ccsds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Register the protocol with Wireshark
* this format is require because a script is used to build the C function
* this format is required because a script is used to build the C function
* that calls all the protocol registration.
*/
void
@ -592,6 +592,7 @@ proto_register_ccsds(void)
proto_register_field_array(proto_ccsds, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
register_dissector ( "ccsds", dissect_ccsds, proto_ccsds );
}
@ -602,7 +603,6 @@ proto_register_ccsds(void)
void
proto_reg_handoff_ccsds(void)
{
register_dissector ( "ccsds", dissect_ccsds, proto_ccsds );
dissector_add ( "udp.port", 0, find_dissector("ccsds") );
dissector_add_handle ( "udp.port", find_dissector("ccsds") ); /* for 'decode as' */
}

8
epan/dissectors/packet-ehs.c
View File

@ -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" );
}

7
epan/dissectors/packet-vcdu.c
View File

@ -76,7 +76,7 @@ static int hf_vcdu_replay = -1;
static int hf_vcdu_fhp = -1;
static int hf_vcdu_lbp = -1;
static dissector_handle_t ccsds_handle = (dissector_handle_t)-1;
static dissector_handle_t ccsds_handle;
/* Initialize the subtree pointers */
static gint ett_vcdu = -1;
@ -631,6 +631,8 @@ proto_register_vcdu(void)
proto_register_field_array(proto_vcdu, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
/* XX: Does this dissector need to be publicly registered ?? */
register_dissector ( "vcdu", dissect_vcdu, proto_vcdu );
}
@ -641,8 +643,7 @@ proto_register_vcdu(void)
void
proto_reg_handoff_vcdu(void)
{
register_dissector ( "vcdu", dissect_vcdu, proto_vcdu );
dissector_add ( "udp.port", 0, find_dissector("vcdu") );
dissector_add_handle ( "udp.port", find_dissector("vcdu") ); /* for 'decode as' */
ccsds_handle = find_dissector ( "ccsds" );
}