* [PATCH] conntrack: made the manual page and help consistent in case of proto option
@ 2015-06-25 10:02 pfeiffer.szilard
2015-06-26 8:29 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: pfeiffer.szilard @ 2015-06-25 10:02 UTC (permalink / raw)
To: netfilter-devel; +Cc: pfeiffer.szilard
From: Szilárd Pfeiffer <pfeiffer.szilard@balabit.hu>
Signed-off-by: Szilárd Pfeiffer <pfeiffer.szilard@balabit.hu>
---
conntrack.8 | 2 +-
src/conntrack.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/conntrack.8 b/conntrack.8
index abc26c5..ac82f33 100644
--- a/conntrack.8
+++ b/conntrack.8
@@ -127,7 +127,7 @@ Match only entries whose source address in the reply direction equals the one sp
.BI "-q, --reply-dst " IP_ADDRESS
Match only entries whose destination address in the reply direction equals the one specified as argument.
.TP
-.BI "-p, --proto " "PROTO "
+.BI "-p, --protocol " "PROTO "
Specify layer four (TCP, UDP, ...) protocol.
.TP
.BI "-f, --family " "PROTO"
diff --git a/src/conntrack.c b/src/conntrack.c
index f6d7d9a..f7d37fb 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -279,7 +279,7 @@ static const char *optflags[NUMBER_OF_OPT] = {
[CT_OPT_ORIG_DST_BIT] = "dst",
[CT_OPT_REPL_SRC_BIT] = "reply-src",
[CT_OPT_REPL_DST_BIT] = "reply-dst",
- [CT_OPT_PROTO_BIT] = "protonum",
+ [CT_OPT_PROTO_BIT] = "protocol",
[CT_OPT_TIMEOUT_BIT] = "timeout",
[CT_OPT_STATUS_BIT] = "status",
[CT_OPT_ZERO_BIT] = "zero",
@@ -322,7 +322,7 @@ static struct option original_opts[] = {
{"dst", 1, 0, 'd'},
{"reply-src", 1, 0, 'r'},
{"reply-dst", 1, 0, 'q'},
- {"protonum", 1, 0, 'p'},
+ {"protocol", 1, 0, 'p'},
{"timeout", 1, 0, 't'},
{"status", 1, 0, 'u'},
{"zero", 0, 0, 'z'},
@@ -502,7 +502,7 @@ static const char usage_parameters[] =
" -d, --orig-dst ip\t\tDestination address from original direction\n"
" -r, --reply-src ip\t\tSource addres from reply direction\n"
" -q, --reply-dst ip\t\tDestination address from reply direction\n"
- " -p, --protonum proto\t\tLayer 4 Protocol, eg. 'tcp'\n"
+ " -p, --protocol proto\t\tLayer 4 Protocol, eg. 'tcp'\n"
" -f, --family proto\t\tLayer 3 Protocol, eg. 'ipv6'\n"
" -t, --timeout timeout\t\tSet timeout\n"
" -u, --status status\t\tSet status, eg. ASSURED\n"
--
2.1.0
--
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] conntrack: made the manual page and help consistent in case of proto option
2015-06-25 10:02 [PATCH] conntrack: made the manual page and help consistent in case of proto option pfeiffer.szilard
@ 2015-06-26 8:29 ` Pablo Neira Ayuso
0 siblings, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2015-06-26 8:29 UTC (permalink / raw)
To: pfeiffer.szilard; +Cc: netfilter-devel
On Thu, Jun 25, 2015 at 12:02:21PM +0200, pfeiffer.szilard@balabit.hu wrote:
> From: Szilárd Pfeiffer <pfeiffer.szilard@balabit.hu>
>
> Signed-off-by: Szilárd Pfeiffer <pfeiffer.szilard@balabit.hu>
> ---
> conntrack.8 | 2 +-
> src/conntrack.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/conntrack.8 b/conntrack.8
> index abc26c5..ac82f33 100644
> --- a/conntrack.8
> +++ b/conntrack.8
> @@ -127,7 +127,7 @@ Match only entries whose source address in the reply direction equals the one sp
> .BI "-q, --reply-dst " IP_ADDRESS
> Match only entries whose destination address in the reply direction equals the one specified as argument.
> .TP
> -.BI "-p, --proto " "PROTO "
> +.BI "-p, --protocol " "PROTO "
> Specify layer four (TCP, UDP, ...) protocol.
> .TP
> .BI "-f, --family " "PROTO"
> diff --git a/src/conntrack.c b/src/conntrack.c
> index f6d7d9a..f7d37fb 100644
> --- a/src/conntrack.c
> +++ b/src/conntrack.c
> @@ -279,7 +279,7 @@ static const char *optflags[NUMBER_OF_OPT] = {
> [CT_OPT_ORIG_DST_BIT] = "dst",
> [CT_OPT_REPL_SRC_BIT] = "reply-src",
> [CT_OPT_REPL_DST_BIT] = "reply-dst",
> - [CT_OPT_PROTO_BIT] = "protonum",
> + [CT_OPT_PROTO_BIT] = "protocol",
> [CT_OPT_TIMEOUT_BIT] = "timeout",
> [CT_OPT_STATUS_BIT] = "status",
> [CT_OPT_ZERO_BIT] = "zero",
> @@ -322,7 +322,7 @@ static struct option original_opts[] = {
> {"dst", 1, 0, 'd'},
> {"reply-src", 1, 0, 'r'},
> {"reply-dst", 1, 0, 'q'},
> - {"protonum", 1, 0, 'p'},
> + {"protocol", 1, 0, 'p'},
You have to keep --protonum in place as an alias, this may break
existing scripts. Then, keep --protocol from the manpage so we
encourage users to adopt it.
Please, also add some tests so we can make sure this doesn't break
anything. Thanks.
--
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] conntrack: made the manual page and help consistent in case of proto option
@ 2015-06-25 10:11 pfeiffer.szilard
0 siblings, 0 replies; 3+ messages in thread
From: pfeiffer.szilard @ 2015-06-25 10:11 UTC (permalink / raw)
To: netfilter-devel; +Cc: pfeiffer.szilard
From: Szilárd Pfeiffer <pfeiffer.szilard@balabit.hu>
Signed-off-by: Szilárd Pfeiffer <pfeiffer.szilard@balabit.hu>
---
conntrack.8 | 2 +-
src/conntrack.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/conntrack.8 b/conntrack.8
index abc26c5..ac82f33 100644
--- a/conntrack.8
+++ b/conntrack.8
@@ -127,7 +127,7 @@ Match only entries whose source address in the reply direction equals the one sp
.BI "-q, --reply-dst " IP_ADDRESS
Match only entries whose destination address in the reply direction equals the one specified as argument.
.TP
-.BI "-p, --proto " "PROTO "
+.BI "-p, --protocol " "PROTO "
Specify layer four (TCP, UDP, ...) protocol.
.TP
.BI "-f, --family " "PROTO"
diff --git a/src/conntrack.c b/src/conntrack.c
index f6d7d9a..f7d37fb 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -279,7 +279,7 @@ static const char *optflags[NUMBER_OF_OPT] = {
[CT_OPT_ORIG_DST_BIT] = "dst",
[CT_OPT_REPL_SRC_BIT] = "reply-src",
[CT_OPT_REPL_DST_BIT] = "reply-dst",
- [CT_OPT_PROTO_BIT] = "protonum",
+ [CT_OPT_PROTO_BIT] = "protocol",
[CT_OPT_TIMEOUT_BIT] = "timeout",
[CT_OPT_STATUS_BIT] = "status",
[CT_OPT_ZERO_BIT] = "zero",
@@ -322,7 +322,7 @@ static struct option original_opts[] = {
{"dst", 1, 0, 'd'},
{"reply-src", 1, 0, 'r'},
{"reply-dst", 1, 0, 'q'},
- {"protonum", 1, 0, 'p'},
+ {"protocol", 1, 0, 'p'},
{"timeout", 1, 0, 't'},
{"status", 1, 0, 'u'},
{"zero", 0, 0, 'z'},
@@ -502,7 +502,7 @@ static const char usage_parameters[] =
" -d, --orig-dst ip\t\tDestination address from original direction\n"
" -r, --reply-src ip\t\tSource addres from reply direction\n"
" -q, --reply-dst ip\t\tDestination address from reply direction\n"
- " -p, --protonum proto\t\tLayer 4 Protocol, eg. 'tcp'\n"
+ " -p, --protocol proto\t\tLayer 4 Protocol, eg. 'tcp'\n"
" -f, --family proto\t\tLayer 3 Protocol, eg. 'ipv6'\n"
" -t, --timeout timeout\t\tSet timeout\n"
" -u, --status status\t\tSet status, eg. ASSURED\n"
--
2.1.0
--
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-26 8:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-25 10:02 [PATCH] conntrack: made the manual page and help consistent in case of proto option pfeiffer.szilard
2015-06-26 8:29 ` Pablo Neira Ayuso
-- strict thread matches above, loose matches on Subject: below --
2015-06-25 10:11 pfeiffer.szilard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).