link_iptnl: Kill code duplication

Both sit and ipip "mode" parameter handling nearly the same.
Except for sit we have "ip6ip" mode: check it only when
configuring sit.

Note that there is no need strcmp(lu->id, "ipip"): if it is
not sit it is "ipip" because we have only these two link util
defined in module.

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>

diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index 8a8f5dd0dfc50ab5c459021d3cd4ab7e2ad105ad..d4d935bbb5221824ccd51587ae9021aa903bc95c 100644 (file)
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -230,11 +230,11 @@ get_failed:
                } else if (strcmp(lu->id, "sit") == 0 &&
                           strcmp(*argv, "isatap") == 0) {
                        iflags |= SIT_ISATAP;
-               } else if (strcmp(lu->id, "sit") == 0 &&
-                          strcmp(*argv, "mode") == 0) {
+               } else if (strcmp(*argv, "mode") == 0) {
                        NEXT_ARG();
-                       if (strcmp(*argv, "ipv6/ipv4") == 0 ||
-                           strcmp(*argv, "ip6ip") == 0)
+                       if (strcmp(lu->id, "sit") == 0 &&
+                           (strcmp(*argv, "ipv6/ipv4") == 0 ||
+                            strcmp(*argv, "ip6ip") == 0))
                                proto = IPPROTO_IPV6;
                        else if (strcmp(*argv, "ipv4/ipv4") == 0 ||
                                 strcmp(*argv, "ipip") == 0 ||
@@ -248,21 +248,6 @@ get_failed:
                                proto = 0;
                        else
                                invarg("Cannot guess tunnel mode.", *argv);
-               } else if (strcmp(lu->id, "ipip") == 0 &&
-                          strcmp(*argv, "mode") == 0) {
-                       NEXT_ARG();
-                       if (strcmp(*argv, "ipv4/ipv4") == 0 ||
-                                strcmp(*argv, "ipip") == 0 ||
-                                strcmp(*argv, "ip4ip4") == 0)
-                               proto = IPPROTO_IPIP;
-                       else if (strcmp(*argv, "mpls/ipv4") == 0 ||
-                                  strcmp(*argv, "mplsip") == 0)
-                               proto = IPPROTO_MPLS;
-                       else if (strcmp(*argv, "any/ipv4") == 0 ||
-                                strcmp(*argv, "any") == 0)
-                               proto = 0;
-                       else
-                               invarg("Cannot guess tunnel mode.", *argv);
                } else if (strcmp(*argv, "noencap") == 0) {
                        encaptype = TUNNEL_ENCAP_NONE;
                } else if (strcmp(*argv, "encap") == 0) {
@@ -337,6 +322,7 @@ get_failed:
                exit(-1);
        }
 
+       addattr8(n, 1024, IFLA_IPTUN_PROTO, proto);
        if (metadata) {
                addattr_l(n, 1024, IFLA_IPTUN_COLLECT_METADATA, NULL, 0);
                return 0;
@@ -355,9 +341,6 @@ get_failed:
        addattr16(n, 1024, IFLA_IPTUN_ENCAP_SPORT, htons(encapsport));
        addattr16(n, 1024, IFLA_IPTUN_ENCAP_DPORT, htons(encapdport));
 
-       if (strcmp(lu->id, "ipip") == 0 || strcmp(lu->id, "sit") == 0)
-               addattr8(n, 1024, IFLA_IPTUN_PROTO, proto);
-
        if (strcmp(lu->id, "sit") == 0) {
                addattr16(n, 1024, IFLA_IPTUN_FLAGS, iflags);
                if (ip6rdprefixlen) {