aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-etch.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-etch.c')
-rw-r--r--epan/dissectors/packet-etch.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c
index 76c380b83c..148d828ab8 100644
--- a/epan/dissectors/packet-etch.c
+++ b/epan/dissectors/packet-etch.c
@@ -136,7 +136,6 @@ static dissector_handle_t etch_handle;
*/
static const char *gbl_keytab_folder = "";
-static guint gbl_etch_port = 0;
static char *gbl_current_keytab_folder = NULL;
static int gbl_pdu_counter;
@@ -946,8 +945,7 @@ void proto_register_etch(void)
register_init_routine(&etch_dissector_init);
- etch_module = prefs_register_protocol(proto_etch,
- proto_reg_handoff_etch);
+ etch_module = prefs_register_protocol(proto_etch, proto_reg_handoff_etch);
prefs_register_directory_preference(etch_module, "file",
"Apache Etch symbol folder",
@@ -955,34 +953,21 @@ void proto_register_etch(void)
"(generated by the Apache Etch compiler) "
"ending with .ewh here",
&gbl_keytab_folder);
- prefs_register_uint_preference(etch_module, "tcp.port",
- "Etch TCP Port",
- "Etch TCP port",
- 10,
- &gbl_etch_port);
}
void proto_reg_handoff_etch(void)
{
static gboolean etch_prefs_initialized = FALSE;
- static guint old_etch_port = 0;
/* create dissector handle only once */
if(!etch_prefs_initialized) {
/* add heuristic dissector for tcp */
heur_dissector_add("tcp", dissect_etch, "Etch over TCP", "etch_tcp", proto_etch, HEURISTIC_ENABLE);
+ dissector_add_for_decode_as_with_preference("tcp.port", etch_handle);
etch_prefs_initialized = TRUE;
}
- if(old_etch_port != 0 && old_etch_port != gbl_etch_port){
- dissector_delete_uint("tcp.port", old_etch_port, etch_handle);
- }
-
- if(gbl_etch_port != 0 && old_etch_port != gbl_etch_port) {
- dissector_add_uint("tcp.port", gbl_etch_port, etch_handle);
- }
- old_etch_port = gbl_etch_port;
/* read config folder files, if filename has changed
* (while protecting strcmp() from NULLs)