diff options
-rw-r--r-- | plugins/Makefile.nmake | 11 | ||||
-rw-r--r-- | plugins/mgcp/Makefile.nmake | 20 | ||||
-rw-r--r-- | plugins/mgcp/packet-mgcp.c | 11 | ||||
-rw-r--r-- | plugins/plugin_api.c | 5 | ||||
-rw-r--r-- | plugins/plugin_api.h | 7 | ||||
-rw-r--r-- | plugins/plugin_table.h | 12 |
6 files changed, 55 insertions, 11 deletions
diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake index 73bddaa39e..d10dfd17da 100644 --- a/plugins/Makefile.nmake +++ b/plugins/Makefile.nmake @@ -1,5 +1,5 @@ # -# $Id: Makefile.nmake,v 1.7 2000/10/11 07:35:02 guy Exp $ +# $Id: Makefile.nmake,v 1.8 2000/11/12 11:08:45 guy Exp $ # include ..\config.nmake @@ -13,15 +13,22 @@ CFLAGS=/DHAVE_CONFIG_H /I.. /I../epan /I../wiretap /I. \ OBJECTS=plugin_api.obj -all: plugin_api.obj gryphon +all: plugin_api.obj gryphon mgcp gryphon:: cd gryphon nmake -f Makefile.nmake cd .. +mgcp:: + cd mgcp + nmake -f Makefile.nmake + cd .. + clean: rm -f plugin_api.obj cd gryphon nmake -f Makefile.nmake clean + cd ../mgcp + nmake -f Makefile.nmake clean cd .. diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake new file mode 100644 index 0000000000..20a0f0de4b --- /dev/null +++ b/plugins/mgcp/Makefile.nmake @@ -0,0 +1,20 @@ +# +# $Id: Makefile.nmake,v 1.1 2000/11/12 11:08:46 guy Exp $ +# + +include ..\..\config.nmake + +############### no need to modify below this line ######### + +CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../epan /I../../wiretap \ + /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ + /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ + /I$(PCAP_DIR)\include $(LOCAL_CFLAGS) + +OBJECTS=packet-mgcp.obj + +mgcp.dll mgcp.exp mgcp.lib : packet-mgcp.obj ..\plugin_api.obj + link -dll /out:mgcp.dll packet-mgcp.obj ..\plugin_api.obj + +clean: + rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c index 9b0bfcdb37..46d3a40f10 100644 --- a/plugins/mgcp/packet-mgcp.c +++ b/plugins/mgcp/packet-mgcp.c @@ -2,7 +2,7 @@ * Routines for mgcp packet disassembly * RFC 2705 * - * $Id: packet-mgcp.c,v 1.3 2000/11/10 06:50:37 guy Exp $ + * $Id: packet-mgcp.c,v 1.4 2000/11/12 11:08:46 guy Exp $ * * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu> * @@ -28,6 +28,10 @@ #include "config.h" #endif +#include "plugins/plugin_api.h" + +#include "moduleinfo.h" + #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif @@ -48,12 +52,7 @@ #include "prefs.h" #include "strutil.h" -/* Start includes and definitions for plugin stuff */ -#include "plugins/plugin_api.h" -#include "moduleinfo.h" DLLEXPORT const gchar version[] = VERSION; -/* End includes and definitions for plugin stuff */ - #define TCP_PORT_MGCP_GATEWAY 2427 #define UDP_PORT_MGCP_GATEWAY 2427 diff --git a/plugins/plugin_api.c b/plugins/plugin_api.c index 07821dc76b..3fa7a4f78b 100644 --- a/plugins/plugin_api.c +++ b/plugins/plugin_api.c @@ -1,7 +1,7 @@ /* plugin_api.c * Routines for Ethereal plugins. * - * $Id: plugin_api.c,v 1.8 2000/05/31 18:32:14 gram Exp $ + * $Id: plugin_api.c,v 1.9 2000/11/12 11:08:45 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org> @@ -48,7 +48,10 @@ plugin_address_table_init(plugin_address_table_t *pat) p_proto_register_field_array = pat->p_proto_register_field_array; p_proto_register_subtree_array = pat->p_proto_register_subtree_array; p_dissector_add = pat->p_dissector_add; + p_old_dissector_add = pat->p_old_dissector_add; p_heur_dissector_add = pat->p_heur_dissector_add; + p_old_dissect_data = pat->p_old_dissect_data; + p_proto_is_protocol_enabled = pat->p_proto_is_protocol_enabled; p_proto_item_add_subtree = pat->p_proto_item_add_subtree; p_proto_tree_add_item = pat->p_proto_tree_add_item; p_proto_tree_add_item_hidden = pat->p_proto_tree_add_item_hidden; diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h index db0b52cbae..7f93bee12b 100644 --- a/plugins/plugin_api.h +++ b/plugins/plugin_api.h @@ -1,7 +1,7 @@ /* plugin_api.h * Routines for Ethereal plugins. * - * $Id: plugin_api.h,v 1.7 2000/08/11 13:37:21 deniel Exp $ + * $Id: plugin_api.h,v 1.8 2000/11/12 11:08:46 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org> @@ -52,9 +52,14 @@ #define proto_register_subtree_array (*p_proto_register_subtree_array) #define dissector_add (*p_dissector_add) +#define old_dissector_add (*p_old_dissector_add) #define heur_dissector_add (*p_heur_dissector_add) +#define old_dissect_data (*p_old_dissect_data) + +#define proto_is_protocol_enabled (*p_proto_is_protocol_enabled) + #define proto_item_add_subtree (*p_proto_item_add_subtree) #define proto_tree_add_item (*p_proto_tree_add_item) #define proto_tree_add_item_hidden (*p_proto_tree_add_item_hidden) diff --git a/plugins/plugin_table.h b/plugins/plugin_table.h index d3349d1328..091a6d1c2c 100644 --- a/plugins/plugin_table.h +++ b/plugins/plugin_table.h @@ -1,7 +1,7 @@ /* plugin_table.h * Table of exported addresses for Ethereal plugins. * - * $Id: plugin_table.h,v 1.4 2000/05/31 18:32:15 gram Exp $ + * $Id: plugin_table.h,v 1.5 2000/11/12 11:08:46 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org> @@ -44,9 +44,14 @@ typedef void (*addr_proto_register_field_array)(int, hf_register_info*, int); typedef void (*addr_proto_register_subtree_array)(int**, int); typedef void (*addr_dissector_add)(const char *, guint32, dissector_t); +typedef void (*addr_old_dissector_add)(const char *, guint32, old_dissector_t); typedef void (*addr_heur_dissector_add)(const char *, heur_dissector_t); +typedef void (*addr_old_dissect_data)(const u_char *, int, frame_data *, proto_tree *); + +typedef gboolean (*addr_proto_is_protocol_enabled)(int); + typedef proto_tree* (*addr_proto_item_add_subtree)(proto_item*, gint); typedef proto_item* (*addr_proto_tree_add_item)(proto_tree*, int, tvbuff_t*, gint, gint, gboolean); typedef proto_item* (*addr_proto_tree_add_item_hidden)(proto_tree*, int, tvbuff_t*, gint, gint, gboolean); @@ -116,8 +121,13 @@ typedef struct { addr_proto_register_subtree_array p_proto_register_subtree_array; addr_dissector_add p_dissector_add; + addr_old_dissector_add p_old_dissector_add; addr_heur_dissector_add p_heur_dissector_add; + addr_old_dissect_data p_old_dissect_data; + + addr_proto_is_protocol_enabled p_proto_is_protocol_enabled; + addr_proto_item_add_subtree p_proto_item_add_subtree; addr_proto_tree_add_item p_proto_tree_add_item; addr_proto_tree_add_item_hidden p_proto_tree_add_item_hidden; |