PCAP handler callback is void.

3 files changed, 21 insertions, 7 deletions

diff --git a/net/sniffit/patches/patch-ai b/net/sniffit/patches/patch-ai
index 8b4597ed3fd..7cc237b22fc 100644
--- a/net/sniffit/patches/patch-ai
+++ b/net/sniffit/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2012/03/31 08:31:06 dholland Exp $
+$NetBSD: patch-ai,v 1.3 2013/01/11 00:02:13 joerg Exp $
 
 - use standard headers
 - fix signature of signal handler, make it file-static
@@ -62,6 +62,15 @@ $NetBSD: patch-ai,v 1.2 2012/03/31 08:31:06 dholland Exp $
  	if((proto==TCP)&&(PROTOCOLS&F_TCP)) 
  		{
  #ifdef DEBUG_ONSCREEN
+@@ -823,7 +831,7 @@ printf("Selected: %d\n",selected);
+ }
+ 
+ /* Default Processing of packets */
+-pcap_handler packethandler(unsigned char *ipaddrpoint, 
++void packethandler(unsigned char *ipaddrpoint, 
+ 			const struct packetheader *p_header, 
+ 			const unsigned char *sp) 
+ { 
 @@ -1220,6 +1228,10 @@ int check_mask (const struct packetheade
  	proto=unwrap_packet(sp, info);
  	if(proto == NO_IP)	return DONT_EXAMINE; /* no use in trying */
@@ -78,7 +87,7 @@ $NetBSD: patch-ai,v 1.2 2012/03/31 08:31:06 dholland Exp $
  }
  
 -pcap_handler interactive_packethandler(	char *dummy, 
-+pcap_handler interactive_packethandler(	unsigned char *dummy, 
++void interactive_packethandler(	unsigned char *dummy, 
  			 	const struct packetheader *p_header, 
  				const unsigned char *sp) 
  { 
diff --git a/net/sniffit/patches/patch-sn__interface.h b/net/sniffit/patches/patch-sn__interface.h
index 7f4dc3614b8..5bf84c64df2 100644
--- a/net/sniffit/patches/patch-sn__interface.h
+++ b/net/sniffit/patches/patch-sn__interface.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-sn__interface.h,v 1.1 2012/04/07 09:23:11 obache Exp $
+$NetBSD: patch-sn__interface.h,v 1.2 2013/01/11 00:02:13 joerg Exp $
 
 - make const declarations internally consistent
 
@@ -9,7 +9,7 @@ $NetBSD: patch-sn__interface.h,v 1.1 2012/04/07 09:23:11 obache Exp $
  int check_mask (const struct packetheader *,const unsigned char *, char *, 
  					char *, struct unwrap *);
 -pcap_handler interactive_packethandler( char *, const struct packetheader *,
-+pcap_handler interactive_packethandler(unsigned char *, const struct packetheader *,
++void interactive_packethandler(unsigned char *, const struct packetheader *,
                   		        const unsigned char *);
  void stop_packet_info (void);
  void packet_info_handler (int);
diff --git a/net/sniffit/patches/patch-sniffit_h b/net/sniffit/patches/patch-sniffit_h
index 6bb7d096397..22676f0a645 100644
--- a/net/sniffit/patches/patch-sniffit_h
+++ b/net/sniffit/patches/patch-sniffit_h
@@ -1,4 +1,4 @@
-$NetBSD: patch-sniffit_h,v 1.2 2012/04/07 09:23:11 obache Exp $
+$NetBSD: patch-sniffit_h,v 1.3 2013/01/11 00:02:13 joerg Exp $
 
 - move strlower to sn_cfgfile.h to make it visible in the right places
 - my_exit should be file-static
@@ -6,12 +6,17 @@ $NetBSD: patch-sniffit_h,v 1.2 2012/04/07 09:23:11 obache Exp $
 
 --- sniffit.h.orig	1997-04-18 09:33:58.000000000 +0000
 +++ sniffit.h
-@@ -9,20 +9,18 @@ pcap_handler packethandler(unsigned char
+@@ -5,24 +5,22 @@ int check_packet(unsigned long,
+                 const struct packetheader *,
+                 const unsigned char *,char *, char *,
+                 struct unwrap *,char *,int);          
+-pcap_handler packethandler(unsigned char *,const struct packetheader *,
++void packethandler(unsigned char *,const struct packetheader *,
  							const unsigned char *);
  int check_mask (const struct packetheader *,const unsigned char *, char *,
      	                                    char *,struct unwrap *);
 -pcap_handler interactive_packethandler( char *, const struct packetheader *,
-+pcap_handler interactive_packethandler( unsigned char *, const struct packetheader *,
++void interactive_packethandler( unsigned char *, const struct packetheader *,
                                          const unsigned char *);     
  void print_iphead (struct IP_header *, char);
  unsigned long getaddrbyname(char *);