Patchwork manpage fixes for conntrack-tools

login
register
mail settings
Submitter Adrian Bridgett
Date March 19, 2012, 11:54 p.m.
Message ID <4F67C726.9090305@smop.co.uk>
Download mbox | patch
Permalink /patch/147689/
State Accepted
Headers show

Comments

Adrian Bridgett - March 19, 2012, 11:54 p.m.
I see that the netfilter-failover list is closed, hence the post here 
(I'll also send it the Ubuntu maintainer).

Just a few fixes to sync the manpages and binaries with each other 
(there are some key commands missing otherwise).

Thanks,

Adrian
Pablo Neira - March 20, 2012, 12:09 p.m.
On Mon, Mar 19, 2012 at 11:54:14PM +0000, Adrian Bridgett wrote:
> I see that the netfilter-failover list is closed, hence the post
> here (I'll also send it the Ubuntu maintainer).
> 
> Just a few fixes to sync the manpages and binaries with each other
> (there are some key commands missing otherwise).

Applied to git.netfilter.org, thanks Adrian.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff -Naur conntrack-tools-1.0.0.orig/conntrack.8 conntrack-tools-1.0.0/conntrack.8
--- conntrack-tools-1.0.0.orig/conntrack.8	2011-02-17 16:42:52.000000000 +0000
+++ conntrack-tools-1.0.0/conntrack.8	2012-03-19 23:43:38.869954690 +0000
@@ -6,17 +6,17 @@ 
 .SH NAME
 conntrack \- command line interface for netfilter connection tracking
 .SH SYNOPSIS
-.BR "conntrack -L [table] [-z]"
+.BR "conntrack -L [table] [options] [-z]"
 .br
 .BR "conntrack -G [table] parameters"
 .br
-.BR "conntrack -D [table] paramaters"
+.BR "conntrack -D [table] parameters"
 .br
 .BR "conntrack -I [table] parameters"
 .br
 .BR "conntrack -U [table] parameters"
 .br
-.BR "conntrack -E [table] parameters"
+.BR "conntrack -E [table] [options]"
 .br
 .BR "conntrack -F [table]"
 .br
diff -Naur conntrack-tools-1.0.0.orig/conntrackd.8 conntrack-tools-1.0.0/conntrackd.8
--- conntrack-tools-1.0.0.orig/conntrackd.8	2009-12-23 23:22:43.000000000 +0000
+++ conntrack-tools-1.0.0/conntrackd.8	2012-03-19 23:48:43.948131196 +0000
@@ -41,10 +41,16 @@ 
 Flush the kernel conntrack table (if you use a Linux kernel >= 2.6.29, this
 option will not flush your internal and external cache).
 .TP
+.BI "-c "
+Commit external cache to conntrack table.
+.TP
 .BI "-B "
 Force a bulk send to other replica firewalls. With this command, you will
 ask conntrackd to send the state-entries that it owns to others.
 .TP
+.BI "-n "
+Request resync with other node (only FT-FW and NOTRACK modes).
+.TP
 .BI "-k "
 Kill the daemon
 .TP
@@ -67,6 +73,10 @@ 
 .TP
 .BI "-h "
 Display help information.
+.TP
+.BI "-C config file"
+Configuration file path.
+.TP
 .SH DIAGNOSTICS
 The exit code is 0 for correct function. Errors cause an exit code of 1.
 .SH EXAMPLES
diff -Naur conntrack-tools-1.0.0.orig/src/main.c conntrack-tools-1.0.0/src/main.c
--- conntrack-tools-1.0.0.orig/src/main.c	2009-07-21 13:18:37.000000000 +0100
+++ conntrack-tools-1.0.0/src/main.c	2012-03-19 23:50:22.934104850 +0000
@@ -47,6 +47,7 @@ 
 	"  -s  [|network|cache|runtime|link|rsqueue|queue], dump statistics\n"
 	"  -R, resync with kernel conntrack table\n"
 	"  -n, request resync with other node (only FT-FW and NOTRACK modes)\n"
+	"  -B, force a bulk send to other replica firewalls\n"
 	"  -x, dump cache in XML format (requires -i or -e)\n"
 	"  -t, reset the kernel timeout (see PurgeTimeout clause)\n"
 	"  -v, display conntrackd version\n"