From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F4088C282DA for ; Wed, 17 Apr 2019 21:19:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3CEA206B6 for ; Wed, 17 Apr 2019 21:19:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uJ6AWRCZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733114AbfDQVTX (ORCPT ); Wed, 17 Apr 2019 17:19:23 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:36302 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726162AbfDQVTX (ORCPT ); Wed, 17 Apr 2019 17:19:23 -0400 Received: by mail-pl1-f196.google.com with SMTP id ck15so93763plb.3 for ; Wed, 17 Apr 2019 14:19:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=6vkgqEjL/f4H7rQOmHPLAd+Djf4R2ePC041GvZ5VpBM=; b=uJ6AWRCZMp79SZyDifAae8mqFG75mEAGY/JruFI3W5D6tCQtxIkS0bXNZAjhPLqAEU 4VMqESeHp21GZhHyEa4LElPV3Rf9iksDE/Tq6v+zvpOd0e7TMSIyVqPs6sorXtrbVUVf Yq5CQvpEikxYq2Arh9AbfgjvORzvtJgLCtT/NKIGjhG9bmi+001rAuRc/TLodPnCNDtO 4hW8n17i7kbfIlFI5DRa94ccYjsLGIos1zuHSn3Y4rIQDe2xM10GL45MrR/3lAx6IxF9 XF8FCcNCX/vCBy9je4mhTanuWS7qTnGOvvDbZ00DlaAJGISm9gQxaOmnaeGHCoAgIkMl /kaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=6vkgqEjL/f4H7rQOmHPLAd+Djf4R2ePC041GvZ5VpBM=; b=PIu02Ta3hunOtx7ULlpYPSsdr9AV/qGzjTtbe8EHUbgHpnUjPqbJJ4OBGDZiEKf9iI dJsxpYCz6UYcBJwT8T8K7RVXya3U6hgjOAG/pBPB7wS3nG3z09PYVjQmy4U7Tr8LR20Z wSRX4wRhA64z7UfcikixEh2FGMkaOnb1Q16Mo+zr6KOi8fCPZKqGhTH9FM/3EqQqgx0C CfFskSKGmW8qJs/YSV0xaGgi254kMn8BAWaCtH6sNwIKO331EZ6Jh/x9oaEQEzwHUABg hHFKB9yAVyhFaMZ0blMjhdJlZ7wPHCrZ+aFLIRJv0lpjv05odElKvCOIJX+qRYloNEbu 4y6A== X-Gm-Message-State: APjAAAUIHSDHOS1W8Il3cGHzPUZr6hOgKac+pwuCzYUKI3sec8lrTVmV q9txEreT+BMVsmEo+SMNU9CjsvCE X-Google-Smtp-Source: APXvYqwDDOCtOXOZc6gBfDW1h0cTLsWqDtSh7tzBUe/IAe1Oc3WmK51dInESp2e1SqMAPI64xJPsug== X-Received: by 2002:a17:902:a50d:: with SMTP id s13mr35802620plq.58.1555535961759; Wed, 17 Apr 2019 14:19:21 -0700 (PDT) Received: from ?IPv6:2601:282:800:fd80:e921:713e:e70e:cd02? ([2601:282:800:fd80:e921:713e:e70e:cd02]) by smtp.googlemail.com with ESMTPSA id l19sm151100pff.1.2019.04.17.14.19.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Apr 2019 14:19:20 -0700 (PDT) Subject: Re: [PATCH iproute2-next] ip fou: Support binding FOU ports To: Kristian Evensen , netdev@vger.kernel.org References: <20190409191437.24135-1-kristian.evensen@gmail.com> From: David Ahern Message-ID: Date: Wed, 17 Apr 2019 15:19:19 -0600 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190409191437.24135-1-kristian.evensen@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 4/9/19 1:14 PM, Kristian Evensen wrote: > diff --git a/include/uapi/linux/fou.h b/include/uapi/linux/fou.h > index bf022c63..9f915118 100644 > --- a/include/uapi/linux/fou.h > +++ b/include/uapi/linux/fou.h > @@ -16,6 +16,12 @@ enum { > FOU_ATTR_IPPROTO, /* u8 */ > FOU_ATTR_TYPE, /* u8 */ > FOU_ATTR_REMCSUM_NOPARTIAL, /* flag */ > + FOU_ATTR_LOCAL_V4, /* u32 */ > + FOU_ATTR_LOCAL_V6, /* in6_addr */ > + FOU_ATTR_PEER_V4, /* u32 */ > + FOU_ATTR_PEER_V6, /* in6_addr */ > + FOU_ATTR_PEER_PORT, /* u16 */ > + FOU_ATTR_IFINDEX, /* s32 */ > > __FOU_ATTR_MAX, > }; I just updated the kernel headers, so you can drop the above. > diff --git a/ip/ipfou.c b/ip/ipfou.c > index 346522dd..8bc62d78 100644 > --- a/ip/ipfou.c > +++ b/ip/ipfou.c > @@ -28,11 +28,17 @@ static void usage(void) > { > fprintf(stderr, > "Usage: ip fou add port PORT { ipproto PROTO | gue } [ -6 ]\n" > - " ip fou del port PORT [ -6 ]\n" > + " [ local IFADDR ] [ peer IFADDR ]\n" > + " [ peer_port PORT ] [ index IDX ]\n" > + " ip fou del port PORT [ -6 ] [ local IFADDR ]\n" > + " [ peer IFADDR ] [ peer_port PORT ]\n" > + " [ index IDX ]\n" iproute2 allows users to specify a device by name; it is not very user friendly to have to run 'ip li sh' to lookup a device to get the index to run an 'ip' command. > " ip fou show\n" > "\n" > "Where: PROTO { ipproto-name | 1..255 }\n" > - " PORT { 1..65535 }\n"); > + " PORT { 1..65535 }\n" > + " IFADDR { addr }\n" > + " IDX { interface index }\n"); > > exit(-1); > } > @@ -48,12 +54,14 @@ static int genl_family = -1; > static int fou_parse_opt(int argc, char **argv, struct nlmsghdr *n, > bool adding) > { > - __u16 port; > - int port_set = 0; > + __u16 port, peer_port; > + int port_set = 0, peer_port_set = 0; > __u8 ipproto, type; > bool gue_set = false; > int ipproto_set = 0; > __u8 family = AF_INET; > + const char *local = NULL, *peer = NULL; > + int index, index_set = 0; iproute2 follows the kernel; please order your new ones in reverse xmas tree (ie., they all go to the top). > > while (argc > 0) { > if (!matches(*argv, "port")) { > @@ -77,6 +85,26 @@ static int fou_parse_opt(int argc, char **argv, struct nlmsghdr *n, > gue_set = true; > } else if (!matches(*argv, "-6")) { > family = AF_INET6; > + } else if (!matches(*argv, "local")) { > + NEXT_ARG(); > + > + local = *argv; > + } else if (!matches(*argv, "peer")) { > + NEXT_ARG(); > + > + peer = *argv; > + } else if (!matches(*argv, "peer_port")) { > + NEXT_ARG(); > + > + if (get_be16(&peer_port, *argv, 0) || peer_port == 0) > + invarg("invalid peer port", *argv); > + peer_port_set = 1; since port == 0 is not valid, then peer_port_set is not needed; just use 'if (peer_port)' > + } else if (!matches(*argv, "index")) { > + NEXT_ARG(); > + > + if (get_s32(&index, *argv, 0) || index == 0) > + invarg("invalid interface index", *argv); > + index_set = 1; > } else { > fprintf(stderr > , "fou: unknown command \"%s\"?\n", *argv); > @@ -101,6 +129,11 @@ static int fou_parse_opt(int argc, char **argv, struct nlmsghdr *n, > return -1; > } > > + if ((peer_port_set && !peer) || (peer && !peer_port_set)) { > + fprintf(stderr, "fou: both peer and peer port must be set\n"); > + return -1; > + } > + > type = gue_set ? FOU_ENCAP_GUE : FOU_ENCAP_DIRECT; > > addattr16(n, 1024, FOU_ATTR_PORT, port); > @@ -110,6 +143,32 @@ static int fou_parse_opt(int argc, char **argv, struct nlmsghdr *n, > if (ipproto_set) > addattr8(n, 1024, FOU_ATTR_IPPROTO, ipproto); > > + if (local) { > + inet_prefix local_addr; > + __u8 attr_type = family == AF_INET ? FOU_ATTR_LOCAL_V4 : > + FOU_ATTR_LOCAL_V6; > + > + get_addr(&local_addr, local, family); > + addattr_l(n, 1024, attr_type, &local_addr.data, > + local_addr.bytelen); > + } > + > + if (peer) { > + inet_prefix peer_addr; > + __u8 attr_type = family == AF_INET ? FOU_ATTR_PEER_V4 : > + FOU_ATTR_PEER_V6; > + > + get_addr(&peer_addr, peer, family); > + addattr_l(n, 1024, attr_type, &peer_addr.data, > + peer_addr.bytelen); > + > + if (peer_port_set) > + addattr16(n, 1024, FOU_ATTR_PEER_PORT, peer_port); what ensures that peer and local are valid IPv4 or IPv6 addresses as determined by the family? yes, get_addr calls exit(), but it should not - it should be returning 1 instead. Check the return code on get_addr and handle the error. > + } > + > + if (index_set) > + addattr32(n, 1024, FOU_ATTR_IFINDEX, index); > + > return 0; > } > > @@ -142,6 +201,8 @@ static int print_fou_mapping(struct nlmsghdr *n, void *arg) > struct genlmsghdr *ghdr; > struct rtattr *tb[FOU_ATTR_MAX + 1]; > int len = n->nlmsg_len; > + __u8 family = AF_INET, local_attr_type, peer_attr_type, byte_len; > + __u8 empty_buf[16] = {0}; reverse xmas tree.