Preparations for dropping the old plugin api.
authorlroland <lroland@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 5 Mar 2005 06:28:10 +0000 (06:28 +0000)
committerlroland <lroland@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 5 Mar 2005 06:28:10 +0000 (06:28 +0000)
Introduce a new init routine for plugins,
which does not take the plugin api table as an
argument and allows etheral to distinguish
between plugins using the old and the new api.

Update README.plugins accordingly

Change all g_warnings() in epan/plugins.c to report_failue().
On windows we do not have a log console open while
loading the plugins, because a log console cannot be opened before the prefs have been read. Thus g_warnings()
does not work for reporting problems with plugins.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13596 f5534014-38df-0310-8fa8-9805f1628bb7

71 files changed:
doc/README.plugins
epan/plugins.c
plugins/acn/Makefile.nmake
plugins/acn/packet-acn.c
plugins/agentx/Makefile.nmake
plugins/agentx/packet-agentx.c
plugins/artnet/Makefile.nmake
plugins/artnet/packet-artnet.c
plugins/asn1/Makefile.nmake
plugins/asn1/packet-asn1.c
plugins/ciscosm/Makefile.nmake
plugins/ciscosm/packet-sm.c
plugins/docsis/Makefile.nmake
plugins/docsis/packet-bpkmattr.c
plugins/docsis/packet-bpkmreq.c
plugins/docsis/packet-bpkmrsp.c
plugins/docsis/packet-docsis.c
plugins/docsis/packet-dsaack.c
plugins/docsis/packet-dsareq.c
plugins/docsis/packet-dsarsp.c
plugins/docsis/packet-dscack.c
plugins/docsis/packet-dscreq.c
plugins/docsis/packet-dscrsp.c
plugins/docsis/packet-dsdreq.c
plugins/docsis/packet-dsdrsp.c
plugins/docsis/packet-intrngreq.c
plugins/docsis/packet-macmgmt.c
plugins/docsis/packet-map.c
plugins/docsis/packet-regack.c
plugins/docsis/packet-regreq.c
plugins/docsis/packet-regrsp.c
plugins/docsis/packet-rngreq.c
plugins/docsis/packet-rngrsp.c
plugins/docsis/packet-tlv.c
plugins/docsis/packet-type29ucd.c
plugins/docsis/packet-uccreq.c
plugins/docsis/packet-uccrsp.c
plugins/docsis/packet-ucd.c
plugins/docsis/packet-vendor.c
plugins/enttec/Makefile.nmake
plugins/enttec/packet-enttec.c
plugins/giop/Makefile.nmake
plugins/giop/packet-coseventcomm.c
plugins/giop/packet-cosnaming.c
plugins/gryphon/Makefile.nmake
plugins/gryphon/packet-gryphon.c
plugins/irda/Makefile.nmake
plugins/irda/packet-ircomm.c
plugins/irda/packet-irda.c
plugins/irda/packet-sir.c
plugins/lwres/Makefile.nmake
plugins/lwres/packet-lwres.c
plugins/mate/Makefile.nmake
plugins/megaco/Makefile.nmake
plugins/megaco/packet-megaco.c
plugins/mgcp/Makefile.nmake
plugins/mgcp/packet-mgcp.c
plugins/opsi/Makefile.nmake
plugins/opsi/packet-opsi.c
plugins/pcli/Makefile.nmake
plugins/pcli/packet-pcli.c
plugins/rdm/Makefile.nmake
plugins/rdm/packet-rdm.c
plugins/rlm/Makefile.nmake
plugins/rlm/packet-rlm.c
plugins/rtnet/Makefile.nmake
plugins/rtnet/packet-rtnet.c
plugins/rudp/Makefile.nmake
plugins/rudp/packet-rudp.c
plugins/v5ua/Makefile.nmake
plugins/v5ua/packet-v5ua.c

index cbc78078ebd487be9b93b9c23b83aba405449124..59d79754851212195cda134fcf28376e9844a4f4 100644 (file)
@@ -15,13 +15,6 @@ only a few changes you need to make to "pluginize" your dissector.
 
 1 New headers needed in packet-xxx.c
 
