proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-08-16 10:45:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iproute_lwtunnel: allow specifying 'src' for 'encap ip' / 'encap ip6'

Browse Source 
This allows the user to specify the LWTUNNEL_IP_SRC/LWTUNNEL_IP6_SRC
when setting an lwtunnel encapsulation route.

Signed-off-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Shmulik Ladkani 2018-08-17 10:31:34 +03:00 committed by David Ahern
parent db71144c0c
commit 94a8722f2f
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ip/iproute_lwtunnel.c
View File

@ -765,7 +765,7 @@ static int parse_encap_mpls(struct rtattr *rta, size_t len,
static int parse_encap_ip(struct rtattr *rta, size_t len, static int parse_encap_ip(struct rtattr *rta, size_t len,
int *argcp, char ***argvp) int *argcp, char ***argvp)
{ {
int id_ok = 0, dst_ok = 0, tos_ok = 0, ttl_ok = 0; int id_ok = 0, dst_ok = 0, src_ok = 0, tos_ok = 0, ttl_ok = 0;
char **argv = *argvp; char **argv = *argvp;
int argc = *argcp; int argc = *argcp;
@ -788,6 +788,15 @@ static int parse_encap_ip(struct rtattr *rta, size_t len,
get_addr(&addr, *argv, AF_INET); get_addr(&addr, *argv, AF_INET);
rta_addattr_l(rta, len, LWTUNNEL_IP_DST, rta_addattr_l(rta, len, LWTUNNEL_IP_DST,
&addr.data, addr.bytelen); &addr.data, addr.bytelen);
} else if (strcmp(*argv, "src") == 0) {
inet_prefix addr;
NEXT_ARG();
if (src_ok++)
duparg2("src", *argv);
get_addr(&addr, *argv, AF_INET);
rta_addattr_l(rta, len, LWTUNNEL_IP_SRC,
&addr.data, addr.bytelen);
} else if (strcmp(*argv, "tos") == 0) { } else if (strcmp(*argv, "tos") == 0) {
__u32 tos; __u32 tos;
@ -899,7 +908,7 @@ static int parse_encap_ila(struct rtattr *rta, size_t len,
static int parse_encap_ip6(struct rtattr *rta, size_t len, static int parse_encap_ip6(struct rtattr *rta, size_t len,
int *argcp, char ***argvp) int *argcp, char ***argvp)
{ {
int id_ok = 0, dst_ok = 0, tos_ok = 0, ttl_ok = 0; int id_ok = 0, dst_ok = 0, src_ok = 0, tos_ok = 0, ttl_ok = 0;
char **argv = *argvp; char **argv = *argvp;
int argc = *argcp; int argc = *argcp;
@ -922,6 +931,15 @@ static int parse_encap_ip6(struct rtattr *rta, size_t len,
get_addr(&addr, *argv, AF_INET6); get_addr(&addr, *argv, AF_INET6);
rta_addattr_l(rta, len, LWTUNNEL_IP6_DST, rta_addattr_l(rta, len, LWTUNNEL_IP6_DST,
&addr.data, addr.bytelen); &addr.data, addr.bytelen);
} else if (strcmp(*argv, "src") == 0) {
inet_prefix addr;
NEXT_ARG();
if (src_ok++)
duparg2("src", *argv);
get_addr(&addr, *argv, AF_INET6);
rta_addattr_l(rta, len, LWTUNNEL_IP6_SRC,
&addr.data, addr.bytelen);
} else if (strcmp(*argv, "tc") == 0) { } else if (strcmp(*argv, "tc") == 0) {
__u32 tc; __u32 tc;