Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

isisd: Request SRv6 locator after zebra connection (backport #18178) #18179

Merged
merged 2 commits into from
Feb 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions isisd/isis_srv6.c
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,27 @@ int isis_srv6_ifp_up_notify(struct interface *ifp)
return 0;
}

/**
* Request SRv6 locator info from the SID Manager for all IS-IS areas where SRv6
* is enabled and a locator has been configured.
* This function is called as soon as the connection with Zebra is established
* to get information about all configured locators.
*/
void isis_srv6_locators_request(void)
{
struct isis *isis = isis_lookup_by_vrfid(VRF_DEFAULT);
struct listnode *node;
struct isis_area *area;

if (!isis)
return;

for (ALL_LIST_ELEMENTS_RO(isis->area_list, node, area))
if (area->srv6db.config.enabled &&
area->srv6db.config.srv6_locator_name[0] != '\0' && !area->srv6db.srv6_locator)
isis_zebra_srv6_manager_get_locator(area->srv6db.config.srv6_locator_name);
}

/**
* IS-IS SRv6 initialization for given area.
*
Expand Down
2 changes: 2 additions & 0 deletions isisd/isis_srv6.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ isis_srv6_sid_alloc(struct isis_area *area, struct srv6_locator *locator,
struct in6_addr *sid_value);
extern void isis_srv6_sid_free(struct isis_srv6_sid *sid);

void isis_srv6_locators_request(void);

extern void isis_srv6_area_init(struct isis_area *area);
extern void isis_srv6_area_term(struct isis_area *area);

Expand Down
1 change: 1 addition & 0 deletions isisd/isis_zebra.c
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,7 @@ static void isis_zebra_connected(struct zclient *zclient)
zclient_register_opaque(zclient, LDP_IGP_SYNC_IF_STATE_UPDATE);
zclient_register_opaque(zclient, LDP_IGP_SYNC_ANNOUNCE_UPDATE);
bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER, VRF_DEFAULT);
isis_srv6_locators_request();
}

/**
Expand Down
Loading