d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge the changes from 3.4.29 that didn't go cleanly due to conflicts

Browse Source
This commit is contained in:
Darren Reed 2002-08-28 13:45:36 +00:00
parent 14ba107c16
commit e7413bff80
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=102524
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ipfilter/ipmon.c
View File

@ -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';

7
contrib/ipfilter/man/ipmon.8
View File

@ -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