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

Merge pull request #11222 from donaldsharp/bgp_zebra_stuff

Browse Source 
Bgp zebra stuff
This commit is contained in:
Sri Mohana Singamsetty 2022-05-19 09:41:41 -07:00 committed by GitHub
commit 0e6e6bc36e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bgpd/bgp_fsm.c
View File

@ -1701,6 +1701,12 @@ static int bgp_connect_success(struct peer *peer)
return -1; return -1;
} }
/*
* If we are doing nht for a peer that ls v6 LL based
* massage the event system to make things happy
*/
bgp_nht_interface_events(peer);
bgp_reads_on(peer); bgp_reads_on(peer);
if (bgp_debug_neighbor_events(peer)) { if (bgp_debug_neighbor_events(peer)) {
@ -1739,6 +1745,12 @@ static int bgp_connect_success_w_delayopen(struct peer *peer)
return -1; return -1;
} }
/*
* If we are doing nht for a peer that ls v6 LL based
* massage the event system to make things happy
*/
bgp_nht_interface_events(peer);
bgp_reads_on(peer); bgp_reads_on(peer);
if (bgp_debug_neighbor_events(peer)) { if (bgp_debug_neighbor_events(peer)) {

2
zebra/kernel_netlink.c
View File

@ -591,7 +591,7 @@ bool nl_addraw_l(struct nlmsghdr *n, unsigned int maxlen, const void *data,
unsigned int len) unsigned int len)
{ {
if (NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len) > maxlen) { if (NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len) > maxlen) {
zlog_err("ERROR message exceeded bound of %d\n", maxlen); zlog_err("ERROR message exceeded bound of %d", maxlen);
return false; return false;
} }