From mboxrd@z Thu Jan 1 00:00:00 1970 From: Serhey Popovych Subject: [PATCH iproute2 v2 1/3] link_iptnl: Kill code duplication Date: Tue, 2 Jan 2018 23:27:57 +0200 Message-ID: <1514928479-30313-2-git-send-email-serhe.popovych@gmail.com> References: <1514928479-30313-1-git-send-email-serhe.popovych@gmail.com> To: netdev@vger.kernel.org Return-path: Received: from mail-lf0-f66.google.com ([209.85.215.66]:38077 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751097AbeABV2E (ORCPT ); Tue, 2 Jan 2018 16:28:04 -0500 Received: by mail-lf0-f66.google.com with SMTP id w196so39033098lff.5 for ; Tue, 02 Jan 2018 13:28:04 -0800 (PST) Received: from tuxracer.localdomain (netdev-gw1.skif.com.ua. [195.20.96.53]) by smtp.gmail.com with ESMTPSA id g12sm4534735lfd.32.2018.01.02.13.28.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jan 2018 13:28:02 -0800 (PST) In-Reply-To: <1514928479-30313-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: 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 --- ip/link_iptnl.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c index 8a8f5dd..d4d935b 100644 --- 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) { -- 1.7.10.4