Skip to contentSkip to conversation

iproute2: GRE over IPv6 tunnel support.

PATCH RESEND Applied Dmitry Kozlov 3 participants 5 messages Sep 28, 2013 – Oct 1, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 iproute2: GRE over IPv6 tunnel support.

GRE over IPv6 tunnel support.

---
 ip/Makefile    |   3 +-
 ip/ip6tunnel.c | 131 ++++++++++++++++---
 ip/iplink.c    |   7 +-
 ip/link_gre6.c | 398 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 516 insertions(+), 23 deletions(-)
 create mode 100644 ip/link_gre6.c
ip/Makefile +1 -2
index 48bd4a1..f10d22f 100644
@@ -5,7 +5,7 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
     iplink_vlan.o link_veth.o link_gre.o iplink_can.o \
     iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o \
     iplink_vxlan.o tcp_metrics.o iplink_ipoib.o ipnetconf.o link_ip6tnl.o \
-    link_iptnl.o
+    link_iptnl.o link_gre6.o
 
 RTMONOBJ=rtmon.o
 
@@ -23,7 +23,6 @@ all: $(TARGETS) $(SCRIPTS)
 
 ip: $(IPOBJ) $(LIBNETLINK)
 
-
 rtmon: $(RTMONOBJ)
 
 install: all
ip/ip6tunnel.c +114 -17

237 lines not on this page · raw message

ip/iplink.c +3 -4
index ada9d42..16cb6fe 100644
@@ -85,7 +85,8 @@ void iplink_usage(void)
 	if (iplink_have_newlink()) {
 		fprintf(stderr, "\n");
 		fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | can |\n");
-		fprintf(stderr, "          bridge | ipoib | ip6tnl | ipip | sit | vxlan }\n");
+		fprintf(stderr, "          bridge | ipoib | ip6tnl | ipip | sit | vxlan |\n");
+		fprintf(stderr, "          gre | gretap | ip6gre | ip6gretap }\n");
 	}
 	exit(-1);
 }
@@ -243,7 +244,7 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp,
 			}
 			ivt.vf = vf;
 			addattr_l(&req->n, sizeof(*req), IFLA_VF_TX_RATE, &ivt, sizeof(ivt));
-		
+
 		} else if (matches(*argv, "spoofchk") == 0) {
 			struct ifla_vf_spoofchk ivs;
 			NEXT_ARG();
@@ -286,7 +287,6 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp,
 	return 0;
 }
 
-
 int iplink_parse(int argc, char **argv, struct iplink_req *req,
 		char **name, char **type, char **link, char **dev, int *group)
 {
@@ -811,7 +811,6 @@ static int set_address(struct ifreq *ifr, int brd)
 	return 0;
 }
 
-
 static int do_set(int argc, char **argv)
 {
 	char *dev = NULL;
ip/link_gre6.c new file +398 -0

398 lines not on this page · raw message

Signature · 1 line
1.8.3.2
#1 lore raw
Quoted 11 lines · On Sat, 28 Sep 2013 11:32:51 +0400 Dmitry Kozlov <[email protected]> wrote:

GRE over IPv6 tunnel support.

---
 ip/Makefile    |   3 +-
 ip/ip6tunnel.c | 131 ++++++++++++++++---
 ip/iplink.c    |   7 +-
 ip/link_gre6.c | 398 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 516 insertions(+), 23 deletions(-)
 create mode 100644 ip/link_gre6.c

Please send an additional patch to update the man page.

#3 lore raw
Quoted 12 lines · On Sat, 28 Sep 2013 23:27:52 +0200 Hannes Frederic Sowa…
Quoted 3 lines · Dmitry Kozlov

GRE over IPv6 tunnel support.

Dmitry, thanks a lot for resending!

One small nit:

lib/ll_types.c would need a new entry in ll_type_n2a for ARPHDR_IP6GRE so ip link ls can pretty print the link type.

Ok, fixed