-#include "plugins/plugin_api.h"
-
-Some OSes (Win32) have DLLs that cannot reference symbols in the parent
-executable. So, the executable needs to provide a table of pointers for the DLL
-plugin to use. The plugin_api.h header provides definitions for this (or empty
-definitions on OSes which don't need this).
-
 #include "moduleinfo.h"
 
 This header is optional and is described in greater detail further on.
@@ -35,11 +28,6 @@ you include "gmodule.h"; however, "glib.h" is protected from multiple
 inclusion by #ifdefs, so it's safe to include it after including
 "gmodule.h".
 
-#include "plugins/plugin_api_defs.h"
-Only include this in one source file if you have more than one. It defines,
-(as opposed to declares,) the function pointer variables that the plugin uses
-to reference the address table.
-
 2 New exported constants in packet-xxx.c
 
 Plugins need to provide the following exported constants:
@@ -59,19 +47,15 @@ The following two functions need to be exported by the plugin:
 
 #ifndef ENABLE_STATIC
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat)
+new_plugin_init(void)
 #endif
 
 This function is called by Ethereal when the plugin is initialized; it's
 similar to the "proto_register_XXX()" routine for a non-plugin
-dissector, except for the name and the call to
-"plugin_address_table_init()".
+dissector, except for the name.
 
 Here is a sample code for the function:
 
-       /* initialise the table of pointers needed in Win32 DLLs */
-       plugin_address_table_init(pat);
-
        /* register the new protocol, protocol fields, and subtrees */
        if (proto_xxx == -1) { /* execute protocol initialization only once */
                proto_register_xxx();
@@ -150,12 +134,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-xxx.obj 
 
@@ -163,11 +144,15 @@ xxx.dll xxx.exp xxx.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:xxx.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) xxx.dll xxx.exp xxx.lib *.pdb
 
 distclean: clean
 
+maintainer-clean: distclean
+
 4.3 plugins/xxx/moduleinfo.h
        
 moduleinfo.h is used to set the version information for the plugin.  
@@ -238,6 +223,17 @@ distclean: clean
        cd ..
 
 
+maintainer-clean: clean
+       cd gryphon
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../mgcp
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean        
+       cd ..
+       cd xxx
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ..
+
+
 4.6 Changes to the top level Makefile.am
 
 Unfortunately there are quite some several places in the top level
index 72e05fc305593ab0a77fa51756bb1e0c914c9eb1..96f56911e5f400b82ff6daecb4505b618eccad15 100644 (file)
@@ -171,6 +171,7 @@ plugins_scan_dir(const char *dirname)
     gchar         *version;
     gpointer       gp;
     void         (*init)(void *);
+    void         (*newinit)(void) = NULL;
     void         (*reg_handoff)(void);
     void         (*register_tap_listener)(void);
     gchar         *dot;
@@ -232,29 +233,49 @@ plugins_scan_dir(const char *dirname)
 #endif
            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", &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;
-
+           
            /*
             * We require the plugin to have a "plugin_init()" routine.
             */
-           if (!g_module_symbol(handle, "plugin_init", &gp))
+           if (g_module_symbol(handle, "new_plugin_init", &gp))
            {
-               g_warning("The plugin %s has no plugin_init routine",
-                         name);
-               g_module_close(handle);
-               continue;
+                   /* 
+                    * We have a new init routine which does not need the 
+                    * plugin api table.
+                    */
+                   newinit = gp;
+           } else 
+           {
+                   newinit = NULL;
+                   if (!g_module_symbol(handle, "plugin_init", &gp))
+                   {
+                           /*
+                            * We don't have an init routine. Close the plugin.
+                            */
+                           report_failure("The plugin %s has no plugin_init routine",
+                               name);
+                           g_module_close(handle);
+                           continue;
+                   }
+                   /*
+                    * We have an old init routine. Throw a warning that 
+                    * support is going to be dropped.
+                    */
+                   report_failure("The plugin %s has an old plugin init routine.\nSupport is going to be dropped in the near future.",
+                       name);
+                   init = gp;
            }
-           init = gp;
 
            /*
             * Do we have a reg_handoff routine?
@@ -300,7 +321,7 @@ plugins_scan_dir(const char *dirname)
                /*
                 * No.
                 */
-               g_warning("The plugin %s has neither a reg_handoff nor a register_tap_listener routine",
+               report_failure("The plugin %s has neither a reg_handoff nor a register_tap_listener routine",
                          name);
                g_module_close(handle);
                continue;
@@ -326,11 +347,17 @@ plugins_scan_dir(const char *dirname)
            /*
             * Call its init routine.
             */
+            if(newinit != NULL) {
+                    newinit();
+            }
+            else
+            {
 #ifdef PLUGINS_NEED_ADDRESS_TABLE
-           init(&patable);
+                    init(&patable);
 #else
-           init(NULL);
+                    init(NULL);
 #endif
+            }
        }
 #if GLIB_MAJOR_VERSION < 2
        closedir(dir);
index 4412be937e3803f6ac87ce91058c55b3fd222c11..00b0f38be9f6e51b61b23ac73f3675eff40480ab 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-acn.obj 
 
