diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-01-04 12:05:17 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-01-04 12:05:17 +0000 |
| commit | 6e022db16c0fd89d20a8f4891d9c8ac238fc9c30 (patch) | |
| tree | 05cec73725b763e68ad01ed213fe4e61a0d30e86 /plugins/irda/packet-sir.c | |
| parent | fb85064c5efefd757d08dac0754bc70ae7c30f9b (diff) | |
| download | wireshark-6e022db16c0fd89d20a8f4891d9c8ac238fc9c30.tar.gz | |
Call the handoff registration routine proto_reg_handoff_irsir() to avoid
collisions with the WSP dissector's proto_reg_handoff_sir() - and don't
call it in the proto_register_irsir(); handoff registration routines are
supposed to be called after *all* registration routines are called.
svn path=/trunk/; revision=20303
Diffstat (limited to 'plugins/irda/packet-sir.c')
| -rw-r--r-- | plugins/irda/packet-sir.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c index dd4df3511b..bdfe36959e 100644 --- a/plugins/irda/packet-sir.c +++ b/plugins/irda/packet-sir.c @@ -173,7 +173,7 @@ dissect_sir( tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) /** Registers this dissector with the parent dissector. */ void -proto_reg_handoff_sir( void) +proto_reg_handoff_irsir( void) { dissector_add( "tcp.port", TCP_PORT_SIR, find_dissector( "sir")); @@ -227,6 +227,4 @@ proto_register_irsir( void) proto_register_subtree_array( ett, array_length( ett)); proto_register_field_array( proto_sir, hf_sir, array_length( hf_sir)); - - proto_reg_handoff_sir(); } |