src-test/contrib/ipfilter/tools, branch main FreeBSD source tree https://cgit-dev.freebsd.org/src-test/atom?h=main 2020-07-17T19:07:53Z -4 and -6 only make sense with -i, -o, and -t. 2020-07-17T19:07:53Z Cy Schubert cy@FreeBSD.org 2020-07-17T19:07:53Z urn:sha1:64a1886d5c466022cc4a4795fec6b869a43304d5 PR: 247952 MFC after: 1 week The output from usage() need not contain usage for -t when STATETOP 2020-07-17T19:07:50Z Cy Schubert cy@FreeBSD.org 2020-07-17T19:07:50Z urn:sha1:ebdefe6cb43ce7573d86b13cbaad2d3fdbb9c6ff is not compiled in. PR: 247952 MFC after: 1 week Make ipfstat -t header generic when IPv4 and IPv6 output are 2020-07-17T19:07:47Z Cy Schubert cy@FreeBSD.org 2020-07-17T19:07:47Z urn:sha1:e082c89385d542a74b7e30a534d83297be1d9426 displayed in the same display. PR: 247952 MFC after: 1 week ipfstat -t defaults to IPv4 output. Make consistent with ipfstat -i 2020-07-17T19:07:44Z Cy Schubert cy@FreeBSD.org 2020-07-17T19:07:44Z urn:sha1:08c24e2f886854e8eadb9a522a451fcc6a78480a 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 Historically ipfstat listings and stats only listed IPv4 or IPv6 output. 2020-07-17T19:07:40Z Cy Schubert cy@FreeBSD.org 2020-07-17T19:07:40Z urn:sha1:88b86bb0f3eb922e893837d83f1423e43e798517 ipfstat would list IPv4 outputs by default while -6 would produce IPv6 outputs. This commit combines the ipfstat -i and -o outputs into one listing of IPv4 and IPv6 rules. The -4 option lists only IPv4 rules (as the default before) while -6 continues to list only rules that affect IPv6. PR: 247952 Reported by: joeb1@a1poweruser.com MFC after: 1 week fr_family (the protocol family) must be AF_INET or AF_INET6, as in 2020-07-17T19:07:37Z Cy Schubert cy@FreeBSD.org 2020-07-17T19:07:37Z urn:sha1:5317660176971eac99d07f4af30a83537ecdeea6 the kernel, not an arbitrary 4 or 6. This only affected printing ipfilter stats and rules from a kernel dump. (This is currently undocumented.) PR: 247952 MFC after: 1 week Only use the use_inet6 variable when INET6 is a build option. 2020-07-17T19:07:34Z Cy Schubert cy@FreeBSD.org 2020-07-17T19:07:34Z urn:sha1:ce1c2aafce7f78e4f5a2722affc039ef38aa3ab9 This is a prerequisite to upcoming argument processing cleanups which will resolve consistency as was done with ippool previously. PR: 247952 MFC after: 1 week ipfilter: remove duplicate definition of 'thishost' 2020-03-29T02:26:58Z Kyle Evans kevans@FreeBSD.org 2020-03-29T02:26:58Z urn:sha1:0690ee732ae01493bc6b5c053808f79c22882a91 thishost is already defined in lib/initparse.c; no need for this one. This fixes the ipfilter build with -fno-common. -fno-common will become the default in GCC10/LLVM11. MFC after: 3 days As with ipf(8), give ippool(8) the ability to load IP pools from multiple 2020-02-18T11:26:49Z Cy Schubert cy@FreeBSD.org 2020-02-18T11:26:49Z urn:sha1:9658b6b3f4f37d543575cebbca9f4ab5d4e77ced files. This allows for loading, during the same invocation of ippool, of multiple sources of input using multiple tools to concurrently maintain the files such as fail2ban, macro preprocessors, and manually. MFC after: 1 week Implement the dynamic add (-A) and removal (-R) of ippool pools 2019-09-27T00:29:12Z Cy Schubert cy@FreeBSD.org 2019-09-27T00:29:12Z urn:sha1:a97e8d2fe49304de1d9ea3c866dfbf6cce5aaa4b from the command line. Prior to this the functionality was mostly there however since the pool type (-t) was not recognized by the -A and -R command options -- not recognized by getopt(). Additionally the code to implement the dynamic add and removal of pools didn't work. When dynamically adding (-A) a pool a type (-t) to specify if the pool is a tree or hash pool must be specified. When dynamically removing (-R) a pool, omitting -t will cause a search-and-destroy which will remove both types of pools matching the name given (-m). PR: 218433 MFC after: 1 week