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

ipfstat -t defaults to IPv4 output. Make consistent with ipfstat -i

Browse Source 
and ipfstat -o where without an argument IPv4 and IPv6 states are
shown. Use -4 and -6 to limit the display to IPv4 or IPv6 respectively.

PR:		247952
MFC after:	1 week
This commit is contained in:
Cy Schubert 2020-07-17 19:07:44 +00:00
parent 88b86bb0f3
commit 08c24e2f88
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=363280
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/ipfilter/man/ipfstat.8
View File

@ -195,4 +195,5 @@ more entries is to resize the screen.
.SH SEE ALSO
ipf(8)
.SH BUGS
\fB-4\fP and \fB-6\fP should also be the default when displaying states.
\fB-4\fP and \fB-6\fP are only valid with \fB-i\fP, \fB-o\fP, and \fB-t\fP.
An error should result when used with other arguments.

6
contrib/ipfilter/tools/ipfstat.c
View File

@ -421,9 +421,9 @@ int main(argc,argv)
else if (opts & OPT_STATETOP)
topipstates(saddr, daddr, sport, dport, protocol,
#ifdef USE_INET6
use_inet6 && !use_inet4 ? 6 : 4,
use_inet6 && use_inet4 ? 0 : use_inet6 && !use_inet4 ? 6 : 4,
#else
4,
4,
#endif
#endif
refreshtime, topclosed, filter);
@ -1367,7 +1367,7 @@ static void topipstates(saddr, daddr, sport, dport, protocol, ver,
if (ipsstp->iss_list == NULL)
break;
if (ips.is_v != ver)
if (ver != 0 && ips.is_v != ver)
continue;
if ((filter != NULL) &&