From patchwork Fri Nov 17 00:53:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Greenway X-Patchwork-Id: 838818 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=apple.com header.i=@apple.com header.b="uhRUSTEc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ydKNw6HRGz9s0Z for ; Fri, 17 Nov 2017 11:53:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754110AbdKQAx0 (ORCPT ); Thu, 16 Nov 2017 19:53:26 -0500 Received: from mail-out2.apple.com ([17.151.62.25]:47441 "EHLO mail-in2.apple.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753693AbdKQAxY (ORCPT ); Thu, 16 Nov 2017 19:53:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; d=apple.com; s=mailout2048s; c=relaxed/simple; q=dns/txt; i=@apple.com; t=1510880003; h=From:Sender:Reply-To:Subject:Date:Message-id:To:Cc:MIME-version:Content-type: Content-transfer-encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=kFqohTcFyrQTEaYQHKQgu+jVX1Jf/8AcW6V9pgDDBVY=; b=uhRUSTEcmVcE/IHGTuC3akKp7tFt3YAGkt+2oDfAt3IGZtIb/sVgCCO5+R+07zgk XxHQuOo2PZx9H/jLvbOhvV9YY0EMig2AmGuGveIdwB26ge7Yq7R7GqH4PySkxrDz GBQxJi3BP96Z8pcenjqzTxMO9L7V75FO/sf1XGS40VBEUG6Z/MuZX1arwiQ3Pms8 YEVwcTZqHsLRDLp0jzrFvD6aUvV2CjtGJP3Wtp+jJ/UAPy9dzaBUAwR9CkiXKAEG 4RxjhFkV0o/vrqu1JIYGXvdhR7CymwJXM1MVMYmNXBiRVk9fR8ECEyD06HJooNAf oad2Rk0GzsOjv+cQytcGQA==; Received: from relay8.apple.com (relay8.apple.com [17.128.113.102]) (using TLS with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail-in2.apple.com (Apple Secure Mail Relay) with SMTP id F5.E8.22347.3033E0A5; Thu, 16 Nov 2017 16:53:23 -0800 (PST) X-AuditID: 11973e11-163b19c00000574b-df-5a0e3303ccf7 Received: from jimbu.apple.com (jimbu.apple.com [17.151.62.37]) by relay8.apple.com (Apple SCV relay) with SMTP id 6E.C9.22651.3033E0A5; Thu, 16 Nov 2017 16:53:23 -0800 (PST) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII Received: from [17.149.214.173] (unknown [17.149.214.173]) by jimbu.apple.com (Oracle Communications Messaging Server 8.0.1.3.20170825 64bit (built Aug 25 2017)) with ESMTPSA id <0OZJ00J1EEGYC180@jimbu.apple.com>; Thu, 16 Nov 2017 16:53:23 -0800 (PST) From: Greg Greenway Subject: [PATCH iproute2 v2] Add "show" subcommand to "ip fou" Message-id: Date: Thu, 16 Nov 2017 16:53:22 -0800 Cc: Stephen Hemminger , Tom Herbert To: Linux Kernel Network Developers X-Mailer: Apple Mail (2.3445.4.7) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOLMWRmVeSWpSXmKPExsUi2FCYpstszBdlsOqqocWxBWIWi+/IWVy+ 9IjZgdmjd+40Vo+ek/OYPD5vkgtgjuKySUnNySxLLdK3S+DKmNS/nrHgrmjFoe3RDYwLBLsY OTkkBEwkft+5ytTFyMUhJLCGSeLu1kNsMIneX0dYIRIbGCUur10BluAVEJT4MfkeSxcjBwez gLzEwfOyIGFmAS2J749aWSDqG5kkPtzbzg6SEBaQlujtfs4IYrMJaErcubqSCaRXWMBOYvHr KhCTV8BGYs4hI5AKFgFViacTprNCjAyX+HrnOjOILQJU0jPhEjPEaYoSG66vYwZZJSHwkVXi 17mpzBMYBWchuW4WwnWzkFy3gJF5FaNQbmJmjm5mnpFeYkFBTqpecn7uJkZQyE63E9zBeHyV 1SFGAQ5GJR5egSO8UUKsiWXFlbmHGKU5WJTEeRP38EQJCaQnlqRmp6YWpBbFF5XmpBYfYmTi 4JRqYOyzYu6smxHuPPHuY6FvnD/3M/xa/IDxtLtkgutWl7OyanIOTf8nZXdWhJ/3mvTiTzbT /vmzS9lmaASuFlO8xmV6aW3HVunY+SxnPLxP8SZcfmxVcv5fk9aV5jvHf7u2+VsIz9xk8TF+ W9ssyfArxzImKcvf5o6rruI6/znWwWuj3ZPnVut/yymxFGckGmoxFxUnAgCAoCpqOgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFLMWRmVeSWpSXmKPExsUiON1OVZfZmC/KYNtaPYtjC8QsFt+Rs7h8 6RGzA7NH79xprB49J+cxeXzeJBfAHMVlk5Kak1mWWqRvl8CVMal/PWPBXdGKQ9ujGxgXCHYx cnJICJhI9P46wtrFyMUhJLCBUeLy2hVsIAleAUGJH5PvsXQxcnAwC8hLHDwvCxJmFtCS+P6o lQWivpFJ4sO97ewgCWEBaYne7ueMIDabgKbEnasrmUB6hQXsJBa/rgIxeQVsJOYcMgKpYBFQ lXg6YTorxMhwia93rjOD2CJAJT0TLjFDnKYoseH6OuYJjHyzkBw0C+GgWUgOWsDIvIpRoCg1 J7HSQi+xoCAnVS85P3cTIyjEGgrTdjA2Lbc6xCjAwajEw5txjDdKiDWxrLgy9xCjBAezkghv w0SgEG9KYmVValF+fFFpTmrxIUZpDhYlcV59Ea4oIYH0xJLU7NTUgtQimCwTB6dUA6OYu6lm XaX4S8P1W/1rd06dciKjZFVEq2Rg+49zOfOui3IcOqe+qVL9BPvPBam27NkbMzo3nF0ba7fN Rty99Pf3hW5TeVmWMLUdXd1Vv47nv07wfzfXOB2L11eequTu5b3nw6Qo+Gvb3l01LsHanwtK l2T1W8/ROBwmky4mZFEe3DJra/XqXUosxRmJhlrMRcWJABvQON0tAgAA Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sample output: $ sudo ./ip/ip fou add port 111 ipproto 11 $ sudo ./ip/ip fou add port 222 ipproto 22 -6 $ ./ip/ip fou show port 222 ipproto 22 -6 port 111 ipproto 11 Signed-off-by: Greg Greenway --- ip/ipfou.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/ip/ipfou.c b/ip/ipfou.c index 00dbe15..ecbaf11 100644 --- a/ip/ipfou.c +++ b/ip/ipfou.c @@ -28,6 +28,7 @@ static void usage(void) fprintf(stderr, "Usage: ip fou add port PORT " "{ ipproto PROTO | gue } [ -6 ]\n"); fprintf(stderr, " ip fou del port PORT [ -6 ]\n"); + fprintf(stderr, " ip fou show\n"); fprintf(stderr, "\n"); fprintf(stderr, "Where: PROTO { ipproto-name | 1..255 }\n"); fprintf(stderr, " PORT { 1..65535 }\n"); @@ -134,6 +135,63 @@ static int do_del(int argc, char **argv) return 0; } +static int print_fou_mapping(const struct sockaddr_nl *who, + struct nlmsghdr *n, void *arg) +{ + FILE *fp = (FILE *)arg; + struct genlmsghdr *ghdr; + struct rtattr *tb[FOU_ATTR_MAX + 1]; + int len = n->nlmsg_len; + unsigned family; + + if (n->nlmsg_type != genl_family) + return 0; + + len -= NLMSG_LENGTH(GENL_HDRLEN); + if (len < 0) + return -1; + + ghdr = NLMSG_DATA(n); + parse_rtattr(tb, FOU_ATTR_MAX, (void *) ghdr + GENL_HDRLEN, len); + + if (tb[FOU_ATTR_PORT]) + fprintf(fp, "port %u", ntohs(rta_getattr_u16(tb[FOU_ATTR_PORT]))); + if (tb[FOU_ATTR_TYPE] && rta_getattr_u8(tb[FOU_ATTR_TYPE]) == FOU_ENCAP_GUE) + fprintf(fp, " gue"); + else if (tb[FOU_ATTR_IPPROTO]) + fprintf(fp, " ipproto %u", rta_getattr_u8(tb[FOU_ATTR_IPPROTO])); + if (tb[FOU_ATTR_AF]) { + family = rta_getattr_u8(tb[FOU_ATTR_AF]); + if (family == AF_INET6) + fprintf(fp, " -6"); + } + fprintf(fp, "\n"); + + return 0; +} + +static int do_show(int argc, char **argv) +{ + FOU_REQUEST(req, 4096, FOU_CMD_GET, NLM_F_REQUEST | NLM_F_DUMP); + + if (argc > 0) { + fprintf(stderr, "\"ip fou show\" does not take any arguments.\n"); + return -1; + } + + if (rtnl_send(&genl_rth, &req.n, req.n.nlmsg_len) < 0) { + perror("Cannot send show request"); + exit(1); + } + + if (rtnl_dump_filter(&genl_rth, print_fou_mapping, stdout) < 0) { + fprintf(stderr, "Dump terminated\n"); + return 1; + } + + return 0; +} + int do_ipfou(int argc, char **argv) { if (argc < 1) @@ -149,6 +207,8 @@ int do_ipfou(int argc, char **argv) return do_add(argc-1, argv+1); if (matches(*argv, "delete") == 0) return do_del(argc-1, argv+1); + if (matches(*argv, "show") == 0) + return do_show(argc-1, argv+1); fprintf(stderr, "Command \"%s\" is unknown, try \"ip fou help\".\n", *argv); exit(-1); }