Fix Missing -z proto,colinfo,ip,gtp.teid_cp and -z proto,colinfo,ip,gtp.teid_data
[obnox/wireshark/wip.git] / epan / plugins.c
index 9d2ef4b63ac1ff6a02eba49e81eb02a628171d7f..68031b5be2a285cdd76726cf933d2779369863a5 100644 (file)
@@ -1,10 +1,10 @@
 /* plugins.c
  * plugin routines
  *
- * $Id: plugins.c,v 1.73 2003/06/12 10:10:39 guy Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1999 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
 # include "config.h"
 #endif
 
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
 #include "plugins.h"
 
 #ifdef HAVE_PLUGINS
 #include <stdlib.h>
 #include <errno.h>
 
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
 #include "filesystem.h"
-
-#ifdef PLUGINS_NEED_ADDRESS_TABLE
-#include "conversation.h"
-#include "reassemble.h"
-#include "prefs.h"
-#include "packet-giop.h"
-#include "packet-tpkt.h"
-#include "packet-tcp.h"
-#include "tap.h"
-#include "asn1.h"
-#include "plugins/plugin_table.h"
-static plugin_address_table_t  patable;
-#endif
+#include "privileges.h"
+#include <wiretap/file_util.h>
+#include "report_err.h"
 
 /* linked list of all plugins */
 plugin *plugin_list;
 
