summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2018-07-16 20:20:02 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2018-07-24 09:39:35 +0900
commitc3e41d89620a4dafc53f22732f5eef054c01b39c (patch)
treebe6881d85a6d6564e603621594834134e0bf1c8f
parent775ed7af04ad385df7ba90fc1b0507f9570754b0 (diff)
pkg/server: send all families (including RTC) after deferral time expired
fixes #1788 Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--pkg/server/server.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 78f0c254..c21d4770 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -1994,6 +1994,9 @@ func (s *BgpServer) softResetOut(addr string, family bgp.RouteFamily, deferral b
families := familiesForSoftreset(peer, family)
if deferral {
+ if family == bgp.RouteFamily(0) {
+ families = peer.configuredRFlist()
+ }
peer.fsm.lock.RLock()
_, y := peer.fsm.rfMap[bgp.RF_RTC_UC]
c := peer.fsm.pConf.GetAfiSafi(bgp.RF_RTC_UC)