diff options
| author | darrenr <darrenr@FreeBSD.org> | 2007-10-18 21:52:14 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2007-10-18 21:52:14 +0000 |
| commit | fd172ed3272b523c5499832d7098b6766bac7e4f (patch) | |
| tree | 7eb0ed562f560c2289c5b113e742797727d126db /contrib/ipfilter/ipsend | |
| parent | 6f755e940898e80d77f95031600e671c36e0a7a6 (diff) | |
| download | FreeBSD-src-fd172ed3272b523c5499832d7098b6766bac7e4f.zip FreeBSD-src-fd172ed3272b523c5499832d7098b6766bac7e4f.tar.gz | |
Pullup IPFilter 4.1.28 from the vendor branch into HEAD.
MFC after: 7 days
Diffstat (limited to 'contrib/ipfilter/ipsend')
| -rw-r--r-- | contrib/ipfilter/ipsend/iptests.c | 8 | ||||
| -rw-r--r-- | contrib/ipfilter/ipsend/sock.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/contrib/ipfilter/ipsend/iptests.c b/contrib/ipfilter/ipsend/iptests.c index a58131d..0dd96b8 100644 --- a/contrib/ipfilter/ipsend/iptests.c +++ b/contrib/ipfilter/ipsend/iptests.c @@ -8,7 +8,7 @@ */ #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.8 2007/02/17 12:41:51 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.9 2007/09/13 07:19:34 darrenr Exp $"; #endif #include <sys/param.h> #include <sys/types.h> @@ -22,6 +22,9 @@ typedef int boolean_t; #endif #include <sys/time.h> #if !defined(__osf__) +# ifdef __NetBSD__ +# include <machine/lock.h> +# endif # define _KERNEL # define KERNEL # if !defined(solaris) && !defined(linux) && !defined(__sgi) && !defined(hpux) @@ -1097,7 +1100,8 @@ int ptest; struct tcpcb *tcbp, tcb; struct tcpiphdr ti; struct sockaddr_in sin; - int fd, slen; + int fd; + socklen_t slen; bzero((char *)&sin, sizeof(sin)); diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c index 7aac448..9a2cfc3 100644 --- a/contrib/ipfilter/ipsend/sock.c +++ b/contrib/ipfilter/ipsend/sock.c @@ -7,7 +7,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)sock.c 1.2 1/11/96 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.6 2007/02/17 12:41:51 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: sock.c,v 2.8.4.7 2007/09/13 07:19:34 darrenr Exp $"; #endif #include <sys/param.h> #include <sys/types.h> @@ -30,6 +30,9 @@ typedef int boolean_t; # include <sys/dir.h> #endif #if !defined(__osf__) +# ifdef __NetBSD__ +# include <machine/lock.h> +# endif # define _KERNEL # define KERNEL # ifdef ultrix @@ -385,7 +388,8 @@ struct in_addr gwip; { struct sockaddr_in rsin, lsin; struct tcpcb *t, tcb; - int fd, nfd, len; + int fd, nfd; + socklen_t len; printf("Dest. Port: %d\n", ti->ti_dport); |