-static gchar *user_plug_dir = NULL;
-
 #define PLUGINS_DIR_NAME       "plugins"
 
 /*
@@ -87,7 +67,10 @@ static gchar *user_plug_dir = NULL;
  */
 static int
 add_plugin(void *handle, gchar *name, gchar *version,
-          void (*reg_handoff)(void))
+          void (*register_protoinfo)(void), void (*reg_handoff)(void),
+          void (*register_tap_listener)(void),
+          void (*register_wtap_module)(void),
+          void (*register_codec_module)(void))
 {
     plugin *new_plug, *pt_plug;
 
@@ -122,8 +105,13 @@ add_plugin(void *handle, gchar *name, gchar *version,
     new_plug->handle = handle;
     new_plug->name = name;
     new_plug->version = version;
+    new_plug->register_protoinfo = register_protoinfo;
     new_plug->reg_handoff = reg_handoff;
+    new_plug->register_tap_listener = register_tap_listener;
+    new_plug->register_wtap_module = register_wtap_module;
+    new_plug->register_codec_module = register_codec_module;
     new_plug->next = NULL;
+
     return 0;
 }
 
@@ -144,22 +132,23 @@ static void
 plugins_scan_dir(const char *dirname)
 {
 #define FILENAME_LEN   1024
+    ETH_DIR       *dir;             /* scanned directory */
+    ETH_DIRENT    *file;            /* current file */
+    const char    *name;
 #if GLIB_MAJOR_VERSION < 2
     gchar         *hack_path;       /* pathname used to construct lt_lib_ext */
     gchar         *lt_lib_ext;      /* extension for loadable modules */
-    DIR           *dir;             /* scanned directory */
-    struct dirent *file;            /* current file */
-    gchar         *name;
-#else /* GLIB 2 */
-    GDir          *dir;             /* scanned directory */
-    GError        **dummy;
-    const gchar   *name;
 #endif
     gchar          filename[FILENAME_LEN];   /* current file name */
     GModule       *handle;          /* handle returned by dlopen */
     gchar         *version;
-    void         (*init)(void *);
+    gpointer       gp;
+    void         (*register_protoinfo)(void);
     void         (*reg_handoff)(void);
+    void         (*register_tap_listener)(void);
+    void (*register_wtap_module)(void);
+    void (*register_codec_module)(void);
+
     gchar         *dot;
     int            cr;
 
@@ -183,465 +172,370 @@ plugins_scan_dir(const char *dirname)
         */
        lt_lib_ext = "";
     }
+#endif
 
-    if ((dir = opendir(dirname)) != NULL)
+    if ((dir = eth_dir_open(dirname, 0, NULL)) != NULL)
     {
-       while ((file = readdir(dir)) != NULL)
+
+    while ((file = eth_dir_read_name(dir)) != NULL)
        {
+           name = eth_dir_get_name(file);
+
+#if GLIB_MAJOR_VERSION < 2
            /* don't try to open "." and ".." */
-           if (!(strcmp(file->d_name, "..") &&
-                 strcmp(file->d_name, "."))) continue;
+           if (!(strcmp(name, "..") &&
+                 strcmp(name, ".")))
+               continue;
 
             /* skip anything but files with lt_lib_ext */
-            dot = strrchr(file->d_name, '.');
-            if (dot == NULL || strcmp(dot, lt_lib_ext) != 0) continue;
+            dot = strrchr(name, '.');
+            if (dot == NULL || strcmp(dot, lt_lib_ext) != 0)
+               continue;
 
-           snprintf(filename, FILENAME_LEN, "%s" G_DIR_SEPARATOR_S "%s",
-               dirname, file->d_name);
-           name = (gchar *)file->d_name;
 #else /* GLIB 2 */
-    /*
-     * GLib 2.x defines G_MODULE_SUFFIX as the extension used on this
-     * platform for loadable modules.
-     */
-    dummy = g_malloc(sizeof(GError *));
-    *dummy = NULL;
-    if ((dir = g_dir_open(dirname, 0, dummy)) != NULL)
-    {
-       while ((name = g_dir_read_name(dir)) != NULL)
-       {
+           /*
+            * GLib 2.x defines G_MODULE_SUFFIX as the extension used on
+            * this platform for loadable modules.
+            */
            /* skip anything but files with G_MODULE_SUFFIX */
             dot = strrchr(name, '.');
-            if (dot == NULL || strcmp(dot+1, G_MODULE_SUFFIX) != 0) continue;
+            if (dot == NULL || strcmp(dot+1, G_MODULE_SUFFIX) != 0)
+               continue;
 
-           snprintf(filename, FILENAME_LEN, "%s" G_DIR_SEPARATOR_S "%s",
-               dirname, name);
 #endif
+           g_snprintf(filename, FILENAME_LEN, "%s" G_DIR_SEPARATOR_S "%s",
+               dirname, name);
            if ((handle = g_module_open(filename, 0)) == NULL)
            {
-               g_warning("Couldn't load module %s: %s", filename,
+               report_failure("Couldn't load module %s: %s", filename,
                          g_module_error());
                continue;
            }
-           if (g_module_symbol(handle, "version", (gpointer*)&version) == FALSE)
+
+           if (!g_module_symbol(handle, "version", &gp))
            {
-               g_warning("The plugin %s has no version symbol", name);
+               report_failure("The plugin %s has no version symbol", name);
                g_module_close(handle);
                continue;
            }
-
+           version = gp;
+           
            /*
-            * Old-style dissectors don't have a "plugin_reg_handoff()"
-            * routine; we no longer support them.
-            *
-            * New-style dissectors have one, because, otherwise, there's
-            * no way for them to arrange that they ever be called.
+            * Do we have a register routine?
             */
-           if (g_module_symbol(handle, "plugin_reg_handoff",
-                                        (gpointer*)&reg_handoff))
+           if (g_module_symbol(handle, "plugin_register", &gp))
            {
                /*
-                * We require it to have a "plugin_init()" routine.
+                * Yes - this plugin includes one or more dissectors.
                 */
-               if (!g_module_symbol(handle, "plugin_init", (gpointer*)&init))
-               {
-                   g_warning("The plugin %s has a plugin_reg_handoff symbol but no plugin_init routine",
-                             name);
-                   g_module_close(handle);
-                   continue;
-               }
+               register_protoinfo = gp;
+           }
+           else
+           {
+               /*
+                * No - no dissectors.
+                */
+               register_protoinfo = NULL;
+           }
 
+           /*
+            * Do we have a reg_handoff routine?
+            */
+           if (g_module_symbol(handle, "plugin_reg_handoff", &gp))
+           {
                /*
-                * We have a "plugin_reg_handoff()" routine, so we don't
-                * need the protocol, filter string, or dissector pointer.
+                * Yes.
                 */
-               if ((cr = add_plugin(handle, g_strdup(name), version,
-                                    reg_handoff)))
-               {
-                   if (cr == EEXIST)
-                       fprintf(stderr, "The plugin %s, version %s\n"
-                           "was found in multiple directories\n", name, version);
-                   else
-                       fprintf(stderr, "Memory allocation problem\n"
-                           "when processing plugin %s, version %s\n",
-                           name, version);
-                   g_module_close(handle);
-                   continue;
-               }
+               reg_handoff = gp;
+           }
+           else
+           {
+               /*
+                * No - that's OK even if we have dissectors, as long
+                * as the plugin registers by name *and* there's
+                * a caller looking for that name.
+                */
+               reg_handoff = NULL;
+           }
 
+           /*
+            * Do we have a register_tap_listener routine?
+            */
+           if (g_module_symbol(handle, "plugin_register_tap_listener", &gp))
+           {
                /*
-                * Call its init routine.
+                * Yes - this plugin includes one or more taps.
                 */
-#ifdef PLUGINS_NEED_ADDRESS_TABLE
-               init(&patable);
-#else
-               init(NULL);
-#endif
+               register_tap_listener = gp;
            }
            else
            {
                /*
-                * This is an old-style dissector; warn that it won't
-                * be used, as those aren't supported.
+                * No - no taps here.
                 */
-               fprintf(stderr,
-                   "The plugin %s, version %s is an old-style plugin;\n"
-                   "Those are no longer supported.\n", name, version);
+               register_tap_listener = NULL;
+           }
+
+               /*
+            * Do we have an old-style init routine?
+            */
+           if (g_module_symbol(handle, "plugin_init", &gp))
+           {
+                       /*
+                        * Yes - do we also have a register routine or a
+                        * register_tap_listener routine?  If so, this is a bogus
+                        * hybrid of an old-style and new-style plugin.
+                        */
+                       if (register_protoinfo != NULL || register_tap_listener != NULL)
+                       {
+                               report_failure("The plugin '%s' has an old plugin init routine\nand a new register or register_tap_listener routine.",
+                               name);
+                               g_module_close(handle);
+                               continue;
+                       }
+
+                       /*
+                        * It's just an unsupported old-style plugin;
+                        */
+                       report_failure("The plugin '%s' has an old plugin init routine. Support has been dropped.\n Information on how to update your plugin is available at \nhttp://anonsvn.wireshark.org/wireshark/trunk/doc/README.plugins",
+                               name);
+                       g_module_close(handle);
+                       continue;
+           }
+           
+           /*
+                * Do we have a register_wtap_module routine?
+                */
+           if (g_module_symbol(handle, "register_wtap_module", &gp))
+           {
+               register_wtap_module = gp;
+           } else {
+               register_wtap_module = NULL;
+           }
+           
+           /*
+                * Do we have a register_codec_module routine?
+                */
+           if (g_module_symbol(handle, "register_codec_module", &gp))
+           {
+               register_codec_module = gp;
+           } else {
+               register_codec_module = NULL;
+           }
+
+          /*
+               * Does this dissector do anything useful?
+               */
+           if (register_protoinfo == NULL &&
+                   register_tap_listener == NULL && 
+                   register_wtap_module == NULL &&
+                   register_codec_module == NULL )
+           {
+               /*
+                * No.
+                */
+               report_failure("The plugin '%s' has neither a register routine, "
+                                          "a register_tap_listener or a register_wtap_module or a register_codec_module routine",
+                   name);
+               g_module_close(handle);
+               continue;
+           }
+
+           /*
+            * OK, attempt to add it to the list of plugins.
+            */
+           if ((cr = add_plugin(handle, g_strdup(name), version,
+                                register_protoinfo, reg_handoff,
+                                register_tap_listener,register_wtap_module,register_codec_module)))
+           {
+               if (cr == EEXIST)
+                   fprintf(stderr, "The plugin %s, version %s\n"
+                           "was found in multiple directories\n", name, version);
+               else
+                   fprintf(stderr, "Memory allocation problem\n"
+                           "when processing plugin %s, version %s\n",
+                           name, version);
+               g_module_close(handle);
+               continue;
            }
+               
+       }
+       eth_dir_close(dir);
        }
 #if GLIB_MAJOR_VERSION < 2
-       closedir(dir);
-    }
     g_free(hack_path);
-#else /* GLIB 2 */
-       g_dir_close(dir);
-    }
-    g_clear_error(dummy);
-    g_free(dummy);
 #endif
 }
 
+/* get the personal plugin dir */
+/* Return value is malloced so the caller should g_free() it. */
+char *get_plugins_pers_dir(void)
+{
+    return get_persconffile_path(PLUGINS_DIR_NAME, FALSE);
+}
+
 /*
  * init plugins
  */
 void
-init_plugins(const char *plugin_dir)
+init_plugins(void)
 {
-#ifdef WIN32
-    const char *datafile_dir;
-    char *install_plugin_dir;
-#endif
+    const char *plugin_dir;
+    const char *name;
+    char *plugin_dir_path;
+    char *plugins_pers_dir;
+    ETH_DIR *dir;              /* scanned directory */
+    ETH_DIRENT *file;          /* current file */
 
     if (plugin_list == NULL)      /* ensure init_plugins is only run once */
     {
-#ifdef PLUGINS_NEED_ADDRESS_TABLE
-       /* Intialize address table */
-       patable.p_check_col                     = check_col;
-       patable.p_col_clear                     = col_clear;
-       patable.p_col_add_fstr                  = col_add_fstr;
-       patable.p_col_append_fstr               = col_append_fstr;
-       patable.p_col_prepend_fstr              = col_prepend_fstr;
-       patable.p_col_add_str                   = col_add_str;
-       patable.p_col_append_str                = col_append_str;
-       patable.p_col_set_str                   = col_set_str;
-
-       patable.p_register_init_routine         = register_init_routine;
-       patable.p_register_postseq_cleanup_routine      = register_postseq_cleanup_routine;
-
-       patable.p_match_strval                  = match_strval;
-       patable.p_val_to_str                    = val_to_str;
-
-       patable.p_conversation_new              = conversation_new;
-       patable.p_find_conversation             = find_conversation;
-       patable.p_conversation_set_dissector    = conversation_set_dissector;
-
-       patable.p_proto_register_protocol       = proto_register_protocol;
-       patable.p_proto_register_field_array    = proto_register_field_array;
-       patable.p_proto_register_subtree_array  = proto_register_subtree_array;
-
-       patable.p_dissector_add                 = dissector_add;
-       patable.p_dissector_delete              = dissector_delete;
-       patable.p_dissector_add_handle          = dissector_add_handle;
-
-       patable.p_heur_dissector_add            = heur_dissector_add;
-
-       patable.p_register_dissector            = register_dissector;
-       patable.p_find_dissector                = find_dissector;
-       patable.p_create_dissector_handle       = create_dissector_handle;
-       patable.p_call_dissector                = call_dissector;
-
-       patable.p_tcp_dissect_pdus              = tcp_dissect_pdus;
-
-       patable.p_proto_is_protocol_enabled     = proto_is_protocol_enabled;
-
-       patable.p_proto_item_get_len            = proto_item_get_len;
-       patable.p_proto_item_set_len            = proto_item_set_len;
-       patable.p_proto_item_set_text           = proto_item_set_text;
-       patable.p_proto_item_append_text        = proto_item_append_text;
-       patable.p_proto_item_add_subtree        = proto_item_add_subtree;
-       patable.p_proto_tree_add_item           = proto_tree_add_item;
-       patable.p_proto_tree_add_item_hidden    = proto_tree_add_item_hidden;
-       patable.p_proto_tree_add_protocol_format = proto_tree_add_protocol_format;
-       patable.p_proto_tree_add_bytes          = proto_tree_add_bytes;
-       patable.p_proto_tree_add_bytes_hidden   = proto_tree_add_bytes_hidden;
-       patable.p_proto_tree_add_bytes_format   = proto_tree_add_bytes_format;
-       patable.p_proto_tree_add_time           = proto_tree_add_time;
-       patable.p_proto_tree_add_time_hidden    = proto_tree_add_time_hidden;
-       patable.p_proto_tree_add_time_format    = proto_tree_add_time_format;
-       patable.p_proto_tree_add_ipxnet         = proto_tree_add_ipxnet;
-       patable.p_proto_tree_add_ipxnet_hidden  = proto_tree_add_ipxnet_hidden;
-       patable.p_proto_tree_add_ipxnet_format  = proto_tree_add_ipxnet_format;
-       patable.p_proto_tree_add_ipv4           = proto_tree_add_ipv4;
-       patable.p_proto_tree_add_ipv4_hidden    = proto_tree_add_ipv4_hidden;
-       patable.p_proto_tree_add_ipv4_format    = proto_tree_add_ipv4_format;
-       patable.p_proto_tree_add_ipv6           = proto_tree_add_ipv6;
-       patable.p_proto_tree_add_ipv6_hidden    = proto_tree_add_ipv6_hidden;
-       patable.p_proto_tree_add_ipv6_format    = proto_tree_add_ipv6_format;
-       patable.p_proto_tree_add_ether          = proto_tree_add_ether;
-       patable.p_proto_tree_add_ether_hidden   = proto_tree_add_ether_hidden;
-       patable.p_proto_tree_add_ether_format   = proto_tree_add_ether_format;
-       patable.p_proto_tree_add_string         = proto_tree_add_string;
-       patable.p_proto_tree_add_string_hidden  = proto_tree_add_string_hidden;
-       patable.p_proto_tree_add_string_format  = proto_tree_add_string_format;
-       patable.p_proto_tree_add_boolean        = proto_tree_add_boolean;
-       patable.p_proto_tree_add_boolean_hidden = proto_tree_add_boolean_hidden;
-       patable.p_proto_tree_add_boolean_format = proto_tree_add_boolean_format;
-       patable.p_proto_tree_add_double         = proto_tree_add_double;
-       patable.p_proto_tree_add_double_hidden  = proto_tree_add_double_hidden;
-       patable.p_proto_tree_add_double_format  = proto_tree_add_double_format;
-       patable.p_proto_tree_add_uint           = proto_tree_add_uint;
-       patable.p_proto_tree_add_uint_hidden    = proto_tree_add_uint_hidden;
-       patable.p_proto_tree_add_uint_format    = proto_tree_add_uint_format;
-       patable.p_proto_tree_add_int            = proto_tree_add_int;
-       patable.p_proto_tree_add_int_hidden     = proto_tree_add_int_hidden;
-       patable.p_proto_tree_add_int_format     = proto_tree_add_int_format;
-       patable.p_proto_tree_add_text           = proto_tree_add_text;
-
-       patable.p_tvb_new_subset                = tvb_new_subset;
-       patable.p_tvb_set_free_cb               = tvb_set_free_cb;
-       patable.p_tvb_set_child_real_data_tvbuff = tvb_set_child_real_data_tvbuff;
-       patable.p_tvb_new_real_data             = tvb_new_real_data;
-
-       patable.p_tvb_length                    = tvb_length;
-       patable.p_tvb_length_remaining          = tvb_length_remaining;
-       patable.p_tvb_bytes_exist               = tvb_bytes_exist;
-       patable.p_tvb_offset_exists             = tvb_offset_exists;
-       patable.p_tvb_reported_length           = tvb_reported_length;
-       patable.p_tvb_reported_length_remaining = tvb_reported_length_remaining;
-
-       patable.p_tvb_get_guint8                = tvb_get_guint8;
-
-       patable.p_tvb_get_ntohs                 = tvb_get_ntohs;
-       patable.p_tvb_get_ntoh24                = tvb_get_ntoh24;
-       patable.p_tvb_get_ntohl                 = tvb_get_ntohl;
-
-       patable.p_tvb_get_letohs                = tvb_get_letohs;
-       patable.p_tvb_get_letoh24               = tvb_get_letoh24;
-       patable.p_tvb_get_letohl                = tvb_get_letohl;
-
-       patable.p_tvb_memcpy                    = tvb_memcpy;
-       patable.p_tvb_memdup                    = tvb_memdup;
-
-       patable.p_tvb_get_ptr                   = tvb_get_ptr;
-
-       patable.p_tvb_find_guint8               = tvb_find_guint8;
-       patable.p_tvb_pbrk_guint8               = tvb_pbrk_guint8;
-
-       patable.p_tvb_strnlen                   = tvb_strnlen;
-
-       patable.p_tvb_format_text               = tvb_format_text;
-
-       patable.p_tvb_get_nstringz              = tvb_get_nstringz;
-       patable.p_tvb_get_nstringz0             = tvb_get_nstringz0;
-
-       patable.p_tvb_find_line_end             = tvb_find_line_end;
-       patable.p_tvb_find_line_end_unquoted    = tvb_find_line_end_unquoted;
-
-       patable.p_tvb_strneql                   = tvb_strneql;
-       patable.p_tvb_strncaseeql               = tvb_strncaseeql;
-
-       patable.p_tvb_bytes_to_str              = tvb_bytes_to_str;
-
-       patable.p_prefs_register_protocol       = prefs_register_protocol;
-       patable.p_prefs_register_uint_preference = prefs_register_uint_preference;
-       patable.p_prefs_register_bool_preference = prefs_register_bool_preference;
-       patable.p_prefs_register_enum_preference = prefs_register_enum_preference;
-       patable.p_prefs_register_string_preference = prefs_register_string_preference;
-
-       patable.p_register_giop_user            = register_giop_user;
-       patable.p_is_big_endian                 = is_big_endian;
-       patable.p_get_CDR_encap_info            = get_CDR_encap_info;
-
-       patable.p_get_CDR_any                   = get_CDR_any;
-       patable.p_get_CDR_boolean               = get_CDR_boolean;
-       patable.p_get_CDR_char                  = get_CDR_char;
-       patable.p_get_CDR_double                = get_CDR_double;
-       patable.p_get_CDR_enum                  = get_CDR_enum;
-       patable.p_get_CDR_fixed                 = get_CDR_fixed;
-       patable.p_get_CDR_float                 = get_CDR_float;
-       patable.p_get_CDR_interface             = get_CDR_interface;
-       patable.p_get_CDR_long                  = get_CDR_long;
-       patable.p_get_CDR_object                = get_CDR_object;
-       patable.p_get_CDR_octet                 = get_CDR_octet;
-       patable.p_get_CDR_octet_seq             = get_CDR_octet_seq;
-       patable.p_get_CDR_short                 = get_CDR_short;
-       patable.p_get_CDR_string                = get_CDR_string;
-       patable.p_get_CDR_typeCode              = get_CDR_typeCode;
-       patable.p_get_CDR_ulong                 = get_CDR_ulong;
-       patable.p_get_CDR_ushort                = get_CDR_ushort;
-       patable.p_get_CDR_wchar                 = get_CDR_wchar;
-       patable.p_get_CDR_wstring               = get_CDR_wstring;
-
-       patable.p_is_tpkt                       = is_tpkt;
-       patable.p_dissect_tpkt_encap            = dissect_tpkt_encap;
-
-       patable.p_set_actual_length             = set_actual_length;
-       patable.p_decode_boolean_bitfield       = decode_boolean_bitfield;
-       patable.p_decode_numeric_bitfield       = decode_numeric_bitfield;
-       patable.p_decode_enumerated_bitfield    = decode_enumerated_bitfield;
-       patable.p_register_dissector_table      = register_dissector_table;
-       patable.p_except_throw                  = except_throw;
-       patable.p_dissector_try_port            = dissector_try_port;
-
-       patable.p_conversation_add_proto_data   = conversation_add_proto_data;
-       patable.p_conversation_get_proto_data   = conversation_get_proto_data;
-       patable.p_conversation_delete_proto_data = conversation_delete_proto_data;
-       patable.p_p_add_proto_data              = p_add_proto_data;
-       patable.p_p_get_proto_data              = p_get_proto_data;
-
-       patable.p_ip_to_str                     = ip_to_str;
-       patable.p_ip6_to_str                    = ip6_to_str;
-       patable.p_time_secs_to_str              = time_secs_to_str;
-       patable.p_time_msecs_to_str             = time_msecs_to_str;
-       patable.p_abs_time_to_str               = abs_time_to_str;
-
-       patable.p_proto_get_id_by_filter_name   = proto_get_id_by_filter_name;
-       patable.p_proto_get_protocol_name       = proto_get_protocol_name;
-       patable.p_proto_get_protocol_short_name = proto_get_protocol_short_name;
-       patable.p_proto_get_protocol_filter_name        = proto_get_protocol_filter_name;
-
-       patable.p_prefs_register_obsolete_preference    = prefs_register_obsolete_preference;
-
-       patable.p_add_new_data_source           = add_new_data_source;
-
-       patable.p_fragment_table_init           = fragment_table_init;
-       patable.p_reassembled_table_init        = reassembled_table_init;
-       patable.p_fragment_add                  = fragment_add;
-       patable.p_fragment_add_seq              = fragment_add_seq;
-       patable.p_fragment_add_seq_check        = fragment_add_seq_check;
-       patable.p_fragment_add_seq_next         = fragment_add_seq_next;
-       patable.p_fragment_get                  = fragment_get;
-       patable.p_fragment_set_tot_len          = fragment_set_tot_len;
-       patable.p_fragment_get_tot_len          = fragment_get_tot_len;
-       patable.p_fragment_set_partial_reassembly       = fragment_set_partial_reassembly;
-       patable.p_fragment_delete               = fragment_delete;
-       patable.p_show_fragment_tree            = show_fragment_tree;
-       patable.p_show_fragment_seq_tree        = show_fragment_seq_tree;
-
-       patable.p_register_tap                  = register_tap;
-       patable.p_tap_queue_packet              = tap_queue_packet;
-
-       patable.p_asn1_open                     = asn1_open;
-       patable.p_asn1_close                    = asn1_close;
-       patable.p_asn1_octet_decode             = asn1_octet_decode;
-       patable.p_asn1_tag_decode               = asn1_tag_decode;
-       patable.p_asn1_id_decode                = asn1_id_decode;
-       patable.p_asn1_length_decode            = asn1_length_decode;
-       patable.p_asn1_header_decode            = asn1_header_decode;
-       patable.p_asn1_eoc                      = asn1_eoc;
-       patable.p_asn1_eoc_decode               = asn1_eoc_decode;
-       patable.p_asn1_null_decode              = asn1_null_decode;
-       patable.p_asn1_bool_decode              = asn1_bool_decode;
-       patable.p_asn1_int32_value_decode       = asn1_int32_value_decode;
-       patable.p_asn1_int32_decode             = asn1_int32_decode;
-       patable.p_asn1_uint32_value_decode      = asn1_uint32_value_decode;
-       patable.p_asn1_uint32_decode            = asn1_uint32_decode;
-       patable.p_asn1_bits_decode              = asn1_bits_decode;
-       patable.p_asn1_string_value_decode      = asn1_string_value_decode;
-       patable.p_asn1_string_decode            = asn1_string_decode;
-       patable.p_asn1_octet_string_decode      = asn1_octet_string_decode;
-       patable.p_asn1_subid_decode             = asn1_subid_decode;
-       patable.p_asn1_oid_value_decode         = asn1_oid_value_decode;
-       patable.p_asn1_oid_decode               = asn1_oid_decode;
-       patable.p_asn1_sequence_decode          = asn1_sequence_decode;
-       patable.p_asn1_err_to_str               = asn1_err_to_str;
-
-       patable.p_proto_item_set_end            = proto_item_set_end;
-       patable.p_proto_tree_add_none_format    = proto_tree_add_none_format;
-
-       patable.p_except_init                   = except_init;
-       patable.p_except_deinit                 = except_deinit;
-       patable.p_except_rethrow                = except_rethrow;
-       patable.p_except_throwd                 = except_throwd;
-       patable.p_except_throwf                 = except_throwf;
-       patable.p_except_unhandled_catcher      = except_unhandled_catcher;
-       patable.p_except_take_data              = except_take_data;
-       patable.p_except_set_allocator          = except_set_allocator;
-       patable.p_except_alloc                  = except_alloc;
-       patable.p_except_free                   = except_free;
-       patable.p_except_pop                    = except_pop;
-       patable.p_except_setup_try              = except_setup_try;
-
-       patable.p_col_set_fence                 = col_set_fence;
-
-       patable.p_tvb_get_string                = tvb_get_string;
-       patable.p_tvb_get_stringz               = tvb_get_stringz;
-#endif
-
-#ifdef WIN32
        /*
-        * On Windows, the data file directory is the installation
-        * directory; the plugins are stored under it.
-        *
-        * Assume we're running the installed version of Ethereal;
-        * on Windows, the data file directory is the directory
-        * in which the Ethereal binary resides.
+        * Scan the global plugin directory.
+        * If we're running from a build directory, scan the subdirectories
+        * of that directory, as the global plugin directory is the
+        * "plugins" directory of the source tree, and the subdirectories
+        * are the source directories for the plugins, with the plugins
+        * built in those subdirectories.
         */
-       datafile_dir = get_datafile_dir();
-       install_plugin_dir = g_malloc(strlen(datafile_dir) + strlen("plugins") +
-           strlen(VERSION) + 3);
-       sprintf(install_plugin_dir, "%s\\plugins\\%s", datafile_dir, VERSION);
+       plugin_dir = get_plugin_dir();
+       if (running_in_build_directory()) {
+           if ((dir = eth_dir_open(plugin_dir, 0, NULL)) != NULL) {
+               while ((file = eth_dir_read_name(dir)) != NULL) {
+                   name = eth_dir_get_name(file);
+                   if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0)
+                       continue;       /* skip "." and ".." */
+                   /*
+                    * Get the full path of a ".libs" subdirectory of that
+                    * directory.
+                    */
+                   plugin_dir_path = g_strdup_printf(
+                       "%s" G_DIR_SEPARATOR_S "%s" G_DIR_SEPARATOR_S ".libs",
+                       plugin_dir, name);
+                   if (test_for_directory(plugin_dir_path) != EISDIR) {
+                       /*
+                        * Either it doesn't refer to a directory or it
+                        * refers to something that doesn't exist.
+                        *
+                        * Assume that means that the plugins are in
+                        * the subdirectory of the plugin directory, not
+                        * a ".libs" subdirectory of that subdirectory.
+                        */
+                       g_free(plugin_dir_path);
+                       plugin_dir_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s",
+                           plugin_dir, name);
+                   }
+                   plugins_scan_dir(plugin_dir_path);
+                   g_free(plugin_dir_path);
+               }
+           }
+       } else
+           plugins_scan_dir(plugin_dir);
 
        /*
-        * Make sure that pathname refers to a directory.
+        * If the program wasn't started with special privileges,
+        * scan the users plugin directory.  (Even if we relinquish
+        * them, plugins aren't safe unless we've *permanently*
+        * relinquished them, and we can't do that in Wireshark as,
+        * if we need privileges to start capturing, we'd need to
+        * reclaim them before each time we start capturing.)
         */
-       if (test_for_directory(install_plugin_dir) != EISDIR) {
-               /*
-                * Either it doesn't refer to a directory or it
-                * refers to something that doesn't exist.
-                *
-                * Assume that means we're running, for example,
-                * a version of Ethereal we've built in a source
-                * directory, and fall back on the default
-                * installation directory, so you can put the plugins
-                * somewhere so they can be used with this version
-                * of Ethereal.
-                *
-                * XXX - should we, instead, have the Windows build
-                * procedure create a subdirectory of the "plugins"
-                * source directory, and copy the plugin DLLs there,
-                * so that you use the plugins from the build tree?
-                */
-               install_plugin_dir =
-                   g_strdup("C:\\Program Files\\Ethereal\\plugins\\" VERSION);
+       if (!started_with_special_privs()) {
+           plugins_pers_dir = get_plugins_pers_dir();
+           plugins_scan_dir(plugins_pers_dir);
+           g_free(plugins_pers_dir);
        }
+    }
+       register_all_wiretap_modules();
+       register_all_codecs();
+}
 
