matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iplink_geneve: add ttl configuration at link creation 

Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville 2015-06-15 14:37:15 -04:00 committed by Stephen Hemminger
parent c1a1d8bc4c
commit f4c05c2e99
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/if_link.h
View File

@ -393,6 +393,7 @@ enum {
IFLA_GENEVE_UNSPEC, IFLA_GENEVE_UNSPEC,
IFLA_GENEVE_ID, IFLA_GENEVE_ID,
IFLA_GENEVE_REMOTE, IFLA_GENEVE_REMOTE,
IFLA_GENEVE_TTL,
__IFLA_GENEVE_MAX __IFLA_GENEVE_MAX
}; };
#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1) #define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)

23
ip/iplink_geneve.c
View File

@ -17,9 +17,11 @@
static void print_explain(FILE *f) static void print_explain(FILE *f)
{ {
fprintf(f, "Usage: ... geneve id VNI remote ADDR\n"); fprintf(f, "Usage: ... geneve id VNI remote ADDR\n");
fprintf(f, " [ ttl TTL ]\n");
fprintf(f, "\n"); fprintf(f, "\n");
fprintf(f, "Where: VNI := 0-16777215\n"); fprintf(f, "Where: VNI := 0-16777215\n");
fprintf(f, " ADDR := IP_ADDRESS\n"); fprintf(f, " ADDR := IP_ADDRESS\n");
fprintf(f, " TTL := { 1..255 | inherit }\n");
} }
static void explain(void) static void explain(void)
@ -34,7 +36,7 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
int vni_set = 0; int vni_set = 0;
__u32 daddr = 0; __u32 daddr = 0;
struct in6_addr daddr6 = IN6ADDR_ANY_INIT; struct in6_addr daddr6 = IN6ADDR_ANY_INIT;
__u8 ttl = 0;
while (argc > 0) { while (argc > 0) {
if (!matches(*argv, "id") || if (!matches(*argv, "id") ||
@ -52,6 +54,18 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
} }
if (IN_MULTICAST(ntohl(daddr))) if (IN_MULTICAST(ntohl(daddr)))
invarg("invalid remote address", *argv); invarg("invalid remote address", *argv);
} else if (!matches(*argv, "ttl") ||
!matches(*argv, "hoplimit")) {
unsigned uval;
NEXT_ARG();
if (strcmp(*argv, "inherit") != 0) {
if (get_unsigned(&uval, *argv, 0))
invarg("invalid TTL", *argv);
if (uval > 255)
invarg("TTL must be <= 255", *argv);
ttl = uval;
}
} else if (matches(*argv, "help") == 0) { } else if (matches(*argv, "help") == 0) {
explain(); explain();
return -1; return -1;
@ -80,6 +94,7 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
addattr32(n, 1024, IFLA_GENEVE_ID, vni); addattr32(n, 1024, IFLA_GENEVE_ID, vni);
if (daddr) if (daddr)
addattr_l(n, 1024, IFLA_GENEVE_REMOTE, &daddr, 4); addattr_l(n, 1024, IFLA_GENEVE_REMOTE, &daddr, 4);
addattr8(n, 1024, IFLA_GENEVE_TTL, ttl);
return 0; return 0;
} }
@ -105,6 +120,12 @@ static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
fprintf(f, "remote %s ", fprintf(f, "remote %s ",
format_host(AF_INET, 4, &addr, s1, sizeof(s1))); format_host(AF_INET, 4, &addr, s1, sizeof(s1)));
} }
if (tb[IFLA_GENEVE_TTL]) {
__u8 ttl = rta_getattr_u8(tb[IFLA_GENEVE_TTL]);
if (ttl)
fprintf(f, "ttl %d ", ttl);
}
} }
static void geneve_print_help(struct link_util *lu, int argc, char **argv, static void geneve_print_help(struct link_util *lu, int argc, char **argv,

7
man/man8/ip-link.8.in
View File

@ -606,6 +606,9 @@ the following additional arguments are supported:
.BI "ip link add " DEVICE .BI "ip link add " DEVICE
.BI type " geneve " id " ID " remote " IPADDR" .BI type " geneve " id " ID " remote " IPADDR"
.R " [ "
.BI ttl " TTL "
.R " ]"
.in +8 .in +8
.sp .sp
@ -616,6 +619,10 @@ the following additional arguments are supported:
.BI remote " IPADDR" .BI remote " IPADDR"
- specifies the unicast destination IP address to use in outgoing packets. - specifies the unicast destination IP address to use in outgoing packets.
.sp
.BI ttl " TTL"
- specifies the TTL value to use in outgoing packets.
.in -8 .in -8
.SS ip link delete - delete virtual link .SS ip link delete - delete virtual link