stmt: rename nat "random-fully" option to "fully-random"

Use proper english for full randomization option.

Signed-off-by: Patrick McHardy

diff --git a/src/parser_bison.y b/src/parser_bison.y
index 6c7a036a1a15a2ddad8b40e888098e27d8b7c89a..515a11a0161e89b354dcbeaaaac8e748cc252463 100644 (file)
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -378,7 +378,7 @@ static void location_update(struct location *loc, struct location *rhs, int n)
 %token MASQUERADE              "masquerade"
 %token REDIRECT                        "redirect"
 %token RANDOM                  "random"
-%token RANDOM_FULLY            "random-fully"
+%token FULLY_RANDOM            "fully-random"
 %token PERSISTENT              "persistent"
 
 %token QUEUE                   "queue"
@@ -1462,7 +1462,7 @@ nf_nat_flags              :       nf_nat_flag
                        ;
 
 nf_nat_flag            :       RANDOM          { $$ = NF_NAT_RANGE_PROTO_RANDOM; }
-                       |       RANDOM_FULLY    { $$ = NF_NAT_RANGE_PROTO_RANDOM_FULLY; }
+                       |       FULLY_RANDOM    { $$ = NF_NAT_RANGE_PROTO_RANDOM_FULLY; }
                        |       PERSISTENT      { $$ = NF_NAT_RANGE_PERSISTENT; }
                        ;
 

diff --git a/src/scanner.l b/src/scanner.l
index 72b544714714408f7122a3869d5065d1f814bb25..17231594edc0150ef63fbdd82100557da1ee147c 100644 (file)
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -321,7 +321,7 @@ addrstring  ({macaddr}|{ip4addr}|{ip6addr})
 "masquerade"           { return MASQUERADE; }
 "redirect"             { return REDIRECT; }
 "random"               { return RANDOM; }
-"random-fully"         { return RANDOM_FULLY; }
+"fully-random"         { return FULLY_RANDOM; }
 "persistent"           { return PERSISTENT; }
 
 "ll"                   { return LL_HDR; }

diff --git a/src/statement.c b/src/statement.c
index 2587d2754b1f07a861b241522ce37cb3f1fc19b6..83abfeaca43e813eccffd85fb7d7bbbb0c8a9daa 100644 (file)
--- a/src/statement.c
+++ b/src/statement.c
@@ -287,7 +287,7 @@ static void print_nf_nat_flags(uint32_t flags)
        }
 
        if (flags & NF_NAT_RANGE_PROTO_RANDOM_FULLY) {
-               printf("%srandom-fully", delim);
+               printf("%sfully-random", delim);
                delim = ",";
        }