proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-13 00:03:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12681 from pguibert6WIND/vpnv6_encode_plus

Browse Source 
Vpnv6 encode plus
This commit is contained in:
Donatas Abraitis 2023-01-24 14:47:58 +02:00 committed by GitHub
commit 1983a80dd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bgpd/bgp_route.c
View File

@ -2273,8 +2273,12 @@ bool subgroup_announce_check(struct bgp_dest *dest, struct bgp_path_info *pi,
&& peer->shared_network && peer->shared_network
&& (from == bgp->peer_self && (from == bgp->peer_self
|| peer->sort == BGP_PEER_EBGP))) { || peer->sort == BGP_PEER_EBGP))) {
attr->mp_nexthop_len = if (safi == SAFI_MPLS_VPN)
BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL; attr->mp_nexthop_len =
BGP_ATTR_NHLEN_VPNV6_GLOBAL_AND_LL;
else
attr->mp_nexthop_len =
BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL;
} }
/* Clear off link-local nexthop in source, whenever it is not /* Clear off link-local nexthop in source, whenever it is not

3
bgpd/bgp_routemap.c
View File

@ -3585,7 +3585,8 @@ route_set_ipv6_nexthop_local(void *rule, const struct prefix *p, void *object)
path->attr->mp_nexthop_local = *address; path->attr->mp_nexthop_local = *address;
/* Set nexthop length. */ /* Set nexthop length. */
if (path->attr->mp_nexthop_len != BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL) if (path->attr->mp_nexthop_len != BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL &&
path->attr->mp_nexthop_len != BGP_ATTR_NHLEN_VPNV6_GLOBAL_AND_LL)
path->attr->mp_nexthop_len = BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL; path->attr->mp_nexthop_len = BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL;
SET_FLAG(path->attr->rmap_change_flags, SET_FLAG(path->attr->rmap_change_flags,