aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2009-08-02 19:54:33 +0000
committerBill Meier <wmeier@newsguy.com>2009-08-02 19:54:33 +0000
commit2602c42fcba90d8e0a430015134031af99b2bdde (patch)
treedcfe107c589a6986f884d6b431bc7de2ee022274
parent3a61b43a42dd93a3270bdf83490be90fa2128638 (diff)
Do dissector_add() only if port non-zero; register dissector for "decode-as".
svn path=/trunk/; revision=29268
-rw-r--r--epan/dissectors/packet-simulcrypt.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c
index 7db0b9c898..48123ef81f 100644
--- a/epan/dissectors/packet-simulcrypt.c
+++ b/epan/dissectors/packet-simulcrypt.c
@@ -1066,14 +1066,20 @@ void proto_reg_handoff_simulcrypt(void)
{
tab_ecm_inter[i].protocol_handle = find_dissector(tab_ecm_inter[i].protocol_name);
}
+ dissector_add_handle("tcp.port", simulcrypt_handle); /* for "decode_as" */
+ dissector_add_handle("udp.port", simulcrypt_handle); /* for "decode_as" */
initialized = TRUE;
}
else {
dissector_delete("tcp.port", tcp_port, simulcrypt_handle);
dissector_delete("udp.port", udp_port, simulcrypt_handle);
}
- dissector_add("tcp.port", global_simulcrypt_tcp_port, simulcrypt_handle);
- dissector_add("udp.port", global_simulcrypt_udp_port, simulcrypt_handle);
+ if (global_simulcrypt_tcp_port != 0) {
+ dissector_add("tcp.port", global_simulcrypt_tcp_port, simulcrypt_handle);
+ }
+ if (global_simulcrypt_udp_port != 0) {
+ dissector_add("udp.port", global_simulcrypt_udp_port, simulcrypt_handle);
+ }
tcp_port = global_simulcrypt_tcp_port;
udp_port = global_simulcrypt_udp_port;