@@ -24,6 +21,8 @@ acn.dll acn.exp acn.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:acn.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) acn.dll acn.exp acn.lib *.pdb
 
index 3c7b78b2482422f85c7abcec95f2682876e5974b..8bccfee84ac9c04c5b3964b774bb1b3a242cf9bc 100644 (file)
@@ -30,8 +30,6 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -50,8 +48,6 @@
 
 #include "acn.h"
 
-#include "plugins/plugin_api_defs.h"
-
 /* Define version if we are not building ethereal statically */
 
 #ifndef ENABLE_STATIC
@@ -1207,13 +1203,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
+new_plugin_init(void)
+{
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_acn == -1) { /* execute protocol initialization only once */
     proto_register_acn();
index 007631800005eb1eb74cb3720867a6ce1ab490b8..6d4b31e8f8eae792b765a1d67518a4900efb8e0e 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-agentx.obj 
 
@@ -24,6 +21,8 @@ agentx.dll agentx.exp agentx.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:agentx.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) agentx.dll agentx.exp agentx.lib *.pdb
 
index c0efecac2861311f73e1bcf85794bc26c192c656..26f19ee6dccf3e926b5339cbcf62b37fd7e4a590 100644 (file)
@@ -29,7 +29,6 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -45,8 +44,6 @@
 
 #include <epan/dissectors/packet-tcp.h>
 
-#include "plugins/plugin_api_defs.h"
-
 static guint global_agentx_tcp_port = 705;
 static guint agentx_tcp_port = 705;
 
@@ -1173,13 +1170,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
+new_plugin_init(void)
+{
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_agentx == -1) { /* execute protocol initialization only once */
     proto_register_agentx();
index 28128cef5fc35cf5a4a2142c0302c1184ff1d386..6fc03762ff14370a4036d7190249bccca9966527 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-artnet.obj 
 
@@ -24,6 +21,8 @@ artnet.dll artnet.exp artnet.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:artnet.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) artnet.dll artnet.exp artnet.lib *.pdb
 
index f2c4ee174fd4c5a0a607ff2c6fc7e3758bc5670a..7ce20e79a1e4c802eb112d4dae806bb302ac7d8b 100644 (file)
@@ -30,8 +30,6 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -45,8 +43,6 @@
 #include <epan/prefs.h>
 #include <epan/strutil.h>
 
-#include "plugins/plugin_api_defs.h"
-
 /* Define version if we are not building ethereal statically */
 
 #ifndef ENABLE_STATIC
@@ -2731,13 +2727,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
+new_plugin_init(void)
+{
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_artnet == -1) { /* execute protocol initialization only once */
     proto_register_artnet();
index 397bbf5e2ca872ae9b6179d6dcd3d91f05b4a899..d1ea5f513b442f12dd2ad5e4dc7827edb3108647 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-asn1.obj 
 
@@ -24,6 +21,8 @@ asn1.dll asn1.exp asn1.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:asn1.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) asn1.dll asn1.exp asn1.lib *.pdb
 
index 0d94a87cb6f245348881d37944245393e512d5f9..3c2148f776b8e007b8b7353f9e1d0e99718ac4a1 100644 (file)
@@ -67,8 +67,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#include "plugins/plugin_api.h"
-
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -86,8 +84,6 @@
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/asn1.h>
 
-#include "plugins/plugin_api_defs.h"
-
 #ifdef DISSECTOR_WITH_GUI
 #include <gtk/gtk.h>
 #endif
@@ -5221,14 +5217,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-)
+new_plugin_init(void)
 {
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_asn1 == -1) { /* execute protocol initialization only once */
     proto_register_asn1();
index f71e97c2ebb0f9c7cfd129d097eb6ab58684d91d..922d3bbeb7e5beb28bfb9e4582b0be65febc1a3a 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-sm.obj 
 
@@ -24,6 +21,8 @@ ciscosm.dll ciscosm.exp ciscosm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:ciscosm.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) ciscosm.dll ciscosm.exp ciscosm.lib *.pdb
 
index ee7e0d3f3c676d8208586e6f19579bed53f28d1d..94180154ecd97e50b521a5d3faebd6dc4aa477e5 100644 (file)
@@ -60,9 +60,7 @@
 #include <gmodule.h>
 #include <epan/packet.h>
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
- /* Define version if we are not building ethereal statically */
+/* Define version if we are not building ethereal statically */
 
 #include "moduleinfo.h"
 
