ip/tunnel: Use tnl_parse_key() to parse tunnel key

It is added with
commit a7ed1520ee96 ("ip/tunnel: introduce tnl_parse_key()")
to avoid code duplication in ip6?tunnel.c.

Reuse it for gre/gre6 and vti/vti6 tunnel rtnl
configuration interface with the same purpose
it is used in tunnel ioctl interface in ip6?tunnel.c.

While there change type of key variables from
unsigned integer to __be32 to reflect nature of the
value they store and place error message in
tnl_parse_key() on a single line to make single
call to fprintf().

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 09f1e441a6fe3014f1943e03dee43b8bce0fb459..2397920a4e65cda71d80d188428c10de09b72ed4 100644 (file)
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@ -81,8 +81,8 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv,
        struct rtattr *greinfo[IFLA_GRE_MAX + 1];
        __u16 iflags = 0;
        __u16 oflags = 0;
-       unsigned int ikey = 0;
-       unsigned int okey = 0;
+       __be32 ikey = 0;
+       __be32 okey = 0;
        unsigned int saddr = 0;
        unsigned int daddr = 0;
        unsigned int link = 0;
@@ -184,53 +184,18 @@ get_failed:
 
        while (argc > 0) {
                if (!matches(*argv, "key")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
                        iflags |= GRE_KEY;
                        oflags |= GRE_KEY;
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr,
-                                               "Invalid value for \"key\": \"%s\"; it should be an unsigned integer\n", *argv);
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-
-                       ikey = okey = uval;
+                       ikey = okey = tnl_parse_key("key", *argv);
                } else if (!matches(*argv, "ikey")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
                        iflags |= GRE_KEY;
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr, "invalid value for \"ikey\": \"%s\"; it should be an unsigned integer\n", *argv);
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-                       ikey = uval;
+                       ikey = tnl_parse_key("ikey", *argv);
                } else if (!matches(*argv, "okey")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
                        oflags |= GRE_KEY;
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr, "invalid value for \"okey\": \"%s\"; it should be an unsigned integer\n", *argv);
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-                       okey = uval;
+                       okey = tnl_parse_key("okey", *argv);
                } else if (!matches(*argv, "seq")) {
                        iflags |= GRE_SEQ;
                        oflags |= GRE_SEQ;

diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index c22fdedbb8899d7d44c32bbb21ae2ecec662bb75..7190ada93c29dddc119f3fda1ac691df9d9fc979 100644 (file)
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -92,8 +92,8 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv,
        struct rtattr *greinfo[IFLA_GRE_MAX + 1];
        __u16 iflags = 0;
        __u16 oflags = 0;
-       unsigned int ikey = 0;
-       unsigned int okey = 0;
+       __be32 ikey = 0;
+       __be32 okey = 0;
        struct in6_addr raddr = IN6ADDR_ANY_INIT;
        struct in6_addr laddr = IN6ADDR_ANY_INIT;
        unsigned int link = 0;
@@ -192,53 +192,18 @@ get_failed:
 
        while (argc > 0) {
                if (!matches(*argv, "key")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
                        iflags |= GRE_KEY;
                        oflags |= GRE_KEY;
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr,
-                                               "Invalid value for \"key\"\n");
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-
-                       ikey = okey = uval;
+                       ikey = okey = tnl_parse_key("key", *argv);
                } else if (!matches(*argv, "ikey")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
                        iflags |= GRE_KEY;
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr, "invalid value of \"ikey\"\n");
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-                       ikey = uval;
+                       ikey = tnl_parse_key("ikey", *argv);
                } else if (!matches(*argv, "okey")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
                        oflags |= GRE_KEY;
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr, "invalid value of \"okey\"\n");
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-                       okey = uval;
+                       okey = tnl_parse_key("okey", *argv);
                } else if (!matches(*argv, "seq")) {
                        iflags |= GRE_SEQ;
                        oflags |= GRE_SEQ;

diff --git a/ip/link_vti.c b/ip/link_vti.c
index 05aefa32bdcbfc25f80e971cbac35a36759a8cde..6c5469ff8d608685234d9ea16f52e0108a812a47 100644 (file)
--- a/ip/link_vti.c
+++ b/ip/link_vti.c
@@ -64,8 +64,8 @@ static int vti_parse_opt(struct link_util *lu, int argc, char **argv,
        struct rtattr *tb[IFLA_MAX + 1];
        struct rtattr *linkinfo[IFLA_INFO_MAX+1];
        struct rtattr *vtiinfo[IFLA_VTI_MAX + 1];
-       unsigned int ikey = 0;
-       unsigned int okey = 0;
+       __be32 ikey = 0;
+       __be32 okey = 0;
        unsigned int saddr = 0;
        unsigned int daddr = 0;
        unsigned int link = 0;
@@ -122,49 +122,14 @@ get_failed:
 
        while (argc > 0) {
                if (!matches(*argv, "key")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr,
-                                               "Invalid value for \"key\": \"%s\"; it should be an unsigned integer\n", *argv);
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-
-                       ikey = okey = uval;
+                       ikey = okey = tnl_parse_key("key", *argv);
                } else if (!matches(*argv, "ikey")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr, "invalid value for \"ikey\": \"%s\"; it should be an unsigned integer\n", *argv);
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-                       ikey = uval;
+                       ikey = tnl_parse_key("ikey", *argv);
                } else if (!matches(*argv, "okey")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr, "invalid value for \"okey\": \"%s\"; it should be an unsigned integer\n", *argv);
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-                       okey = uval;
+                       okey = tnl_parse_key("okey", *argv);
                } else if (!matches(*argv, "remote")) {
                        NEXT_ARG();
                        daddr = get_addr32(*argv);

diff --git a/ip/link_vti6.c b/ip/link_vti6.c
index 84824a5d9921aa4a77ca51cc0879e57037aa2742..f631839aa2d73343378e3706efa8a52cd17e281a 100644 (file)
--- a/ip/link_vti6.c
+++ b/ip/link_vti6.c
@@ -61,8 +61,8 @@ static int vti6_parse_opt(struct link_util *lu, int argc, char **argv,
        struct rtattr *vtiinfo[IFLA_VTI_MAX + 1];
        struct in6_addr saddr = IN6ADDR_ANY_INIT;
        struct in6_addr daddr = IN6ADDR_ANY_INIT;
-       unsigned int ikey = 0;
-       unsigned int okey = 0;
+       __be32 ikey = 0;
+       __be32 okey = 0;
        unsigned int link = 0;
        __u32 fwmark = 0;
        int len;
@@ -117,49 +117,14 @@ get_failed:
 
        while (argc > 0) {
                if (!matches(*argv, "key")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr,
-                                               "Invalid value for \"key\": \"%s\"; it should be an unsigned integer\n", *argv);
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-
-                       ikey = okey = uval;
+                       ikey = okey = tnl_parse_key("key", *argv);
                } else if (!matches(*argv, "ikey")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr, "invalid value for \"ikey\": \"%s\"; it should be an unsigned integer\n", *argv);
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-                       ikey = uval;
+                       ikey = tnl_parse_key("ikey", *argv);
                } else if (!matches(*argv, "okey")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr, "invalid value for \"okey\": \"%s\"; it should be an unsigned integer\n", *argv);
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-                       okey = uval;
+                       okey = tnl_parse_key("okey", *argv);
                } else if (!matches(*argv, "remote")) {
                        inet_prefix addr;
 

diff --git a/ip/tunnel.c b/ip/tunnel.c
index d359eb958a6c6796b530eec47e4dda74c7a0baac..f860103873f7ba7b254407d38e13e9256fdaf9f9 100644 (file)
--- a/ip/tunnel.c
+++ b/ip/tunnel.c
@@ -192,8 +192,9 @@ __be32 tnl_parse_key(const char *name, const char *key)
                return get_addr32(key);
 
        if (get_unsigned(&uval, key, 0) < 0) {
-               fprintf(stderr, "invalid value for \"%s\": \"%s\";", name, key);
-               fprintf(stderr, " it should be an unsigned integer\n");
+               fprintf(stderr,
+                       "invalid value for \"%s\": \"%s\"; it should be an unsigned integer\n",
+                       name, key);
                exit(-1);
        }
        return htonl(uval);