From: Hangbin Liu <liuhangbin@gmail.com>
Date: Wed, 19 Sep 2018 03:03:29 +0000 (+0800)
Subject: iplink: add ipvtap support
X-Git-Tag: v4.20.0~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88272775e25f2c069497fe9f561c4b2209ea03ed;p=thirdparty%2Fiproute2.git

iplink: add ipvtap support

IPVLAN and IPVTAP are using the same functions and parameters. So we can
just add a new link_util with id ipvtap. Others are the same.

Acked-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
---

diff --git a/ip/iplink.c b/ip/iplink.c
index 0ba5f1af7..d99c49ed2 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -120,8 +120,8 @@ void iplink_usage(void)
 			"TYPE := { vlan | veth | vcan | vxcan | dummy | ifb | macvlan | macvtap |\n"
 			"          bridge | bond | team | ipoib | ip6tnl | ipip | sit | vxlan |\n"
 			"          gre | gretap | erspan | ip6gre | ip6gretap | ip6erspan |\n"
-			"          vti | nlmon | team_slave | bond_slave | ipvlan | geneve |\n"
-			"          bridge_slave | vrf | macsec | netdevsim | rmnet }\n");
+			"          vti | nlmon | team_slave | bond_slave | bridge_slave |\n"
+			"          ipvlan | ipvtap | geneve | vrf | macsec | netdevsim | rmnet }\n");
 	}
 	exit(-1);
 }
diff --git a/ip/iplink_ipvlan.c b/ip/iplink_ipvlan.c
index 888980850..baae767b8 100644
--- a/ip/iplink_ipvlan.c
+++ b/ip/iplink_ipvlan.c
@@ -1,4 +1,4 @@
-/* iplink_ipvlan.c	IPVLAN device support
+/* iplink_ipvlan.c	IPVLAN/IPVTAP device support
  *
  *              This program is free software; you can redistribute it and/or
  *              modify it under the terms of the GNU General Public License
@@ -18,15 +18,15 @@
 #include "utils.h"
 #include "ip_common.h"
 
-static void ipvlan_explain(FILE *f)
+static void print_explain(struct link_util *lu, FILE *f)
 {
 	fprintf(f,
-		"Usage: ... ipvlan [ mode MODE ] [ FLAGS ]\n"
+		"Usage: ... %s [ mode MODE ] [ FLAGS ]\n"
 		"\n"
 		"MODE: l3 | l3s | l2\n"
 		"FLAGS: bridge | private | vepa\n"
-		"(first values are the defaults if nothing is specified).\n"
-		);
+		"(first values are the defaults if nothing is specified).\n",
+		lu->id);
 }
 
 static int ipvlan_parse_opt(struct link_util *lu, int argc, char **argv,
@@ -61,12 +61,12 @@ static int ipvlan_parse_opt(struct link_util *lu, int argc, char **argv,
 		} else if (matches(*argv, "bridge") == 0 && !mflag_given) {
 			mflag_given = true;
 		} else if (matches(*argv, "help") == 0) {
-			ipvlan_explain(stderr);
+			print_explain(lu, stderr);
 			return -1;
 		} else {
-			fprintf(stderr, "ipvlan: unknown option \"%s\"?\n",
-				*argv);
-			ipvlan_explain(stderr);
+			fprintf(stderr, "%s: unknown option \"%s\"?\n",
+				lu->id, *argv);
+			print_explain(lu, stderr);
 			return -1;
 		}
 		argc--;
@@ -113,7 +113,7 @@ static void ipvlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 static void ipvlan_print_help(struct link_util *lu, int argc, char **argv,
 			      FILE *f)
 {
-	ipvlan_explain(f);
+	print_explain(lu, f);
 }
 
 struct link_util ipvlan_link_util = {
@@ -123,3 +123,11 @@ struct link_util ipvlan_link_util = {
 	.print_opt	= ipvlan_print_opt,
 	.print_help	= ipvlan_print_help,
 };
+
+struct link_util ipvtap_link_util = {
+	.id		= "ipvtap",
+	.maxattr	= IFLA_IPVLAN_MAX,
+	.parse_opt	= ipvlan_parse_opt,
+	.print_opt	= ipvlan_print_opt,
+	.print_help	= ipvlan_print_help,
+};
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index 38e4ee684..9f345f96f 100644
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -215,6 +215,7 @@ ip-link \- network device configuration
 .BR vti " |"
 .BR nlmon " |"
 .BR ipvlan " |"
+.BR ipvtap " |"
 .BR lowpan " |"
 .BR geneve " |"
 .BR vrf " |"
@@ -329,6 +330,9 @@ Link types:
 .BR ipvlan
 - Interface for L3 (IPv6/IPv4) based VLANs
 .sp
+.BR ipvtap
+- Interface for L3 (IPv6/IPv4) based VLANs and TAP
+.sp
 .BR lowpan
 - Interface for 6LoWPAN (IPv6) over IEEE 802.15.4 / Bluetooth
 .sp