@@ -181,15 +179,8 @@ plugin_reg_handoff_sm(void)
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-)
+new_plugin_init(void)
 {
-       /* initialise the table of pointers needed in Win32 DLLs */
-       plugin_address_table_init(pat);
-
        /* register the new protocol, protocol fields, and subtrees */
        if (proto_sm == -1) { /* execute protocol initialization only once */
                proto_register_sm();
index e565427852c69443c29a794b67e70b67c3ecf4b3..ea8916603a6b7e6f5cd0389b44366d6023f84282 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-intrngreq.obj packet-type29ucd.obj \
        packet-docsis.obj packet-bpkmattr.obj \
@@ -36,6 +33,8 @@ docsis.dll docsis.exp docsis.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:docsis.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH)  \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) docsis.dll docsis.exp docsis.lib *.pdb
 
index 41bf022b14587d7fe550b62d6cb65c53e741f51f..483a0a35c3526ce81c7a92150c2aac429d3472cf 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index ed9f467e1d8f9b293824fefd98ace6f4ba7778df..eaa2be39b5641d82b9dda912caa8dbab58d50ec9 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 3dd4cf9e8e457fd47e7b4f8f56055bbf6be91931..e615b702d3c30f4a1c2437bdc0fafbdc168ee987 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index cd7ed7943f8deaa26b94781024191de6746f13a6..0b60707e54a96133c0e7bb235acb6b490b513344 100644 (file)
@@ -49,8 +49,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -805,14 +803,8 @@ plugin_reg_handoff (void)
 }
 
 G_MODULE_EXPORT void
-plugin_init (plugin_address_table_t * pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-            _U_
-#endif
-  )
+new_plugin_init (void)
 {
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init (pat);
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_docsis == -1)
     {                          /* execute protocol initialization only once */
index 16f5581ea9cad66b929ef3e48fa0c8e5032d0ed3..e20c9afc09575491daad2b1c008672b884b37834 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 23e57ef54ccd7e811aff20f5ee64de18f0bef51a..8c495fed14ffe5238b492b064bc9e934c8c1f7ef 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 369cc93681430b457c9b51882c0dda6d9e51a115..725f227e58ddc1c72f347a697e83a397d4e1b1d2 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index eb320fb3de592ff7438a0b281645698ad2d5f30a..150a2efd0ba43b6c8db9cc277bb61155945cda34 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index cc427534d8485be957a77f2e6aa7307ed0ae8306..ae09452717e127de96ae14146fd0f936e6186329 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index da70b34c3785471e69c78eb66d2937e1460978c4..8534371b13bd6858452f8c77b1e7b4fec91bf068 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 1352e1574368ad4b4ebad192672ed1f4797807fe..4ceabf86740980d5dfdafe626663d0086f4150b1 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 31fdc66b2c61c02199135497fe4bfd0ac4bf2d1a..01460c371806dc8e1ac1fb7f52b02544b67907b0 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 37dcf696159599b6d45a64837fce0474db71b9cd..5dc3e9063a3dc9e57e53468b52820b8705175f91 100644 (file)
@@ -27,9 +27,6 @@
 #include "config.h"
 #endif
 
-
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index e6a88e9e74d12b28d7505e00b5cb654d9a7d4fe0..62cf75128d6509826dae35f0dd344d534ca94abd 100644 (file)
@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 01be69fc66a219139ca746ffad2422f20ba9f8be..ad9b3a634a4b0cc69d77b99c2d7ce44777dfed4d 100644 (file)
@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 916d0677eb74dc381d705cbda36d1321292c561f..f7e87f4024ddde7a838a04aa76d9dc248a8a74a1 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 69a80dac1d5085429ae70024ee20321601da7f08..21565aba9ed5a1f887fc248af64b0b7ba5189572 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 2669fbdc627c205dd0786e26b90c446787ade174..75fec0801a88f5bad640ebbb3c422a2c06e84f30 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index cb0bface54ffd4496e9cb437d24b3be0cfa58cdd..682f1cdc88b8ad27abceae09191c82eebf1131a6 100644 (file)
@@ -27,9 +27,6 @@
 #include "config.h"
 #endif
 
-
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 60840746c3061b87cb2e6d36c59e7434d2c2cc44..601376afca51df32e30a513a3e868a09175ff49c 100644 (file)
@@ -27,8 +27,6 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 93819b6d7b6bb8ea19eb5f0c8a5b2cee8dded3b8..08989d87c9bf74d41246922b3e3cf61376257bce 100644 (file)
@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 769a74975fa1b7f967294a80b88336fa0d7eba2a..a89e05f279d2ed998f0eeab8dd48a5c1938abfcb 100644 (file)
@@ -27,9 +27,6 @@
 #include "config.h"
 #endif
 
-
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 681dad7655f46bd6f5a64686e8d65cc3135d1501..d03b42b37dda806753af92959ade3200315a923b 100644 (file)
@@ -31,8 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <gmodule.h>
index d04b6925b71a953abb415a686ee637e31bbf590d..2b3cf37c135239027f8a463f10b735b8fe80a0b6 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index c08e113ee7991dc2576c918c7d4dd83f6405afcc..571a84946712643a77af0f20242ae5cebc91fde4 100644 (file)
@@ -27,9 +27,6 @@
 # include "config.h"
 #endif
 
-
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index 1b4247e76d12f8c8a846dae690fcc5f275741c6b..9bb56402c2d6e836969449b5a578fd5e170567e5 100644 (file)
@@ -45,9 +45,6 @@
 # include "config.h"
 #endif
 
-
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
index ef0c579037a239a42d4e2eabb9bea8d161133085..19032e1e2a31285ddc741829c439b9638db3ff93 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-enttec.obj 
 
@@ -24,6 +21,8 @@ enttec.dll enttec.exp enttec.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:enttec.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) enttec.dll enttec.exp enttec.lib *.pdb
 
