From patchwork Tue Oct 31 20:00:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Greenway X-Patchwork-Id: 832717 X-Patchwork-Delegate: shemminger@vyatta.com 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="chw29J3N"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yRMzv1Mymz9sNx for ; Wed, 1 Nov 2017 07:15:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932583AbdJaUPw (ORCPT ); Tue, 31 Oct 2017 16:15:52 -0400 Received: from mail-out25.apple.com ([17.171.2.35]:62207 "EHLO mail-in25.apple.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932356AbdJaUPu (ORCPT ); Tue, 31 Oct 2017 16:15:50 -0400 X-Greylist: delayed 900 seconds by postgrey-1.27 at vger.kernel.org; Tue, 31 Oct 2017 16:15:50 EDT DKIM-Signature: v=1; a=rsa-sha256; d=apple.com; s=mailout2048s; c=relaxed/simple; q=dns/txt; i=@apple.com; t=1509480049; 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=hFrj2IHitPTx76rU8zF6fUiw633dj948Cz3HUvhZf4A=; b=chw29J3NqNS1G2HuyA8ZfoBUK/Oe6AAzZLpyhF2PQloakL6eIQOHzsHNTX/iAbag UstJj8fj4HKD/2207BJVsN86Nt+7pTpKIqBwovAF8g17zEIU/PeZ/l9SfX61squ9 nVIT9cPNCOh1Yf8Curo+RXtNp0uX8Qb4VBrF2vnatIUj3bTtpJsmsGFfhal+qg58 yaDHxClj7k0EZ26VTJqrdGfTGSSk0RfB8axqMv297Dd0mV7IpzDmJ1yKiU6ljIey yIX7AnDMFjaAtbtjCYGHQrmjVcY2fYnJfjlgx4WOsyNK9w0Lt525YPfTB96VBCTs 4X8bfbUB547Cj8Kh4xu0xw==; Received: from relay27.apple.com (relay27.apple.com [17.171.128.108]) (using TLS with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail-in25.apple.com (Apple Secure Mail Relay) with SMTP id 4A.26.14358.176D8F95; Tue, 31 Oct 2017 13:00:49 -0700 (PDT) X-AuditID: 11ab0219-00bff70000003816-1f-59f8d67188d4 Received: from haralson.apple.com (haralson.apple.com [17.171.2.64]) by relay27.apple.com (Apple SCV relay) with SMTP id 63.12.07817.176D8F95; Tue, 31 Oct 2017 13:00:49 -0700 (PDT) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII Received: from [17.234.128.96] (unknown [17.234.128.96]) by haralson.apple.com (Oracle Communications Messaging Server 8.0.1.3.20170825 64bit (built Aug 25 2017)) with ESMTPSA id <0OYP00936E9C0N20@haralson.apple.com> for netdev@vger.kernel.org; Tue, 31 Oct 2017 13:00:49 -0700 (PDT) From: Greg Greenway Subject: [PATCH iproute2] Add "show" subcommand to "ip fou" Message-id: Date: Tue, 31 Oct 2017 13:00:47 -0700 To: netdev@vger.kernel.org X-Mailer: Apple Mail (2.3445.1.7) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphluLIzCtJLcpLzFFi42IRXN2Qo1t47UekwZQ5ahbHFog5MHp83iQX wBjFZZOSmpNZllqkb5fAlTFpwhbmgiliFb+OT2FrYDwp2MXIySEhYCLx5uBTxi5GLg4hgfVM EmtPX2GHSZx73sACkdjGKLHm1glGkASvgKDEj8n3gBIcHMwC8hIHz8uChJkFtCS+P2qFql/E JHHn3HawQcIC0hK93c/BetkENCXuXF3JBBG3lni+4Q4rxEwbicOXFrOA2CwCqhLbF+0HqxER kJL4uGM71EGKElPvbWYDWSAhcJJVYt7rkywTGAVmIblpFsJNs5DctICReRWjcG5iZo5uZp6R qV5iQUFOql5yfu4mRnDwMUnuYPz62vAQowAHoxIP74zE75FCrIllxZW5hxilOViUxHn/nf4R KSSQnliSmp2aWpBaFF9UmpNafIiRiYNTqoHRLLqZfYIRC0tb6Ymc+dtzrszzl1xw3v9crbNb 8sm901dNXv/adbLa9qrnInWTNfskbYTtWi7ycF3r/s7UcqL2DD8P4wLlOelRixw4uOc1NESG GRtLiUssLJpelGdS/XLTjklTpydOre2Z+2H7O+55Eg/TF8fMZp2uwb13VpdDv8g+3z/qRxKU WIozEg21mIuKEwGE/pEmHwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrPJMWRmVeSWpSXmKPExsUiuJrJQbfw2o9Igz23lSyOLRBzYPT4vEku gDGKyyYlNSezLLVI3y6BK2PShC3MBVPEKn4dn8LWwHhSsIuRk0NCwETi3PMGli5GLg4hgW2M EmtunWAESfAKCEr8mHwPKMHBwSwgL3HwvCxImFlAS+L7o1ao+kVMEnfObWcHSQgLSEv0dj8H 62UT0JS4c3UlE0TcWuL5hjusEDNtJA5fWswCYrMIqEpsX7QfrEZEQEri4w6IORICihJT721m m8DIOwvJGbMQzpiF5IwFjMyrGAWLUnMSK43M9RILCnJS9ZLzczcxgoOlIWcH452bZocYBTgY lXh4ZyR+jxRiTSwrrsw9xCjBwawkwtu74kekEG9KYmVValF+fFFpTmrxIUZpDhYlcV6F+UAp gfTEktTs1NSC1CKYLBMHp1QD4+y5ft0r76opzA6Vut5p81Cc+y+bXcnV2mTTVa99yt+3fXW5 WeWdbsF59GLkxgecnZxMp7u4F59etE1XsMLYvzb/rLiXEQ/DujmLbWxTrddq7Hpy8A73qZUW Z7W23i/tMChnE2nqbm2yO/v7kNDBe9blC85bZh2NPsHulbL4emrzsUXd91a+VmIpzkg01GIu Kk4EAF94MBYSAgAA Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sample output: $ ip fou show port 4 af AF_INET ipproto 4 Signed-off-by: Greg Greenway Signed-off-by: Greg Greenway Acked-by: Tom Herbert --- ip/ipfou.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/ip/ipfou.c b/ip/ipfou.c index 00dbe15..2eb5bfd 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,69 @@ 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; + char *family_str; + + 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_AF]) { + family = rta_getattr_u8(tb[FOU_ATTR_AF]); + if (family == AF_INET) + family_str = "AF_INET"; + else if (family == AF_INET6) + family_str = "AF_INET6"; + else + family_str = "unknown"; + fprintf(fp, "af %s ", family_str); + } + 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])); + 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 +213,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); }