Have TPKT support a TCP port range preference instead of having "subdissectors?" register their own.

There are a number of dissectors who are subdissectors of TPKT (and OSITP) that are
not called by TCP dissector directly, yet can possibly register a TCP port "on the
behalf" of TPKT.  Just allow TPKT to support a range of ports to possibly include
these protocols.
Remove the preferences from these dissectors, but add backwards compatibility for
the preferences by hooking into set_prefs and have the preferences just hook into
Decode As functionality directly.

Change-Id: Ic1b4959d39607f2b6b20fa6508da8d87d04cf098
Reviewed-on: https://code.wireshark.org/review/17476
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 5 insertions, 32 deletions

diff --git a/epan/dissectors/asn1/dap/packet-dap-template.c b/epan/dissectors/asn1/dap/packet-dap-template.c
index c5592bce1f..5a72d05ea2 100644
--- a/epan/dissectors/asn1/dap/packet-dap-template.c
+++ b/epan/dissectors/asn1/dap/packet-dap-template.c
@@ -53,11 +53,6 @@
 void proto_register_dap(void);
 void proto_reg_handoff_dap(void);
 
-static guint global_dap_tcp_port = 102;
-static dissector_handle_t tpkt_handle;
-static void prefs_register_dap(void); /* forward declaration for use in preferences registration */
-
-
 /* Initialize the protocol and registered fields */
 static int proto_dap = -1;
 
@@ -123,13 +118,13 @@ void proto_register_dap(void) {
 
   /* Register our configuration options for DAP, particularly our port */
 
-  dap_module = prefs_register_protocol_subtree("OSI/X.500", proto_dap, prefs_register_dap);
+  dap_module = prefs_register_protocol_subtree("OSI/X.500", proto_dap, NULL);
 
-  prefs_register_uint_preference(dap_module, "tcp.port", "DAP TCP Port",
-				 "Set the port for DAP operations (if other"
-				 " than the default of 102)",
-				 10, &global_dap_tcp_port);
+  prefs_register_obsolete_preference(dap_module, "tcp.port");
 
+  prefs_register_static_text_preference(dap_module, "tcp_port_info",
+            "The TCP ports used by the DAP protocol should be added to the TPKT preference \"TPKT TCP ports\", or the IDMP preference \"IDMP TCP Port\", or by selecting \"TPKT\" as the \"Transport\" protocol in the \"Decode As\" dialog.",
+            "DAP TCP Port preference moved information");
 }
 
 
@@ -149,9 +144,6 @@ void proto_reg_handoff_dap(void) {
 
   register_idmp_protocol_info("2.5.33.0", &dap_ros_info, 0, "dap-ip");
 
-  /* remember the tpkt handler for change in preferences */
-  tpkt_handle = find_dissector("tpkt");
-
   /* AttributeValueAssertions */
   x509if_register_fmt(hf_dap_equality, "=");
   x509if_register_fmt(hf_dap_greaterOrEqual, ">=");
@@ -161,22 +153,3 @@ void proto_reg_handoff_dap(void) {
   x509if_register_fmt(hf_dap_present, "= *");
 
 }
-
-
-static void
-prefs_register_dap(void)
-{
-  static guint tcp_port = 0;
-
-  /* de-register the old port */
-  /* port 102 is registered by TPKT - don't undo this! */
-  if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
-
-  /* Set our port number for future use */
-  tcp_port = global_dap_tcp_port;
-
-  if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add_uint("tcp.port", global_dap_tcp_port, tpkt_handle);
-
-}