proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 14:50:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13303 from pguibert6WIND/srv6_seg6local_defaultvrf

Browse Source 
lib: fix handle seg6local routes on default vrf
This commit is contained in:
Donald Sharp 2023-04-14 10:36:12 -04:00 committed by GitHub
commit be574cf987
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

9
lib/zclient.c
View File

@ -427,13 +427,18 @@ enum zclient_send_status zclient_send_vrf_label(struct zclient *zclient,
} }
enum zclient_send_status zclient_send_localsid(struct zclient *zclient, enum zclient_send_status zclient_send_localsid(struct zclient *zclient,
const struct in6_addr *sid, ifindex_t oif, const struct in6_addr *sid, vrf_id_t vrf_id,
enum seg6local_action_t action, enum seg6local_action_t action,
const struct seg6local_context *context) const struct seg6local_context *context)
{ {
struct prefix_ipv6 p = {}; struct prefix_ipv6 p = {};
struct zapi_route api = {}; struct zapi_route api = {};
struct zapi_nexthop *znh; struct zapi_nexthop *znh;
struct interface *ifp;
ifp = if_get_vrf_loopback(vrf_id);
if (ifp == NULL)
return ZCLIENT_SEND_FAILURE;
p.family = AF_INET6; p.family = AF_INET6;
p.prefixlen = IPV6_MAX_BITLEN; p.prefixlen = IPV6_MAX_BITLEN;
@ -456,7 +461,7 @@ enum zclient_send_status zclient_send_localsid(struct zclient *zclient,
memset(znh, 0, sizeof(*znh)); memset(znh, 0, sizeof(*znh));
znh->type = NEXTHOP_TYPE_IFINDEX; znh->type = NEXTHOP_TYPE_IFINDEX;
znh->ifindex = oif; znh->ifindex = ifp->ifindex;
SET_FLAG(znh->flags, ZAPI_NEXTHOP_FLAG_SEG6LOCAL); SET_FLAG(znh->flags, ZAPI_NEXTHOP_FLAG_SEG6LOCAL);
znh->seg6local_action = action; znh->seg6local_action = action;
memcpy(&znh->seg6local_ctx, context, sizeof(struct seg6local_context)); memcpy(&znh->seg6local_ctx, context, sizeof(struct seg6local_context));

2
lib/zclient.h
View File

@ -901,7 +901,7 @@ zclient_send_vrf_label(struct zclient *zclient, vrf_id_t vrf_id, afi_t afi,
extern enum zclient_send_status extern enum zclient_send_status
zclient_send_localsid(struct zclient *zclient, const struct in6_addr *sid, zclient_send_localsid(struct zclient *zclient, const struct in6_addr *sid,
ifindex_t oif, enum seg6local_action_t action, vrf_id_t vrf_id, enum seg6local_action_t action,
const struct seg6local_context *context); const struct seg6local_context *context);
extern void zclient_send_reg_requests(struct zclient *, vrf_id_t); extern void zclient_send_reg_requests(struct zclient *, vrf_id_t);