diff options
| author | darrenr <darrenr@FreeBSD.org> | 2002-08-28 13:45:36 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2002-08-28 13:45:36 +0000 |
| commit | b6c99dc12d1df0bd6c5411ebc2532c7e80958f87 (patch) | |
| tree | 81b93fa5c42ca4d2d34cf81f86c9cdc19f3062a1 | |
| parent | 694c267c8d167aa37044133d07c98fa76a0de2cf (diff) | |
| download | FreeBSD-src-b6c99dc12d1df0bd6c5411ebc2532c7e80958f87.zip FreeBSD-src-b6c99dc12d1df0bd6c5411ebc2532c7e80958f87.tar.gz | |
merge the changes from 3.4.29 that didn't go cleanly due to conflicts
| -rw-r--r-- | contrib/ipfilter/ipmon.c | 4 | ||||
| -rw-r--r-- | contrib/ipfilter/man/ipmon.8 | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/contrib/ipfilter/ipmon.c b/contrib/ipfilter/ipmon.c index e3cd594..1b1cd71 100644 --- a/contrib/ipfilter/ipmon.c +++ b/contrib/ipfilter/ipmon.c @@ -961,13 +961,13 @@ int blen; *t++ = 'S'; lvl = LOG_ERR; } else if (ipf->fl_flags & FR_PASS) { - if (ipf->fl_flags & FR_LOGP) + if (ipf->fl_flags & FR_LOG) *t++ = 'p'; else *t++ = 'P'; lvl = LOG_NOTICE; } else if (ipf->fl_flags & FR_BLOCK) { - if (ipf->fl_flags & FR_LOGB) + if (ipf->fl_flags & FR_LOG) *t++ = 'b'; else *t++ = 'B'; diff --git a/contrib/ipfilter/man/ipmon.8 b/contrib/ipfilter/man/ipmon.8 index bea80de..043c131 100644 --- a/contrib/ipfilter/man/ipmon.8 +++ b/contrib/ipfilter/man/ipmon.8 @@ -47,8 +47,11 @@ 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, \fBb\fP for blocked, \fB\fP for a short -packet, \fBn\fP did not match any rules or \fBL\fP for a log rule. +5. The action: \fBp\fP for passed, \fBb\fP for blocked, \fBS\fP for a short +packet, \fBn\fP did not match any rules, \fBL\fP for a log rule. The order +of precedence in showing flags is: S, p, b, n, L. A capital \fBP\fP or +\fBB\fP means that the packet has been logged due to a global logging +setting, not a particular rule. .LP 6. The addresses. This is actually three fields: the source address and port |
