Combine Decode As and port preferences for tcp.port dissector table.

This patch introduces new APIs to allow dissectors to have a preference for
a (TCP) port, but the underlying data is actually part of Decode As functionality.
For now the APIs are intentionally separate from the regular APIs that register a
dissector within a dissector table.  It may be possible to eventually combine the
two so that all dissectors that register with a dissector table have an opportunity
to "automatically" have a preference to adjust the "table value" through the
preferences dialog.

The tcp.port dissector table was used as the guinea pig.  This will eventually be
expanded to other dissector tables as well (most notably UDP ports).  Some
dissectors that "shared" a TCP/UDP port preference were also converted. It also
removed the need for some preference callback functions (mostly when the callback
function was the proto_reg_handoff function) so there is cleanup around that.

Dissectors that has a port preference whose default was 0 were switched to using
the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference

Also added comments for TCP ports used that aren't IANA registered.

Change-Id: I99604f95d426ad345f4b494598d94178b886eb67
Reviewed-on: https://code.wireshark.org/review/17724
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 2 insertions, 9 deletions

diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c
index 07f6a58dc4..a581bfaf82 100644
--- a/epan/dissectors/packet-synphasor.c
+++ b/epan/dissectors/packet-synphasor.c
@@ -48,7 +48,7 @@ void proto_reg_handoff_synphasor(void);
 static int proto_synphasor	 = -1;
 
 /* user preferences */
-static guint global_pref_tcp_port = 4712;
+#define SYNPHASOR_TCP_PORT  4712 /* Not IANA registered */
 static guint global_pref_udp_port = 4713;
 
 /* the ett... variables hold the state (open/close) of the treeview in the GUI */
@@ -1372,10 +1372,6 @@ void proto_register_synphasor(void)
 				       "Set the port number for synchrophasor frames over UDP" \
 				       "(if other than the default of 4713)",
 				       10, &global_pref_udp_port);
-	prefs_register_uint_preference(synphasor_module, "tcp_port", "Synchrophasor TCP port",
-				       "Set the port number for synchrophasor frames over TCP" \
-				       "(if other than the default of 4712)",
-				       10, &global_pref_tcp_port);
 
 } /* proto_register_synphasor() */
 
@@ -1385,24 +1381,21 @@ void proto_reg_handoff_synphasor(void)
 	static gboolean		  initialized = FALSE;
 	static dissector_handle_t synphasor_tcp_handle;
 	static guint		  current_udp_port;
-	static guint		  current_tcp_port;
 
 	if (!initialized) {
 		synphasor_tcp_handle = create_dissector_handle(dissect_tcp, proto_synphasor);
 		dissector_add_for_decode_as("rtacser.data", synphasor_udp_handle);
+		dissector_add_uint_with_preference("tcp.port", SYNPHASOR_TCP_PORT, synphasor_tcp_handle);
 		initialized = TRUE;
 	}
 	else {
 		/* update preferences */
 		dissector_delete_uint("udp.port", current_udp_port, synphasor_udp_handle);
-		dissector_delete_uint("tcp.port", current_tcp_port, synphasor_tcp_handle);
 	}
 
 	current_udp_port = global_pref_udp_port;
-	current_tcp_port = global_pref_tcp_port;
 
 	dissector_add_uint("udp.port", current_udp_port, synphasor_udp_handle);
-	dissector_add_uint("tcp.port", current_tcp_port, synphasor_tcp_handle);
 } /* proto_reg_handoff_synphasor() */
 
 /*