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/p7/packet-p7-template.c b/epan/dissectors/asn1/p7/packet-p7-template.c
index 1f56222713..97deaad962 100644
--- a/epan/dissectors/asn1/p7/packet-p7-template.c
+++ b/epan/dissectors/asn1/p7/packet-p7-template.c
@@ -44,13 +44,8 @@
 void proto_register_p7(void);
 void proto_reg_handoff_p7(void);
 
-static guint global_p7_tcp_port = 102;
-static dissector_handle_t tpkt_handle;
 static int seqno = 0;
 
-static void prefs_register_p7(void); /* forward declaration for use in preferences registration */
-
-
 /* Initialize the protocol and registered fields */
 static int proto_p7 = -1;
 
@@ -105,13 +100,13 @@ void proto_register_p7(void) {
 
   /* Register our configuration options for P7, particularly our port */
 
-  p7_module = prefs_register_protocol_subtree("OSI/X.400", proto_p7, prefs_register_p7);
+  p7_module = prefs_register_protocol_subtree("OSI/X.400", proto_p7, NULL);
 
-  prefs_register_uint_preference(p7_module, "tcp.port", "P7 TCP Port",
-				 "Set the port for P7 operations (if other"
-				 " than the default of 102)",
-				 10, &global_p7_tcp_port);
+  prefs_register_obsolete_preference(p7_module, "tcp.port");
 
+  prefs_register_static_text_preference(p7_module, "tcp_port_info",
+            "The TCP ports used by the P7 protocol should be added to the TPKT preference \"TPKT TCP ports\", or by selecting \"TPKT\" as the \"Transport\" protocol in the \"Decode As\" dialog.",
+            "P7 TCP Port preference moved information");
 }
 
 
@@ -131,26 +126,4 @@ void proto_reg_handoff_p7(void) {
   register_ros_protocol_info("2.6.0.2.9", &p7_ros_info, 0, "id-as-ms", FALSE);
   register_ros_protocol_info("2.6.0.2.5", &p7_ros_info, 0, "id-as-mrse", FALSE);
   register_ros_protocol_info("2.6.0.2.1", &p7_ros_info, 0, "id-as-msse", FALSE);
-
-  /* remember the tpkt handler for change in preferences */
-  tpkt_handle = find_dissector("tpkt");
-}
-
-
-static void
-prefs_register_p7(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_p7_tcp_port;
-
-  if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add_uint("tcp.port", global_p7_tcp_port, tpkt_handle);
-
 }