[PATCH] conntrack: Replace remaining occurances of --src, --dst options with --orig-src, --orig-dst

[PATCH] conntrack: Replace remaining occurances of --src, --dst options with --orig-src, --orig-dst

[Mart Frauenlob]

The old options --src and --dst were still defined at two places.
Replaced with according --orig-src and --orig-dst entry.

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

diff --git a/src/conntrack.c b/src/conntrack.c
index b384e07..076d8a3 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -282,8 +282,8 @@ enum ct_options {
 		       CT_OPT_ORIG_ZONE | CT_OPT_REPL_ZONE)
 
 static const char *optflags[NUMBER_OF_OPT] = {
-	[CT_OPT_ORIG_SRC_BIT] 	= "src",
-	[CT_OPT_ORIG_DST_BIT]	= "dst",
+	[CT_OPT_ORIG_SRC_BIT] 	= "orig-src",
+	[CT_OPT_ORIG_DST_BIT]	= "orig-dst",
 	[CT_OPT_REPL_SRC_BIT]	= "reply-src",
 	[CT_OPT_REPL_DST_BIT]	= "reply-dst",
 	[CT_OPT_PROTO_BIT]	= "protonum",
@@ -2468,7 +2468,7 @@ int main(int argc, char *argv[])
 		case -1:
 		case 0:
 			exit_error(PARAMETER_PROBLEM, "you have to specify "
-						      "`--src' and `--dst'");
+						      "`--orig-src' and `--orig-dst'");
 			break;
 		case 1:
 			exit_error(PARAMETER_PROBLEM, "you have to specify "
-- 
1.7.2.5

Re: [PATCH] conntrack: Replace remaining occurances of --src, --dst options with --orig-src, --orig-dst

[Pablo Neira Ayuso]

On Tue, Apr 05, 2016 at 08:44:52AM +0200, Mart Frauenlob wrote:
> The old options --src and --dst were still defined at two places.
> Replaced with according --orig-src and --orig-dst entry.

--src is valid shortcut.

This breaks backward compatibility.

Re: [PATCH] conntrack: Replace remaining occurances of --src, --dst options with --orig-src, --orig-dst

[Mart Frauenlob]

On 07.04.2016 11:40, Pablo Neira Ayuso wrote:
> On Tue, Apr 05, 2016 at 08:44:52AM +0200, Mart Frauenlob wrote:
>> The old options --src and --dst were still defined at two places.
>> Replaced with according --orig-src and --orig-dst entry.
>
> --src is valid shortcut.
>
> This breaks backward compatibility.
>


ok, so I'll update the docs, to also show --src?

Re: [PATCH] conntrack: Replace remaining occurances of --src, --dst options with --orig-src, --orig-dst

[Pablo Neira Ayuso]

On Thu, Apr 07, 2016 at 07:24:55PM +0200, Mart Frauenlob wrote:
> On 07.04.2016 11:40, Pablo Neira Ayuso wrote:
> >On Tue, Apr 05, 2016 at 08:44:52AM +0200, Mart Frauenlob wrote:
> >>The old options --src and --dst were still defined at two places.
> >>Replaced with according --orig-src and --orig-dst entry.
> >
> >--src is valid shortcut.
> >
> >This breaks backward compatibility.
> 
> ok, so I'll update the docs, to also show --src?

yes please, thanks :)