guids are not olnly used in dcerpc interfaces and they often occur in many other protocols such as ldap and smb/smb2

move the initialization of the guid mapping table from the dcerpc dissector to a more neutral place


svn path=/trunk/; revision=18947

3 files changed, 6 insertions, 3 deletions

diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 0fd7068351..d590cf2ad2 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -5343,9 +5343,6 @@ proto_register_dcerpc (void)
     dcerpc_tap=register_tap("dcerpc");
 
     g_hook_list_init(&dcerpc_hooks_init_protos, sizeof(GHook));
-
-    /* XXX - might better be located in a more general place than this */
-    guids_init();
 }
 
 void
diff --git a/gtk/main.c b/gtk/main.c
index 4f63e8b5db..2720b525c1 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -2037,6 +2037,9 @@ main(int argc, char *argv[])
   ep_init_chunk();
   se_init_chunk();
 
+  /* initialize the GUID to name mapping table */
+  guids_init();
+
   /* initialize the funnel mini-api */
   initialize_funnel_ops();
 
diff --git a/tshark.c b/tshark.c
index 964b4662dd..0973870fee 100644
--- a/tshark.c
+++ b/tshark.c
@@ -743,6 +743,9 @@ main(int argc, char *argv[])
   ep_init_chunk();
   se_init_chunk();
   
+  /* initialize the GUID to name mapping table */
+  guids_init();
+
   initialize_funnel_ops();
   
 #ifdef HAVE_LIBPCAP