From Ronnie Sahlberg: have a registration interface for tap listeners,

and generate the table of stuff to register from tap source files, so
Tethereal doesn't need to know what tap listeners exist.

Get rid of "tap-xxx.h" files, as they're now empty.

Add "tethereal-tap-register.c" to the .cvsignore file, as it's a new
generated file.

Update "Makefile.nmake" to generate "tethereal-tap-register.c".

Clean up "Makefile.am" and "Makefile.nmake" a bit.


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

1 files changed, 5 insertions, 5 deletions

diff --git a/tap.c b/tap.c
index e8332875ea..1fad0d06f5 100644
--- a/tap.c
+++ b/tap.c
@@ -1,7 +1,7 @@
 /* tap.c
  * packet tap interface   2002 Ronnie Sahlberg
  *
- * $Id: tap.c,v 1.6 2002/10/23 23:12:34 guy Exp $
+ * $Id: tap.c,v 1.7 2002/10/31 22:16:01 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -74,9 +74,9 @@ typedef struct _tap_listener_t {
 	int needs_redraw;
 	dfilter_t *code;
 	void *tapdata;
-	void (*reset)(void *tapdata);
-	int  (*packet)(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, void *data);
-	void (*draw)(void *tapdata);
+	tap_reset_cb reset;
+	tap_packet_cb packet;
+	tap_draw_cb draw;
 } tap_listener_t;
 static volatile tap_listener_t *tap_listener_queue=NULL;
 
@@ -339,7 +339,7 @@ find_tap_id(char *name)
  * !0: error
 */
 int
-register_tap_listener(char *tapname, void *tapdata, char *fstring, void (*reset)(void *tapdata), int (*packet)(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, void *data), void (*draw)(void *tapdata))
+register_tap_listener(char *tapname, void *tapdata, char *fstring, tap_reset_cb reset, tap_packet_cb packet, tap_draw_cb draw)
 {
 	tap_listener_t *tl;
 	int tap_id;