-       /*
-        * Scan that directory.
-        */
-       plugins_scan_dir(install_plugin_dir);
-       g_free(install_plugin_dir);
-#else
-       /*
-        * Scan the plugin directory.
-        */
-       plugins_scan_dir(plugin_dir);
-#endif
-       if (!user_plug_dir)
-           user_plug_dir = get_persconffile_path(PLUGINS_DIR_NAME, FALSE);
-       plugins_scan_dir(user_plug_dir);
+void
+register_all_plugin_registrations(void)
+{
+    plugin *pt_plug;
+       
+    /*
+     * For all plugins with register-handoff routines, call the routines.
+     * This is called from "proto_init()"; it must be called after
+     * "register_all_protocols()" and "init_plugins()" are called,
+     * in case one plugin registers itself either with a built-in
+     * dissector or with another plugin; we must first register all
+     * dissectors, whether built-in or plugin, so their dissector tables
+     * are initialized, and only then register all handoffs.
+     */
+    for (pt_plug = plugin_list; pt_plug != NULL; pt_plug = pt_plug->next)
+    {
+               if (pt_plug->register_protoinfo)
+                       (pt_plug->register_protoinfo)();
     }
 }
 
 void
 register_all_plugin_handoffs(void)
 {
-  plugin *pt_plug;
-
-  /*
-   * For all new-style plugins, call the register-handoff routine.
-   * This is called from "proto_init()"; it must be called after
-   * "register_all_protocols()" and "init_plugins()" are called,
-   * in case one plugin registers itself either with a built-in
-   * dissector or with another plugin; we must first register all
-   * dissectors, whether built-in or plugin, so their dissector tables
-   * are initialized, and only then register all handoffs.
-   *
-   * We treat those protocols as always being enabled; they should
-   * use the standard mechanism for enabling/disabling protocols, not
-   * the plugin-specific mechanism.
-   */
-  for (pt_plug = plugin_list; pt_plug != NULL; pt_plug = pt_plug->next)
-    (pt_plug->reg_handoff)();
+    plugin *pt_plug;
+
+    /*
+     * For all plugins with register-handoff routines, call the routines.
+     * This is called from "proto_init()"; it must be called after
+     * "register_all_protocols()" and "init_plugins()" are called,
+     * in case one plugin registers itself either with a built-in
+     * dissector or with another plugin; we must first register all
+     * dissectors, whether built-in or plugin, so their dissector tables
+     * are initialized, and only then register all handoffs.
+     */
+    for (pt_plug = plugin_list; pt_plug != NULL; pt_plug = pt_plug->next)
+    {
+       if (pt_plug->reg_handoff)
+           (pt_plug->reg_handoff)();
+    }
+}
+
+void
+register_all_plugin_tap_listeners(void)
+{
+    plugin *pt_plug;
+
+    /*
+     * For all plugins with register-tap-listener routines, call the
+     * routines.
+     */
+    for (pt_plug = plugin_list; pt_plug != NULL; pt_plug = pt_plug->next)
+    {
+       if (pt_plug->register_tap_listener)
+           (pt_plug->register_tap_listener)();
+    }
+}
+
+void
+register_all_wiretap_modules(void)
+{
+    plugin *pt_plug;
+
+    /*
+     * For all plugins with register_wtap_module routines, call the
+     * routines.
+     */
+    for (pt_plug = plugin_list; pt_plug != NULL; pt_plug = pt_plug->next)
+    {
+               if (pt_plug->register_wtap_module)
+                       (pt_plug->register_wtap_module)();
+    }
+}
+
+void
+register_all_codecs(void)
+{
+    plugin *pt_plug;
+
+    /*
+     * For all plugins with register_wtap_module routines, call the
+     * routines.
+     */
+    for (pt_plug = plugin_list; pt_plug != NULL; pt_plug = pt_plug->next)
+    {
+               if (pt_plug->register_codec_module)
+                       (pt_plug->register_codec_module)();
+    }
 }
 #endif