aboutsummaryrefslogtreecommitdiffstats
path: root/ui/preference_utils.h
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-10-07 16:25:01 -0400
committerMichael Mann <mmann78@netscape.net>2016-10-08 02:44:53 +0000
commit268841f3e00b7cf0f16c81dd2b3b952172130b8b (patch)
tree359e01cf5eba83308760531888713fe0ff0bc10b /ui/preference_utils.h
parent11d3224142c0531879fb8e415daf9639a4eace66 (diff)
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>
Diffstat (limited to 'ui/preference_utils.h')
-rw-r--r--ui/preference_utils.h18
1 files changed, 14 insertions, 4 deletions
diff --git a/ui/preference_utils.h b/ui/preference_utils.h
index e31db19fcc..a6f7d740b9 100644
--- a/ui/preference_utils.h
+++ b/ui/preference_utils.h
@@ -40,16 +40,26 @@ extern "C" {
*/
extern guint pref_stash(pref_t *pref, gpointer unused _U_);
-/** "Untash" a preference.
+typedef struct pref_unstash_data
+{
+ /* Used to set prefs_changed member to TRUE if the preference
+ differs from its stashed values. Also used by "decode as" types
+ to look up dissector short name */
+ module_t *module;
+ /* Qt uses stashed values to then "applies" them
+ during unstash. Use this flag for that behavior */
+ gboolean handle_decode_as;
+} pref_unstash_data_t;
+
+/** "Unstash" a preference.
* Set a preference to its stashed value. Can be called from prefs_pref_foreach().
*
* @param pref A preference.
- * @param changed_p A pointer to a gboolean. Set to TRUE if the preference differs
- * from its stashed value.
+ * @param unstash_data_p A pointer to a pref_unstash_data_t structure.
*
* @return Always returns 0.
*/
-extern guint pref_unstash(pref_t *pref, gpointer changed_p);
+extern guint pref_unstash(pref_t *pref, gpointer unstash_data_p);
/** Clean up a stashed preference.
* Can be called from prefs_pref_foreach().