On Thu, Jun 25, 2015 at 12:02:21PM +0200, pfeiffer.szilard@xxxxxxxxxx wrote:
> From: Szilárd Pfeiffer <pfeiffer.szilard@xxxxxxxxxx>
>
> Signed-off-by: Szilárd Pfeiffer <pfeiffer.szilard@xxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
