]> git.puffer.fish Git - matthieu/frr.git/commitdiff
Merge pull request #8691 from louis-oui/split-soft-reconfig
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 10 Jun 2021 16:04:54 +0000 (12:04 -0400)
committerGitHub <noreply@github.com>
Thu, 10 Jun 2021 16:04:54 +0000 (12:04 -0400)
bgpd: split soft reconfig table task into several jobs to not block vtysh

1  2 
bgpd/bgp_route.c
bgpd/bgp_route.h
bgpd/bgp_table.h
bgpd/bgpd.c

index 706bf17403e132f4e3756ec4ad529b3211b753ad,26f7583e797dd3a7f4db3c5f839ac96255565ec3..8e399b9b14daf8faa2a8ed2a255aa2e7fb773d87
@@@ -4645,8 -4820,11 +4820,11 @@@ void bgp_soft_reconfig_in(struct peer *
  {
        struct bgp_dest *dest;
        struct bgp_table *table;
+       struct listnode *node, *nnode;
+       struct peer *npeer;
+       struct peer_af *paf;
  
 -      if (peer->status != Established)
 +      if (!peer_established(peer))
                return;
  
        if ((safi != SAFI_MPLS_VPN) && (safi != SAFI_ENCAP)
Simple merge
Simple merge
diff --cc bgpd/bgpd.c
Simple merge