aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ositp.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2009-01-28 21:52:57 +0000
committerBill Meier <wmeier@newsguy.com>2009-01-28 21:52:57 +0000
commit0e1613fbe598912370b0b57b0fec0e8bbc33a04a (patch)
treed9f7c69a0c0818a539cd0a3ff9d6e7768a5f13fb /epan/dissectors/packet-ositp.c
parent3c11319ea43806d417003c7b2fd825e6b3759c67 (diff)
Minor changes mostly related to proto_register & proto_reg_handoff;
- Use 'dissector standard template format' - Remove 'once-only' ["if (!initialized) ..."] if not req'd - Misc Also: adjust some indentation svn path=/trunk/; revision=27324
Diffstat (limited to 'epan/dissectors/packet-ositp.c')
-rw-r--r--epan/dissectors/packet-ositp.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c
index 3d818dfeb2..7ccbfc240b 100644
--- a/epan/dissectors/packet-ositp.c
+++ b/epan/dissectors/packet-ositp.c
@@ -1826,7 +1826,7 @@ void proto_register_cotp(void)
prefs_register_bool_preference(cotp_module, "reassemble",
"Reassemble segmented COTP datagrams",
"Whether segmented COTP datagrams should be reassembled."
- " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
+ " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
&cotp_reassemble);
prefs_register_enum_preference(cotp_module, "tsap_display",
@@ -1849,19 +1849,6 @@ void proto_register_cotp(void)
register_init_routine(cotp_reassemble_init);
}
-void
-proto_reg_handoff_cotp(void)
-{
- dissector_handle_t ositp_handle;
-
- ositp_handle = find_dissector("ositp");
- dissector_add("ip.proto", IP_PROTO_TP, ositp_handle);
-
- data_handle = find_dissector("data");
-
- proto_clnp = proto_get_id_by_filter_name("clnp");
-}
-
void proto_register_cltp(void)
{
static hf_register_info hf[] = {
@@ -1880,3 +1867,17 @@ void proto_register_cltp(void)
proto_register_field_array(proto_cltp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_cotp(void)
+{
+ dissector_handle_t ositp_handle;
+
+ ositp_handle = find_dissector("ositp");
+ dissector_add("ip.proto", IP_PROTO_TP, ositp_handle);
+
+ data_handle = find_dissector("data");
+
+ proto_clnp = proto_get_id_by_filter_name("clnp");
+}
+