diff options
| author | darrenr <darrenr@FreeBSD.org> | 2002-04-25 03:36:26 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2002-04-25 03:36:26 +0000 |
| commit | 960bcab6dcd53f84a17098b9f8ec58d53490d247 (patch) | |
| tree | ac577f57aca64b993a1e18367f8f051ced52eadf /contrib | |
| parent | 55f03cec9767c12cbb01e83c0638a87998a86f62 (diff) | |
| download | FreeBSD-src-960bcab6dcd53f84a17098b9f8ec58d53490d247.zip FreeBSD-src-960bcab6dcd53f84a17098b9f8ec58d53490d247.tar.gz | |
resolve conflicts from import
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ipfilter/ipsend/ipsend.c | 1 | ||||
| -rw-r--r-- | contrib/ipfilter/man/ipmon.8 | 3 | ||||
| -rwxr-xr-x | contrib/ipfilter/test/logtest | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/contrib/ipfilter/ipsend/ipsend.c b/contrib/ipfilter/ipsend/ipsend.c index 688cc9e..3d3b5bc 100644 --- a/contrib/ipfilter/ipsend/ipsend.c +++ b/contrib/ipfilter/ipsend/ipsend.c @@ -32,7 +32,6 @@ #include <netinet/ip_var.h> #endif #include "ipsend.h" -#include "ipf.h" #if !defined(lint) static const char sccsid[] = "@(#)ipsend.c 1.5 12/10/95 (C)1995 Darren Reed"; diff --git a/contrib/ipfilter/man/ipmon.8 b/contrib/ipfilter/man/ipmon.8 index 3697be3..bea80de 100644 --- a/contrib/ipfilter/man/ipmon.8 +++ b/contrib/ipfilter/man/ipmon.8 @@ -47,7 +47,8 @@ long). 4. The group and rule number of the rule, e.g., \fB@0:17\fP. These can be viewed with \fBipfstat -n\fP. .LP -5. The action: \fBp\fP for passed or \fBb\fP for blocked. +5. The action: \fBp\fP for passed, \fBb\fP for blocked, \fB\fP for a short +packet, \fBn\fP did not match any rules or \fBL\fP for a log rule. .LP 6. The addresses. This is actually three fields: the source address and port diff --git a/contrib/ipfilter/test/logtest b/contrib/ipfilter/test/logtest index 4e7615d..16abed9 100755 --- a/contrib/ipfilter/test/logtest +++ b/contrib/ipfilter/test/logtest @@ -23,15 +23,15 @@ echo "$1..."; /bin/rm -f logout exit 1 fi - TZ=Australia/Victoria ../ipmon -P /dev/null -f logout >> results/$1 + TZ=GMT ../ipmon -P /dev/null -f logout >> results/$1 echo "--------" >> results/$1 - TZ=Australia/Victoria ../ipmon -P /dev/null -bf logout >> results/$1.b + TZ=GMT ../ipmon -P /dev/null -bf logout >> results/$1.b echo "--------" >> results/$1.b done ) < regress/$1 ../ipftest -br regress/$1 -Hi input/$1 -l logout > /dev/null -TZ=Australia/Victoria ../ipmon -P /dev/null -f logout >> results/$1 +TZ=GMT ../ipmon -P /dev/null -f logout >> results/$1 echo "--------" >> results/$1 -TZ=Australia/Victoria ../ipmon -P /dev/null -bf logout >> results/$1.b +TZ=GMT ../ipmon -P /dev/null -bf logout >> results/$1.b echo "--------" >> results/$1.b cmp expected/$1 results/$1 |
