diff options
| author | lroland <lroland@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-03-05 06:28:10 +0000 |
|---|---|---|
| committer | lroland <lroland@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-03-05 06:28:10 +0000 |
| commit | ca98965cb485a9a167d5915327e82dc7f0eb71f5 (patch) | |
| tree | ac2c8b87fdd4dc989c3ef1d3b646f7700ba7626c /plugins/agentx | |
| parent | f58c4ab7c2a03a15d1506dfbb8db58fcdb9b559a (diff) | |
Preparations for dropping the old plugin api.
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
Diffstat (limited to 'plugins/agentx')
| -rw-r--r-- | plugins/agentx/Makefile.nmake | 7 | ||||
| -rw-r--r-- | plugins/agentx/packet-agentx.c | 12 |
2 files changed, 5 insertions, 14 deletions
diff --git a/plugins/agentx/Makefile.nmake b/plugins/agentx/Makefile.nmake index 0076318000..6d4b31e8f8 100644 --- a/plugins/agentx/Makefile.nmake +++ b/plugins/agentx/Makefile.nmake @@ -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 diff --git a/plugins/agentx/packet-agentx.c b/plugins/agentx/packet-agentx.c index c0efecac28..26f19ee6dc 100644 --- a/plugins/agentx/packet-agentx.c +++ b/plugins/agentx/packet-agentx.c @@ -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(); |