aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-giop.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2006-04-18 10:04:18 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2006-04-18 10:04:18 +0000
commit96d739b7908fe01eaa840e90f652bb8175294411 (patch)
tree05746bf9b9376bbeae806226dc57efa54022066f /epan/dissectors/packet-giop.c
parent86c099eb36b4cd9ab854f758780bd1078390dae0 (diff)
From W. Borgert:
Currently, the filename IOR.txt is hardcoded into ethereal. The patch allows the user to change it. Thanks for applying! svn path=/trunk/; revision=17894
Diffstat (limited to 'epan/dissectors/packet-giop.c')
-rw-r--r--epan/dissectors/packet-giop.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index e89631c308..8e6cbc2cad 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -790,6 +790,7 @@ GHashTable *giop_objkey_hash = NULL; /* hash */
gboolean giop_desegment = TRUE;
+static const char *giop_ior_file = "IOR.txt";
/*
* ------------------------------------------------------------------------------------------+
@@ -1391,7 +1392,7 @@ static void giop_init(void) {
giop_complete_reply_hash = g_hash_table_new(complete_reply_hash_fn, complete_reply_equal_fn);
- read_IOR_strings_from_file("IOR.txt", 600); /* testing */
+ read_IOR_strings_from_file(giop_ior_file, 600);
}
@@ -4312,6 +4313,8 @@ proto_register_giop (void)
"Whether the GIOP dissector should reassemble messages spanning multiple TCP segments."
" To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
&giop_desegment);
+ prefs_register_string_preference(giop_module, "ior_txt", "Stringified IORs",
+ "File containing stringified IORs, one per line.", &giop_ior_file);
/*
* Init the giop user module hash tables here, as giop users