[PATCH 0/4] nfct: documentation updates and corrections.

[PATCH 0/4] nfct: documentation updates and corrections.

[Mart Frauenlob]

Good day,

this series includes some documentation updates and corrections for nfct.

For the first patch: add missing commands to usage output,

I was not able to trigger the usage output. I think the parser is broken.

Best regards,
Mart

[PATCH 1/4] nfct: add missing commands to usage output.

[Mart Frauenlob]

Signed-off-by: Mart Frauenlob <mart.frauenlob@chello.at>
---
 src/nfct.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/nfct.c b/src/nfct.c
index 3331e5b..27841be 100644
--- a/src/nfct.c
+++ b/src/nfct.c
@@ -204,6 +204,9 @@ static const char help_msg[] =
 	"  add object-name\tAdd new accounting object to table\n"
 	"  delete object-name\tDelete existing accounting object\n"
 	"  get object-name\tGet existing accounting object\n"
+	"  disable\t\tDisable queueing packets to userspace for helper inspection\n"
+	"  default-set\t\tSet default timeouts\n"
+	"  default-get\t\tGet default timeouts\n"
 	"  flush\t\t\tFlush accounting object table\n";
 
 static int nfct_cmd_help(int argc, char *argv[])
-- 
1.7.2.5

[PATCH 2/4] nfct: correct command list in timeout usage error message.

[Mart Frauenlob]

Signed-off-by: Mart Frauenlob <mart.frauenlob@chello.at>
---
 src/nfct-extensions/timeout.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/nfct-extensions/timeout.c b/src/nfct-extensions/timeout.c
index 1cb04a1..30f9464 100644
--- a/src/nfct-extensions/timeout.c
+++ b/src/nfct-extensions/timeout.c
@@ -32,7 +32,7 @@ static void
 nfct_cmd_timeout_usage(char *argv[])
 {
 	fprintf(stderr, "nfct v%s: Missing command\n"
-			"%s <list|add|delete|get|flush|set> timeout "
+			"%s <list|add|delete|get|default-set|default-get|flush> timeout "
 			"[<parameters>, ...]\n", VERSION, argv[0]);
 }
 
-- 
1.7.2.5

[PATCH 3/4] nfct: helper: correct error messages.

[Mart Frauenlob]

Signed-off-by: Mart Frauenlob <mart.frauenlob@chello.at>
---
 src/nfct-extensions/helper.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nfct-extensions/helper.c b/src/nfct-extensions/helper.c
index dfc55e7..0569827 100644
--- a/src/nfct-extensions/helper.c
+++ b/src/nfct-extensions/helper.c
@@ -33,7 +33,7 @@ static void
 nfct_cmd_helper_usage(char *argv[])
 {
 	fprintf(stderr, "nfct v%s: Missing command\n"
-			"%s helper list|add|delete|get|flush "
+			"%s helper list|add|delete|disable|get|flush "
 			"[parameters...]\n", VERSION, argv[0]);
 }
 
@@ -408,7 +408,7 @@ nfct_cmd_helper_disable(struct mnl_socket *nl, int argc, char *argv[])
 
 	if (argc < 6) {
 		nfct_perror("missing parameters\n"
-			    "syntax: nfct add helper name family protocol");
+			    "syntax: nfct disable helper name family protocol");
 		return -1;
 	}
 
-- 
1.7.2.5

[PATCH 4/4] nfct: man: add missing comands

[Mart Frauenlob]

The missing commands: flush, disable, default-set and default-get
were added to the manpage.
The description of the subsystem has been corrected.

Signed-off-by: Mart Frauenlob <mart.frauenlob@chello.at>
---
 nfct.8 |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/nfct.8 b/nfct.8
index 336d9cd..c38bdbe 100644
--- a/nfct.8
+++ b/nfct.8
@@ -23,9 +23,23 @@ Delete an object.
 .TP
 .BI "get "
 Get an existing object.
+.TP
+.BI "flush "
+Flush the accounting object table.
+.TP
+.BI "disable "
+This command is for the helper subsystem. It allows you to disable enqueueing packets to userspace for helper inspection.
+.TP
+.BI "default-set "
+This command is for the timeout subsystem. It allows you to set default protocol timeouts.
+.TP
+.BI "default-get "
+This command is for the timeout subsystem. It allows you to get the default protocol timeouts.
 .SH SUBSYS
-By the time this manpage has been written, the supported subsystem are
+By the time this manpage has been written, the supported subsystems are
 .B timeout
+and
+.B helper.
 .TP
 .BI "timeout "
 The timeout subsystem allows you to define fine-grain timeout policies.
-- 
1.7.2.5

Re: [PATCH 0/4] nfct: documentation updates and corrections.

[Pablo Neira Ayuso]

On Fri, Apr 08, 2016 at 08:18:40AM +0200, Mart Frauenlob wrote:
> 
> Good day,
> 
> this series includes some documentation updates and corrections for nfct.

Series applied.

> For the first patch: add missing commands to usage output,
> 
> I was not able to trigger the usage output. I think the parser is broken.

Yes, this is broken.

It would be good to add getopt_long to disable the help and version
via -h and -v. Similar what we have in nft.

Re: [PATCH 0/4] nfct: documentation updates and corrections.

[Mart Frauenlob]

On 08.04.2016 12:36, Pablo Neira Ayuso wrote:
> On Fri, Apr 08, 2016 at 08:18:40AM +0200, Mart Frauenlob wrote:
>>
>> Good day,
>>
>> this series includes some documentation updates and corrections for nfct.
>
> Series applied.

Where to? I don't see it on master branch.