mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

Netlink: Allow RTA_VIA even without MPLS support

Browse Source 
It is necessary for IPv4 over IPv6 nexthop support on FreeBSD,
and RTA_VIA is not really related to MPLS.

It breaks build for some very old systems like Debian 8 and CentOS 7,
but we generally do not support older kernels than 4.14 LTS anyway.
This commit is contained in:
Luiz Amaral 2023-06-15 15:01:50 +02:00 committed by Ondrej Zajicek
parent 90f4176045
commit f8bcb037b5
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysdep/linux/netlink.c
View File

@ -485,7 +485,6 @@ static inline ip_addr rta_get_ipa(struct rtattr *a)
return ipa_from_ip6(rta_get_ip6(a)); return ipa_from_ip6(rta_get_ip6(a));
} }
#ifdef HAVE_MPLS_KERNEL
static inline ip_addr rta_get_via(struct rtattr *a) static inline ip_addr rta_get_via(struct rtattr *a)
{ {
struct rtvia *v = RTA_DATA(a); struct rtvia *v = RTA_DATA(a);
@ -496,6 +495,7 @@ static inline ip_addr rta_get_via(struct rtattr *a)
return IPA_NONE; return IPA_NONE;
} }
#ifdef HAVE_MPLS_KERNEL
static u32 rta_mpls_stack[MPLS_MAX_LABEL_STACK]; static u32 rta_mpls_stack[MPLS_MAX_LABEL_STACK];
static inline int rta_get_mpls(struct rtattr *a, u32 *stack) static inline int rta_get_mpls(struct rtattr *a, u32 *stack)
{ {
@ -763,10 +763,8 @@ nl_parse_multipath(struct nl_parse_state *s, struct krt_proto *p, const net_addr
if (a[RTA_FLOW]) if (a[RTA_FLOW])
s->rta_flow = rta_get_u32(a[RTA_FLOW]); s->rta_flow = rta_get_u32(a[RTA_FLOW]);
#ifdef HAVE_MPLS_KERNEL
if (a[RTA_VIA]) if (a[RTA_VIA])
rv->gw = rta_get_via(a[RTA_VIA]); rv->gw = rta_get_via(a[RTA_VIA]);
#endif
if (nh->rtnh_flags & RTNH_F_ONLINK) if (nh->rtnh_flags & RTNH_F_ONLINK)
rv->flags |= RNF_ONLINK; rv->flags |= RNF_ONLINK;
@ -1659,10 +1657,8 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
if (a[RTA_GATEWAY]) if (a[RTA_GATEWAY])
ra->nh.gw = rta_get_ipa(a[RTA_GATEWAY]); ra->nh.gw = rta_get_ipa(a[RTA_GATEWAY]);
#ifdef HAVE_MPLS_KERNEL
if (a[RTA_VIA]) if (a[RTA_VIA])
ra->nh.gw = rta_get_via(a[RTA_VIA]); ra->nh.gw = rta_get_via(a[RTA_VIA]);
#endif
if (i->rtm_flags & RTNH_F_ONLINK) if (i->rtm_flags & RTNH_F_ONLINK)
ra->nh.flags |= RNF_ONLINK; ra->nh.flags |= RNF_ONLINK;