Skip to content

I
iproute2
Commit af89576d authored by xeb@mail.ru's avatar xeb@mail.ru Committed by Stephen Hemminger
Browse files
Options

iproute2: GRE over IPv6 tunnel support. 

GRE over IPv6 tunnel support.
Signed-off-by: default avatarDmitry Kozlov <xeb@mail.ru>
parent e26520e5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 516 additions and 23 deletions
ip/Makefile
View file @ af89576d
...@@ -5,7 +5,7 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ ...@@ -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_vlan.o link_veth.o link_gre.o iplink_can.o \
iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.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 \ 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 RTMONOBJ=rtmon.o
...@@ -23,7 +23,6 @@ all: $(TARGETS) $(SCRIPTS) ...@@ -23,7 +23,6 @@ all: $(TARGETS) $(SCRIPTS)
ip: $(IPOBJ) $(LIBNETLINK) ip: $(IPOBJ) $(LIBNETLINK)
rtmon: $(RTMONOBJ) rtmon: $(RTMONOBJ)
install: all install: all
......
ip/ip6tunnel.c
View file @ af89576d
...@@ -48,11 +48,12 @@ static void usage(void) __attribute__((noreturn)); ...@@ -48,11 +48,12 @@ static void usage(void) __attribute__((noreturn));
static void usage(void) static void usage(void)
{ {
fprintf(stderr, "Usage: ip -f inet6 tunnel { add | change | del | show } [ NAME ]\n"); fprintf(stderr, "Usage: ip -f inet6 tunnel { add | change | del | show } [ NAME ]\n");
fprintf(stderr, " [ mode { ip6ip6 | ipip6 | any } ]\n"); fprintf(stderr, " [ mode { ip6ip6 | ipip6 | ip6gre | any } ]\n");
fprintf(stderr, " [ remote ADDR local ADDR ] [ dev PHYS_DEV ]\n"); fprintf(stderr, " [ remote ADDR local ADDR ] [ dev PHYS_DEV ]\n");
fprintf(stderr, " [ encaplimit ELIM ]\n"); fprintf(stderr, " [ encaplimit ELIM ]\n");
fprintf(stderr ," [ hoplimit TTL ] [ tclass TCLASS ] [ flowlabel FLOWLABEL ]\n"); fprintf(stderr ," [ hoplimit TTL ] [ tclass TCLASS ] [ flowlabel FLOWLABEL ]\n");
fprintf(stderr, " [ dscp inherit ]\n"); fprintf(stderr, " [ dscp inherit ]\n");
fprintf(stderr, " [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n");
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "Where: NAME := STRING\n"); fprintf(stderr, "Where: NAME := STRING\n");
fprintf(stderr, " ADDR := IPV6_ADDRESS\n"); fprintf(stderr, " ADDR := IPV6_ADDRESS\n");
...@@ -62,10 +63,11 @@ static void usage(void) ...@@ -62,10 +63,11 @@ static void usage(void)
DEFAULT_TNL_HOP_LIMIT); DEFAULT_TNL_HOP_LIMIT);
fprintf(stderr, " TCLASS := { 0x0..0xff | inherit }\n"); fprintf(stderr, " TCLASS := { 0x0..0xff | inherit }\n");
fprintf(stderr, " FLOWLABEL := { 0x0..0xfffff | inherit }\n"); fprintf(stderr, " FLOWLABEL := { 0x0..0xfffff | inherit }\n");
fprintf(stderr, " KEY := { DOTTED_QUAD | NUMBER }\n");
exit(-1); exit(-1);
} }
static void print_tunnel(struct ip6_tnl_parm *p) static void print_tunnel(struct ip6_tnl_parm2 *p)
{ {
char remote[64]; char remote[64];
char local[64]; char local[64];
...@@ -104,9 +106,29 @@ static void print_tunnel(struct ip6_tnl_parm *p) ...@@ -104,9 +106,29 @@ static void print_tunnel(struct ip6_tnl_parm *p)
if (p->flags & IP6_TNL_F_RCV_DSCP_COPY) if (p->flags & IP6_TNL_F_RCV_DSCP_COPY)
printf(" dscp inherit"); printf(" dscp inherit");
if (p->proto == IPPROTO_GRE) {
if ((p->i_flags&GRE_KEY) && (p->o_flags&GRE_KEY) && p->o_key == p->i_key)
printf(" key %u", ntohl(p->i_key));
else if ((p->i_flags|p->o_flags)&GRE_KEY) {
if (p->i_flags&GRE_KEY)
printf(" ikey %u ", ntohl(p->i_key));
if (p->o_flags&GRE_KEY)
printf(" okey %u ", ntohl(p->o_key));
}
if (p->i_flags&GRE_SEQ)
printf("%s Drop packets out of sequence.\n", _SL_);
if (p->i_flags&GRE_CSUM)
printf("%s Checksum in received packet is required.", _SL_);
if (p->o_flags&GRE_SEQ)
printf("%s Sequence packets on output.", _SL_);
if (p->o_flags&GRE_CSUM)
printf("%s Checksum output packets.", _SL_);
}
} }
static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p) static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p)
{ {
int count = 0; int count = 0;
char medium[IFNAMSIZ]; char medium[IFNAMSIZ];
...@@ -124,6 +146,9 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p) ...@@ -124,6 +146,9 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p)
strcmp(*argv, "ipip6") == 0 || strcmp(*argv, "ipip6") == 0 ||
strcmp(*argv, "ip4ip6") == 0) strcmp(*argv, "ip4ip6") == 0)
p->proto = IPPROTO_IPIP; p->proto = IPPROTO_IPIP;
else if (strcmp(*argv, "ip6gre") == 0 ||
strcmp(*argv, "gre/ipv6") == 0)
p->proto = IPPROTO_GRE;
else if (strcmp(*argv, "any/ipv6") == 0 || else if (strcmp(*argv, "any/ipv6") == 0 ||
strcmp(*argv, "any") == 0) strcmp(*argv, "any") == 0)
p->proto = 0; p->proto = 0;
...@@ -202,6 +227,60 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p) ...@@ -202,6 +227,60 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p)
if (strcmp(*argv, "inherit") != 0) if (strcmp(*argv, "inherit") != 0)
invarg("not inherit", *argv); invarg("not inherit", *argv);
p->flags |= IP6_TNL_F_RCV_DSCP_COPY; p->flags |= IP6_TNL_F_RCV_DSCP_COPY;
} else if (strcmp(*argv, "key") == 0) {
unsigned uval;
NEXT_ARG();
p->i_flags |= GRE_KEY;
p->o_flags |= GRE_KEY;
if (strchr(*argv, '.'))
p->i_key = p->o_key = get_addr32(*argv);
else {
if (get_unsigned(&uval, *argv, 0)<0) {
fprintf(stderr, "invalid value of \"key\"\n");
exit(-1);
}
p->i_key = p->o_key = htonl(uval);
}
} else if (strcmp(*argv, "ikey") == 0) {
unsigned uval;
NEXT_ARG();
p->i_flags |= GRE_KEY;
if (strchr(*argv, '.'))
p->i_key = get_addr32(*argv);
else {
if (get_unsigned(&uval, *argv, 0)<0) {
fprintf(stderr, "invalid value of \"ikey\"\n");
exit(-1);
}
p->i_key = htonl(uval);
}
} else if (strcmp(*argv, "okey") == 0) {
unsigned uval;
NEXT_ARG();
p->o_flags |= GRE_KEY;
if (strchr(*argv, '.'))
p->o_key = get_addr32(*argv);
else {
if (get_unsigned(&uval, *argv, 0)<0) {
fprintf(stderr, "invalid value of \"okey\"\n");
exit(-1);
}
p->o_key = htonl(uval);
}
} else if (strcmp(*argv, "seq") == 0) {
p->i_flags |= GRE_SEQ;
p->o_flags |= GRE_SEQ;
} else if (strcmp(*argv, "iseq") == 0) {
p->i_flags |= GRE_SEQ;
} else if (strcmp(*argv, "oseq") == 0) {
p->o_flags |= GRE_SEQ;
} else if (strcmp(*argv, "csum") == 0) {
p->i_flags |= GRE_CSUM;
p->o_flags |= GRE_CSUM;
} else if (strcmp(*argv, "icsum") == 0) {
p->i_flags |= GRE_CSUM;
} else if (strcmp(*argv, "ocsum") == 0) {
p->o_flags |= GRE_CSUM;
} else { } else {
if (strcmp(*argv, "name") == 0) { if (strcmp(*argv, "name") == 0) {
NEXT_ARG(); NEXT_ARG();
...@@ -212,7 +291,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p) ...@@ -212,7 +291,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p)
duparg2("name", *argv); duparg2("name", *argv);
strncpy(p->name, *argv, IFNAMSIZ - 1); strncpy(p->name, *argv, IFNAMSIZ - 1);
if (cmd == SIOCCHGTUNNEL && count == 0) { if (cmd == SIOCCHGTUNNEL && count == 0) {
struct ip6_tnl_parm old_p; struct ip6_tnl_parm2 old_p;
memset(&old_p, 0, sizeof(old_p)); memset(&old_p, 0, sizeof(old_p));
if (tnl_get_ioctl(*argv, &old_p)) if (tnl_get_ioctl(*argv, &old_p))
return -1; return -1;
...@@ -230,7 +309,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p) ...@@ -230,7 +309,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p)
return 0; return 0;
} }
static void ip6_tnl_parm_init(struct ip6_tnl_parm *p, int apply_default) static void ip6_tnl_parm_init(struct ip6_tnl_parm2 *p, int apply_default)
{ {
memset(p, 0, sizeof(*p)); memset(p, 0, sizeof(*p));
p->proto = IPPROTO_IPV6; p->proto = IPPROTO_IPV6;
...@@ -244,8 +323,8 @@ static void ip6_tnl_parm_init(struct ip6_tnl_parm *p, int apply_default) ...@@ -244,8 +323,8 @@ static void ip6_tnl_parm_init(struct ip6_tnl_parm *p, int apply_default)
* @p1: user specified parameter * @p1: user specified parameter
* @p2: database entry * @p2: database entry
*/ */
static int ip6_tnl_parm_match(const struct ip6_tnl_parm *p1, static int ip6_tnl_parm_match(const struct ip6_tnl_parm2 *p1,
const struct ip6_tnl_parm *p2) const struct ip6_tnl_parm2 *p2)
{ {
return ((!p1->link || p1->link == p2->link) && return ((!p1->link || p1->link == p2->link) &&
(!p1->name[0] || strcmp(p1->name, p2->name) == 0) && (!p1->name[0] || strcmp(p1->name, p2->name) == 0) &&
...@@ -263,7 +342,7 @@ static int ip6_tnl_parm_match(const struct ip6_tnl_parm *p1, ...@@ -263,7 +342,7 @@ static int ip6_tnl_parm_match(const struct ip6_tnl_parm *p1,
(!p1->flags || (p1->flags & p2->flags))); (!p1->flags || (p1->flags & p2->flags)));
} }
static int do_tunnels_list(struct ip6_tnl_parm *p) static int do_tunnels_list(struct ip6_tnl_parm2 *p)
{ {
char buf[512]; char buf[512];
int err = -1; int err = -1;
...@@ -287,7 +366,7 @@ static int do_tunnels_list(struct ip6_tnl_parm *p) ...@@ -287,7 +366,7 @@ static int do_tunnels_list(struct ip6_tnl_parm *p)
rx_fifo, rx_frame, rx_fifo, rx_frame,
tx_bytes, tx_packets, tx_errs, tx_drops, tx_bytes, tx_packets, tx_errs, tx_drops,
tx_fifo, tx_colls, tx_carrier, rx_multi; tx_fifo, tx_colls, tx_carrier, rx_multi;
struct ip6_tnl_parm p1; struct ip6_tnl_parm2 p1;
char *ptr; char *ptr;
buf[sizeof(buf) - 1] = '\0'; buf[sizeof(buf) - 1] = '\0';
...@@ -312,10 +391,12 @@ static int do_tunnels_list(struct ip6_tnl_parm *p) ...@@ -312,10 +391,12 @@ static int do_tunnels_list(struct ip6_tnl_parm *p)
fprintf(stderr, "Failed to get type of \"%s\"\n", name); fprintf(stderr, "Failed to get type of \"%s\"\n", name);
continue; continue;
} }
if (type != ARPHRD_TUNNEL6) if (type != ARPHRD_TUNNEL6 && type != ARPHRD_IP6GRE)
continue; continue;
memset(&p1, 0, sizeof(p1)); memset(&p1, 0, sizeof(p1));
ip6_tnl_parm_init(&p1, 0); ip6_tnl_parm_init(&p1, 0);
if (type == ARPHRD_IP6GRE)
p1.proto = IPPROTO_GRE;
strcpy(p1.name, name); strcpy(p1.name, name);
p1.link = ll_name_to_index(p1.name); p1.link = ll_name_to_index(p1.name);
if (p1.link == 0) if (p1.link == 0)
...@@ -346,7 +427,7 @@ static int do_tunnels_list(struct ip6_tnl_parm *p) ...@@ -346,7 +427,7 @@ static int do_tunnels_list(struct ip6_tnl_parm *p)
static int do_show(int argc, char **argv) static int do_show(int argc, char **argv)
{ {
struct ip6_tnl_parm p; struct ip6_tnl_parm2 p;
ll_init_map(&rth); ll_init_map(&rth);
ip6_tnl_parm_init(&p, 0); ip6_tnl_parm_init(&p, 0);
...@@ -369,28 +450,44 @@ static int do_show(int argc, char **argv) ...@@ -369,28 +450,44 @@ static int do_show(int argc, char **argv)
static int do_add(int cmd, int argc, char **argv) static int do_add(int cmd, int argc, char **argv)
{ {
struct ip6_tnl_parm p; struct ip6_tnl_parm2 p;
ip6_tnl_parm_init(&p, 1); ip6_tnl_parm_init(&p, 1);
if (parse_args(argc, argv, cmd, &p) < 0) if (parse_args(argc, argv, cmd, &p) < 0)
return -1; return -1;
return tnl_add_ioctl(cmd, switch (p.proto) {
cmd == SIOCCHGTUNNEL && p.name[0] ? case IPPROTO_IPIP:
p.name : "ip6tnl0", p.name, &p); case IPPROTO_IPV6:
return tnl_add_ioctl(cmd, "ip6tnl0", p.name, &p);
case IPPROTO_GRE:
return tnl_add_ioctl(cmd, "ip6gre0", p.name, &p);
default:
fprintf(stderr, "cannot determine tunnel mode (ip6ip6, ipip6 or gre)\n");
}
return -1;
} }
static int do_del(int argc, char **argv) static int do_del(int argc, char **argv)
{ {
struct ip6_tnl_parm p; struct ip6_tnl_parm2 p;
ip6_tnl_parm_init(&p, 1); ip6_tnl_parm_init(&p, 1);
if (parse_args(argc, argv, SIOCDELTUNNEL, &p) < 0) if (parse_args(argc, argv, SIOCDELTUNNEL, &p) < 0)
return -1; return -1;
return tnl_del_ioctl(p.name[0] ? p.name : "ip6tnl0", p.name, &p); switch (p.proto) {
case IPPROTO_IPIP:
case IPPROTO_IPV6:
return tnl_del_ioctl("ip6tnl0", p.name, &p);
case IPPROTO_GRE:
return tnl_del_ioctl("ip6gre0", p.name, &p);
default:
return tnl_del_ioctl(p.name, p.name, &p);
}
return -1;
} }
int do_ip6tunnel(int argc, char **argv) int do_ip6tunnel(int argc, char **argv)
......
ip/iplink.c
View file @ af89576d
...@@ -85,7 +85,8 @@ void iplink_usage(void) ...@@ -85,7 +85,8 @@ void iplink_usage(void)
if (iplink_have_newlink()) { if (iplink_have_newlink()) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | can |\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); exit(-1);
} }
...@@ -243,7 +244,7 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp, ...@@ -243,7 +244,7 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp,
} }
ivt.vf = vf; ivt.vf = vf;
addattr_l(&req->n, sizeof(*req), IFLA_VF_TX_RATE, &ivt, sizeof(ivt)); addattr_l(&req->n, sizeof(*req), IFLA_VF_TX_RATE, &ivt, sizeof(ivt));
} else if (matches(*argv, "spoofchk") == 0) { } else if (matches(*argv, "spoofchk") == 0) {
struct ifla_vf_spoofchk ivs; struct ifla_vf_spoofchk ivs;
NEXT_ARG(); NEXT_ARG();
...@@ -286,7 +287,6 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp, ...@@ -286,7 +287,6 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp,
return 0; return 0;
} }
int iplink_parse(int argc, char **argv, struct iplink_req *req, int iplink_parse(int argc, char **argv, struct iplink_req *req,
char **name, char **type, char **link, char **dev, int *group) char **name, char **type, char **link, char **dev, int *group)
{ {
...@@ -811,7 +811,6 @@ static int set_address(struct ifreq *ifr, int brd) ...@@ -811,7 +811,6 @@ static int set_address(struct ifreq *ifr, int brd)
return 0; return 0;
} }
static int do_set(int argc, char **argv) static int do_set(int argc, char **argv)
{ {
char *dev = NULL; char *dev = NULL;
......
ip/link_gre6.c 0 → 100644
View file @ af89576d
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7