iptnl/ip6tnl: Unify ttl/hoplimit parsing routines

Handle "inherit" case properly for gre6 and ip6tnl.

Use get_u8() in gre to parse ttl/hoplimit.

Be consistent about "hlim" alias to ttl/hoplimit
support.

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/ip/link_gre.c b/ip/link_gre.c
index 6254e8875135088facb9e363242da76427ea0bde..009ddfc753c8bbdb303dc764034c655e6d77b7ea 100644 (file)
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@ -229,16 +229,12 @@ get_failed:
                                exit(-1);
                        }
                } else if (!matches(*argv, "ttl") ||
-                          !matches(*argv, "hoplimit")) {
-                       unsigned int uval;
-
+                          !matches(*argv, "hoplimit") ||
+                          !matches(*argv, "hlim")) {
                        NEXT_ARG();
                        if (strcmp(*argv, "inherit") != 0) {
-                               if (get_unsigned(&uval, *argv, 0))
+                               if (get_u8(&ttl, *argv, 0))
                                        invarg("invalid TTL\n", *argv);
-                               if (uval > 255)
-                                       invarg("TTL must be <= 255\n", *argv);
-                               ttl = uval;
                        } else
                                ttl = 0;
                } else if (!matches(*argv, "tos") ||

diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index 29ca3d1373d891d268fac08a8f2b6c3e7aa9f304..3d02e1677501b08fec5665c551254e2968927171 100644 (file)
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -238,13 +238,14 @@ get_failed:
                                exit(-1);
                        }
                } else if (!matches(*argv, "ttl") ||
-                          !matches(*argv, "hoplimit")) {
-                       __u8 uval;
-
+                          !matches(*argv, "hoplimit") ||
+                          !matches(*argv, "hlim")) {
                        NEXT_ARG();
-                       if (get_u8(&uval, *argv, 0))
-                               invarg("invalid TTL", *argv);
-                       hop_limit = uval;
+                       if (strcmp(*argv, "inherit") != 0) {
+                               if (get_u8(&hop_limit, *argv, 0))
+                                       invarg("invalid HLIM\n", *argv);
+                       } else
+                               hop_limit = 0;
                } else if (!matches(*argv, "tos") ||
                           !matches(*argv, "tclass") ||
                           !matches(*argv, "dsfield")) {

diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index 8f5c9bd747adec4658ab8f5eb0c23f3c290471f4..f6c52acc80749fb3659bd58398e5d92ca98ccc9c 100644 (file)
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -196,15 +196,15 @@ get_failed:
                        link = if_nametoindex(*argv);
                        if (link == 0)
                                invarg("\"dev\" is invalid", *argv);
-               } else if (strcmp(*argv, "hoplimit") == 0 ||
-                          strcmp(*argv, "ttl") == 0 ||
+               } else if (strcmp(*argv, "ttl") == 0 ||
+                          strcmp(*argv, "hoplimit") == 0 ||
                           strcmp(*argv, "hlim") == 0) {
-                       __u8 uval;
-
                        NEXT_ARG();
-                       if (get_u8(&uval, *argv, 0))
-                               invarg("invalid HLIM", *argv);
-                       hop_limit = uval;
+                       if (strcmp(*argv, "inherit") != 0) {
+                               if (get_u8(&hop_limit, *argv, 0))
+                                       invarg("invalid HLIM\n", *argv);
+                       } else
+                               hop_limit = 0;
                } else if (strcmp(*argv, "encaplimit") == 0) {
                        NEXT_ARG();
                        if (strcmp(*argv, "none") == 0) {

diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index ce3855c1096c1842354e3c7c8c791efc4dc95204..a6213d28369244576dceb82403dc4a3314eb4e3f 100644 (file)
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -204,7 +204,8 @@ get_failed:
                        if (link == 0)
                                invarg("\"dev\" is invalid", *argv);
                } else if (strcmp(*argv, "ttl") == 0 ||
-                          strcmp(*argv, "hoplimit") == 0) {
+                          strcmp(*argv, "hoplimit") == 0 ||
+                          strcmp(*argv, "hlim") == 0) {
                        NEXT_ARG();
                        if (strcmp(*argv, "inherit") != 0) {
                                if (get_u8(&ttl, *argv, 0))