index 055f3f2de6cdfe11a9bbfc97f2cd4021e2afac2e..c7c0371bee7eddb3090d884f6769e293fc79ebca 100644 (file)
@@ -30,8 +30,6 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -45,8 +43,6 @@
 #include <epan/prefs.h>
 #include <epan/strutil.h>
 
-#include "plugins/plugin_api_defs.h"
-
 /* Define version if we are not building ethereal statically */
 
 #ifndef ENABLE_STATIC
@@ -596,13 +592,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-       /* initialise the table of pointers needed in Win32 DLLs */
-       plugin_address_table_init(pat);
+new_plugin_init(void)
+{
        /* register the new protocol, protocol fields, and subtrees */
        if (proto_enttec == -1) { /* execute protocol initialization only once */
                proto_register_enttec();
index 333de09bb6f6c3e3ead2bd7b7ff74b672794cfb4..216f8a51c9617aa555c26aa6191db99846fce97c 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-cosnaming.obj  packet-coseventcomm.obj
 
@@ -30,6 +27,8 @@ coseventcomm.dll coseventcomm.exp coseventcomm.lib : packet-coseventcomm.obj $(L
        link -dll /out:coseventcomm.dll $(LDFLAGS) packet-coseventcomm.obj $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) cosnaming.dll cosnaming.exp cosnaming.lib \
                coseventcomm.dll coseventcomm.exp coseventcomm.lib *.pdb
index 6b8e259e1be13f2ec1d22e6d896f80feea7c666d..110eec0a88de2dfc4effc101246bec7c4897ea8b 100644 (file)
@@ -35,8 +35,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <gmodule.h>
@@ -47,8 +45,6 @@
 #include <epan/proto.h>
 #include <epan/dissectors/packet-giop.h>
 
-#include "plugins/plugin_api_defs.h"
-
 #ifndef ENABLE_STATIC
 G_MODULE_EXPORT const gchar version[] = "0.0.1";
 #endif
@@ -868,13 +864,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-   /* initialise the table of pointers needed in Win32 DLLs */
-   plugin_address_table_init(pat);
+new_plugin_init(void)
+{
    if (proto_coseventcomm == -1) {
      proto_register_giop_coseventcomm();
    }
index 87c3982c70e83ca504ac85023bb05a390f97a5a6..44e6229ff866e6bfb0f3658aec7c398578639f49 100644 (file)
@@ -35,8 +35,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <gmodule.h>
@@ -47,8 +45,6 @@
 #include <epan/proto.h>
 #include <epan/dissectors/packet-giop.h>
 
-#include "plugins/plugin_api_defs.h"
-
 #ifndef ENABLE_STATIC
 G_MODULE_EXPORT const gchar version[] = "0.0.1";
 #endif
@@ -1746,13 +1742,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-   /* initialise the table of pointers needed in Win32 DLLs */
-   plugin_address_table_init(pat);
+new_plugin_init(void)
+{
    if (proto_cosnaming == -1) {
      proto_register_giop_cosnaming();
    }
index 7ad5c9bf70de36053706a296457c0af4a89c1c3a..883c905556e3d8c12c55c032561d01d16f23e443 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-gryphon.obj 
 
@@ -24,6 +21,8 @@ gryphon.dll gryphon.exp gryphon.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:gryphon.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) gryphon.dll gryphon.exp gryphon.lib *.pdb
 
index fe8abcd62b0a276938a7d9b196d4c8acfd518633..ea6196fe7f1bbbf95fc1a81387079eaae4fa11f4 100644 (file)
@@ -28,8 +28,6 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-
 #include "moduleinfo.h"
 
 #include <string.h>
@@ -42,8 +40,6 @@
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/prefs.h>
 
-#include "plugins/plugin_api_defs.h"
-
 #ifndef ENABLE_STATIC
 G_MODULE_EXPORT const gchar version[] = VERSION;
 #endif
@@ -2302,13 +2298,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
+new_plugin_init(void)
+{
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_gryphon == -1) { /* execute protocol initialization only once */
     proto_register_gryphon();
index 03b950c98899dcfd819ad38253c35f41dbe0edbd..1a51de7933af3fb90dac9cce12053ca01611954a 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-irda.obj packet-ircomm.obj packet-sir.obj
 
@@ -24,6 +21,8 @@ irda.dll irda.exp irda.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:irda.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) irda.dll irda.exp irda.lib *.pdb
 
index f2888839eaf91483286cfd3a631757037bff240e..0148f897472930531d101d4b1f7cba701b5b5b87 100644 (file)
@@ -28,8 +28,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -41,8 +39,6 @@
 #include <epan/packet.h>
 #include <epan/proto.h>
 
-#include "plugins/plugin_api_defs.h"
-
 #ifdef NEED_SNPRINTF_H
 # include "snprintf.h"
 #endif
index 28545d72cfd8925817d832b4b9894316c93aff3e..a87b748d6563fd5d3ef022ef4a6f95a6cc1bdf05 100644 (file)
@@ -31,8 +31,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -46,8 +44,6 @@
 #include <epan/conversation.h>
 #include <epan/xdlc.h>
 
-#include "plugins/plugin_api_defs.h"
-
 #ifdef NEED_SNPRINTF_H
 # include "snprintf.h"
 #endif
@@ -2343,13 +2339,8 @@ plugin_reg_handoff(void)
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t* pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-    /* initialise the table of pointers needed in Win32 DLLs */
-    plugin_address_table_init(pat);
+new_plugin_init(void)
+{
     /* register the new protocol, protocol fields, and subtrees */
     if (proto_irlap == -1)
     {
index dd46c9089c3c9eba2ec03df6f9329d90a8371339..a41904a6a543cbb69c5211b6f17710bd8a069d1d 100644 (file)
@@ -22,7 +22,6 @@
 # include "config.h"
 #endif
 #include "moduleinfo.h"
-#include "plugins/plugin_api.h"
 
 #include <gmodule.h>
 
index 686bc2fe4868860ccf640efb145a31344a9ccd82..97470f88a2a28356e4f2b2b8b3ccd6e274ccbfba 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-lwres.obj 
 
@@ -24,6 +21,8 @@ lwres.dll lwres.exp lwres.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:lwres.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) lwres.dll lwres.exp lwres.lib *.pdb
 
index 16de34150d864298965ae84c331196ad72dbb09b..52b57aac050c16f799f381c47e012f345b043a2d 100644 (file)
@@ -28,7 +28,6 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -41,8 +40,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
-#include "plugins/plugin_api_defs.h"
-
 #define LWRES_LWPACKET_LENGTH           (4 * 5 + 2 * 4)
 #define LWRES_LWPACKETFLAG_RESPONSE     0x0001U /* if set, pkt is a response */
 #define LWRES_LWPACKETVERSION_0         0
@@ -1531,13 +1528,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
+new_plugin_init(void)
+{
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_lwres == -1) { /* execute protocol initialization only once */
     proto_register_lwres();
index b08d92c1117659a8fd5bb2b7d52b1a4b9025aef8..c439e2ac5a67798c27b5faf9e5d2999656239527 100644 (file)
@@ -15,12 +15,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
        
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-mate.obj mate_setup.obj mate_runtime.obj mate_util.obj mate_plugin.obj
 
@@ -28,6 +25,8 @@ mate.dll mate.exp mate.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:mate.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) mate.dll mate.exp mate.lib *.pdb
 
index 356d4bfbd55f2a4181ffa37c2362089ef833514c..f2d37a4f6d88475b12da958303a506f01fad057a 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-megaco.obj 
 
@@ -24,6 +21,8 @@ megaco.dll megaco.exp megaco.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:megaco.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) megaco.dll megaco.exp megaco.lib *.pdb
 
index 893f8dc77a2bfe85ab2e2eba2e6e9c4b900e5f40..794fcc9be611eb8f6e53ac56aaf59c57fe909174 100644 (file)
@@ -39,7 +39,6 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -55,8 +54,6 @@
 #include "sctpppids.h"
 #include <epan/dissectors/packet-tpkt.h>
 
-#include "plugins/plugin_api_defs.h"
-
 #ifndef ENABLE_STATIC
 G_MODULE_EXPORT const gchar version[] = VERSION;
 #endif
@@ -2743,13 +2740,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-                       _U_
-#endif
-                       ){
-       /* initialise the table of pointers needed in Win32 DLLs */
-       plugin_address_table_init(pat);
+new_plugin_init(void)
+{
        /* register the new protocol, protocol fields, and subtrees */
        if (proto_megaco == -1) { /* execute protocol initialization only once */
                proto_register_megaco();
index f44c35cf3f5a37e55c639ac0870ba63d3c416d67..4a7a74ef48a89dd15aff27dec88e87cb59b391b1 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-mgcp.obj 
 
@@ -24,6 +21,8 @@ mgcp.dll mgcp.exp mgcp.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:mgcp.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib *.pdb
 
index 3ff7bd61582f7b4f1b525b340ef12470c208e778..cc76d8211deca05e5ec7b95558d3769fcf517016 100644 (file)
@@ -36,8 +36,6 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -54,8 +52,6 @@
 #include <epan/tap.h>
 #include "packet-mgcp.h"
 
-#include "plugins/plugin_api_defs.h"
-
 #ifndef ENABLE_STATIC
 G_MODULE_EXPORT const gchar version[] = VERSION;
 #endif
@@ -1759,14 +1755,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
-  
+new_plugin_init(void)
+{
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_mgcp == -1) { /* execute protocol initialization only once */
     proto_register_mgcp();
index 47f8cef88b39a6a80cbb603e47b9d5431d014ad6..cabc2f44cd887b76852c4309db3b40f3e80edc91 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-opsi.obj 
 
@@ -24,6 +21,8 @@ opsi.dll opsi.exp opsi.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:opsi.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) opsi.dll opsi.exp opsi.lib *.pdb
 
index 3d0cdd5a91aefba32df2b7975921538dcb9a7bee..2fc427595132a6ee048f86b4f2ba060a91ff0630 100644 (file)
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
 #include "moduleinfo.h"
 #include <gmodule.h>
-#include "plugins/plugin_api_defs.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -808,15 +806,8 @@ proto_reg_handoff_opsi(void)
 
 #ifndef ENABLE_STATIC
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-)
+new_plugin_init(void)
 {
-       /* initialise the table of pointers needed in Win32 DLLs */
-       plugin_address_table_init(pat);
-
        /* register the new protocol, protocol fields, and subtrees */
        if (proto_opsi == -1) { /* execute protocol initialization only once */
                proto_register_opsi();
index 3e8119e05a198722747000c879c509cc1250e47c..37b8d02965e94a1a9d2f94a44ecf969f75e82a60 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-pcli.obj 
 
@@ -24,6 +21,8 @@ pcli.dll pcli.exp pcli.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:pcli.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) pcli.dll pcli.exp pcli.lib *.pdb
 
index 67d299ab4db8accfa2ddf9b4873db076e3ba05a1..916e8a033a5de2f94396bc49308ba97321ea1278 100644 (file)
@@ -32,9 +32,6 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-
-#include "plugins/plugin_api.h"
-
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -48,8 +45,6 @@
 #include <epan/prefs.h>
 #include <epan/strutil.h>
 
-#include "plugins/plugin_api_defs.h"
-
 /* Define version if we are not building ethereal statically */
 
 #ifndef ENABLE_STATIC
@@ -185,13 +180,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
+new_plugin_init(void)
+{
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_pcli == -1) { /* execute protocol initialization only once */
     proto_register_pcli();
index 541b4fae2060f5f18edbb64ec69930c74b8694d8..bd5ab123da4d1c0c8537e61018c56c12d81af4f8 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-rdm.obj 
 
@@ -24,6 +21,8 @@ rdm.dll rdm.exp rdm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:rdm.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) rdm.dll rdm.exp rdm.lib *.pdb
 
index 079ed4985bfb151a860677902fb7093e76d96590..67fed61eab1935d770eb6d1eeef3e4e4f0794690 100644 (file)
@@ -30,8 +30,6 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -45,8 +43,6 @@
 #include "etypes.h"
 #include <epan/strutil.h>
 
-#include "plugins/plugin_api_defs.h"
-
 /* Define version if we are not building ethereal statically */
 
 #ifndef ENABLE_STATIC
@@ -269,13 +265,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
+new_plugin_init(void)
+{
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_rdm == -1) { /* execute protocol initialization only once */
     proto_register_rdm();
index 41c22fd2ed9f660b04c8ef5cc340478637df2cfd..11357bc078ba31ff501f559bb53f636d5ed64077 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-rlm.obj 
 
@@ -24,6 +21,8 @@ rlm.dll rlm.exp rlm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:rlm.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) rlm.dll rlm.exp rlm.lib *.pdb
 
index 1b0fe320f0adcc2bfef82eafb1b4c39d69b0c9c4..aeee4631728877a923b0288bdacde52e4ecdd92e 100644 (file)
@@ -62,8 +62,6 @@
 #include <gmodule.h>
 #include <epan/packet.h>
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
  /* Define version if we are not building ethereal statically */
 
 #include "moduleinfo.h"
@@ -244,15 +242,8 @@ proto_register_rlm(void)
 #ifndef ENABLE_STATIC
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-)
+new_plugin_init(void)
 {
-
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_rlm == -1) { /* execute protocol initialization only once */
     proto_register_rlm();
index c91e3a98a18462c38b0c1acc719ed9e7108b8ba3..ca1ff06ee8d9151a198fba6d65539b97c89a81fd 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-rtnet.obj 
 
@@ -24,6 +21,8 @@ rtnet.dll rtnet.exp rtnet.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:rtnet.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) rtnet.dll rtnet.exp rtnet.lib *.pdb
 
index 730650acccdbb083021bb4ee1378b8b74c0e24c8..10c204d297858617005b5d678f564f6f29faafaa 100644 (file)
@@ -31,8 +31,6 @@
 #include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-
 #include "moduleinfo.h"
 
 #include <stdio.h>
@@ -46,8 +44,6 @@
 #include "etypes.h"
 #include <epan/strutil.h>
 
-#include "plugins/plugin_api_defs.h"
-
 /* Define version if we are not building ethereal statically */
 
 #ifndef ENABLE_STATIC
@@ -1413,13 +1409,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
+new_plugin_init(void)
+{
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_rtmac == -1) { /* execute protocol initialization only once */
     proto_register_rtmac();
index db99178c7d8209714c0f7aba9caace53254c87f0..bbab9d222456955d0d0471c98f7e40c6f0984fa5 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-rudp.obj 
 
@@ -24,6 +21,8 @@ rudp.dll rudp.exp rudp.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:rudp.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) rudp.dll rudp.exp rudp.lib *.pdb
 
index f01ca31ae4920fdf6abe8bc503b75ee188bcf001..e9f814ae2ef2333d5317e0d39d3ac5b72ad2075c 100644 (file)
@@ -49,8 +49,6 @@
 #include <gmodule.h>
 #include <epan/packet.h>
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
  /* Define version if we are not building ethereal statically */
 
 #include "moduleinfo.h"
@@ -241,13 +239,8 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-_U_
-#endif
-){
-  /* initialise the table of pointers needed in Win32 DLLs */
-  plugin_address_table_init(pat);
+new_plugin_init(void)
+{
   /* register the new protocol, protocol fields, and subtrees */
   if (proto_rudp == -1) { /* execute protocol initialization only once */
     proto_register_rudp();
index cea88f8a1244bc2b2b2ed5e12e1ad6a90cff428b..3f246bb329cb8df393006fb30f42047c9fb974f4 100644 (file)
@@ -11,12 +11,9 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+!IFDEF ENABLE_LIBETHEREAL
 LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
 CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-!ELSE
-LINK_PLUGIN_WITH=..\plugin_api.obj
-!ENDIF
 
 OBJECTS=packet-v5ua.obj 
 
@@ -24,6 +21,8 @@ v5ua.dll v5ua.exp v5ua.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
        link -dll /out:v5ua.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS)
 
+!ENDIF
+
 clean:
        rm -f $(OBJECTS) v5ua.dll v5ua.exp v5ua.lib *.pdb
 
index 2ff3a449713c84a6bb7dcc111ba406f87cf3cfff..ce5ba5bac712b3faa6735339ca1eb01751c1151b 100644 (file)
@@ -29,9 +29,6 @@
 # include "config.h"
 #endif
 
-#include "plugins/plugin_api.h"
-#include "plugins/plugin_api_defs.h"
-
 #include "moduleinfo.h"
 
 #include <gmodule.h>
@@ -2380,14 +2377,9 @@ plugin_reg_handoff(void){
 }
 
 G_MODULE_EXPORT void
-plugin_init(plugin_address_table_t *pat
-#ifndef PLUGINS_NEED_ADDRESS_TABLE
-           _U_
-#endif
-           ){
-/* initialise the table of pointers needed in Win32 DLLs */
-    plugin_address_table_init(pat);
-/* register the new protocol, protocol fields, and subtrees */
+new_plugin_init(void)
+{
+    /* register the new protocol, protocol fields, and subtrees */
     if (proto_v5ua == -1) { /* execute protocol initialization only once */
        proto_register_v5ua();
     }