diff options
author | darrenr <darrenr@FreeBSD.org> | 2001-07-28 12:08:15 +0000 |
---|---|---|
committer | darrenr <darrenr@FreeBSD.org> | 2001-07-28 12:08:15 +0000 |
commit | 453a967eab270343b367b1a6c183e3d8582f4fc7 (patch) | |
tree | da20ce5784358fda6a3d0ef3d4acbcda267627b2 /contrib/ipfilter/ipsend | |
parent | 99e3b6df8393bbba193b443140fea021aa898be9 (diff) | |
download | FreeBSD-src-453a967eab270343b367b1a6c183e3d8582f4fc7.zip FreeBSD-src-453a967eab270343b367b1a6c183e3d8582f4fc7.tar.gz |
fix conflicts created by import
Diffstat (limited to 'contrib/ipfilter/ipsend')
-rw-r--r-- | contrib/ipfilter/ipsend/ipsend.c | 14 | ||||
-rw-r--r-- | contrib/ipfilter/ipsend/iptests.c | 15 | ||||
-rw-r--r-- | contrib/ipfilter/ipsend/sbpf.c | 6 | ||||
-rw-r--r-- | contrib/ipfilter/ipsend/sock.c | 14 |
4 files changed, 22 insertions, 27 deletions
diff --git a/contrib/ipfilter/ipsend/ipsend.c b/contrib/ipfilter/ipsend/ipsend.c index b047dd0..41eb7ec 100644 --- a/contrib/ipfilter/ipsend/ipsend.c +++ b/contrib/ipfilter/ipsend/ipsend.c @@ -7,14 +7,8 @@ * conditions, enough of the TCP header is missing for unpredictable * results unless the filter is aware that this can happen. * - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and due credit is given - * to the original author and the contributors. + * See the IPFILTER.LICENCE file for details on licencing. */ -#if !defined(lint) -static const char sccsid[] = "@(#)ipsend.c 1.5 12/10/95 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD$"; -#endif #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -37,6 +31,12 @@ static const char rcsid[] = "@(#)$FreeBSD$"; #include "ipsend.h" #include "ipf.h" +#if !defined(lint) +static const char sccsid[] = "@(#)ipsend.c 1.5 12/10/95 (C)1995 Darren Reed"; +/* static const char rcsid[] = "@(#)$Id: ipsend.c,v 2.2.2.3 2001/07/15 22:00:14 darrenr Exp $"; */ +static const char rcsid[] = "@(#)$FreeBSD$"; +#endif + extern char *optarg; extern int optind; diff --git a/contrib/ipfilter/ipsend/iptests.c b/contrib/ipfilter/ipsend/iptests.c index d22fd5a..14c4b3c 100644 --- a/contrib/ipfilter/ipsend/iptests.c +++ b/contrib/ipfilter/ipsend/iptests.c @@ -1,16 +1,8 @@ /* * Copyright (C) 1993-1998 by Darren Reed. * - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and due credit is given - * to the original author and the contributors. - * - * $FreeBSD$ + * See the IPFILTER.LICENCE file for details on licencing. */ -#if !defined(lint) -static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: iptests.c,v 2.1 1999/08/04 17:31:09 darrenr Exp $"; -#endif #include <stdio.h> #include <unistd.h> #include <stdlib.h> @@ -83,6 +75,11 @@ static const char rcsid[] = "@(#)$Id: iptests.c,v 2.1 1999/08/04 17:31:09 darren #endif #include "ipsend.h" +#if !defined(lint) +static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; +static const char rcsid[] = "@(#)$FreeBSD$"; +#endif + #define PAUSE() tv.tv_sec = 0; tv.tv_usec = 10000; \ (void) select(0, NULL, NULL, NULL, &tv) diff --git a/contrib/ipfilter/ipsend/sbpf.c b/contrib/ipfilter/ipsend/sbpf.c index 2a1ce60..5a97ec7 100644 --- a/contrib/ipfilter/ipsend/sbpf.c +++ b/contrib/ipfilter/ipsend/sbpf.c @@ -2,9 +2,7 @@ /* * (C)opyright 1995-1998 Darren Reed. (from tcplog) * - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and due credit is given - * to the original author and the contributors. + * See the IPFILTER.LICENCE file for details on licencing. */ #include <stdio.h> #include <netdb.h> @@ -44,7 +42,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)sbpf.c 1.3 8/25/95 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: sbpf.c,v 2.1 1999/08/04 17:31:13 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: sbpf.c,v 2.1.4.1 2001/06/26 10:43:22 darrenr Exp $"; #endif /* diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c index 77e53de..f6aef25 100644 --- a/contrib/ipfilter/ipsend/sock.c +++ b/contrib/ipfilter/ipsend/sock.c @@ -2,14 +2,8 @@ /* * sock.c (C) 1995-1998 Darren Reed * - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and due credit is given - * to the original author and the contributors. + * See the IPFILTER.LICENCE file for details on licencing. */ -#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.1.4.1 2000/12/16 21:05:44 darrenr Exp $"; -#endif #include <stdio.h> #include <unistd.h> #include <string.h> @@ -68,6 +62,12 @@ static const char rcsid[] = "@(#)$Id: sock.c,v 2.1.4.1 2000/12/16 21:05:44 darre #include <netinet/tcp_var.h> #include "ipsend.h" +#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.1.4.3 2001/07/15 22:00:14 darrenr Exp $"; +#endif + + int nproc; struct proc *proc; |