Module Name: src
Committed By: gutteridge
Date: Fri Jun 3 21:43:37 UTC 2022
Modified Files:
src/external/bsd/ipf/dist/man: ipf.8
src/external/bsd/ipf/dist/tools: ipf.c
Log Message:
ipf(8): document all -l options
References to "none", "state", and "nat" were missing in places.
Addresses PR bin/36763 from Wolfgang Stukenbrock.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ipf/dist/man/ipf.8
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/tools/ipf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ipf/dist/man/ipf.8
diff -u src/external/bsd/ipf/dist/man/ipf.8:1.1.1.1 src/external/bsd/ipf/dist/man/ipf.8:1.2
--- src/external/bsd/ipf/dist/man/ipf.8:1.1.1.1 Fri Mar 23 21:20:11 2012
+++ src/external/bsd/ipf/dist/man/ipf.8 Fri Jun 3 21:43:37 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: ipf.8,v 1.1.1.1 2012/03/23 21:20:11 christos Exp $
+.\" $NetBSD: ipf.8,v 1.2 2022/06/03 21:43:37 gutteridge Exp $
.\"
.TH IPF 8
.SH NAME
@@ -94,9 +94,10 @@ lists.
.B \-I
Set the list to make changes to the inactive list.
.TP
-.B \-l \0<pass|block|nomatch>
+.B \-l \0<block|pass|nomatch|none|state|nat>
Use of the \fB-l\fP flag toggles default logging of packets. Valid
-arguments to this option are \fBpass\fP, \fBblock\fP and \fBnomatch\fP.
+arguments to this option are \fBpass\fP, \fBblock\fP, \fBnomatch\fP,
+\fBnone\fP, \fBstate\fP, and \fBnat\fP.
When an option is set, any packet which exits filtering and matches the
set category is logged. This is most useful for causing all packets
which don't match any of the loaded rules to be logged.
Index: src/external/bsd/ipf/dist/tools/ipf.c
diff -u src/external/bsd/ipf/dist/tools/ipf.c:1.3 src/external/bsd/ipf/dist/tools/ipf.c:1.4
--- src/external/bsd/ipf/dist/tools/ipf.c:1.3 Sun Feb 4 08:19:42 2018
+++ src/external/bsd/ipf/dist/tools/ipf.c Fri Jun 3 21:43:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ipf.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
+/* $NetBSD: ipf.c,v 1.4 2022/06/03 21:43:37 gutteridge Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -66,7 +66,7 @@ static ioctlfunc_t iocfunctions[IPL_LOGS
static void usage()
{
fprintf(stderr, "usage: ipf [-6AdDEInoPrRsvVyzZ] %s %s %s\n",
- "[-l block|pass|nomatch|state|nat]", "[-cc] [-F i|o|a|s|S|u]",
+ "[-l block|pass|nomatch|none|state|nat]", "[-cc] [-F i|o|a|s|S|u]",
"[-f filename] [-T <tuneopts>]");
exit(1);
}
