mirror/osrg-gobgp
1
0
Fork 0
mirror of https://github.com/osrg/gobgp.git synced 2024-05-11 05:55:10 +00:00
Code Issues Releases Activity

server: avoid deadlock

Browse Source 
toConfig() uses lock in itself.
This commit is contained in:
Eiichiro Watanabe
2018-11-10 18:37:17 +09:00
parent 360f72818b
commit eebc7291ce
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/server/server.go
+4 -2
View File
@@ -737,6 +737,7 @@ func (server *BgpServer) notifyPrePolicyUpdateWatcher(peer *peer, pathList []*ta
if len(cloned) == 0 {
return
}
n := server.toConfig(peer, false)
peer.fsm.lock.RLock()
_, y := peer.fsm.capMap[bgp.BGP_CAP_FOUR_OCTET_AS_NUMBER]
l, _ := peer.fsm.LocalHostPort()
@@ -752,7 +753,7 @@ func (server *BgpServer) notifyPrePolicyUpdateWatcher(peer *peer, pathList []*ta
Payload: payload,
PostPolicy: false,
PathList: cloned,
Neighbor: server.toConfig(peer, false),
Neighbor: n,
}
peer.fsm.lock.RUnlock()
server.notifyWatcher(watchEventTypePreUpdate, ev)
@@ -767,6 +768,7 @@ func (server *BgpServer) notifyPostPolicyUpdateWatcher(peer *peer, pathList []*t
if len(cloned) == 0 {
return
}
n := server.toConfig(peer, false)
peer.fsm.lock.RLock()
_, y := peer.fsm.capMap[bgp.BGP_CAP_FOUR_OCTET_AS_NUMBER]
l, _ := peer.fsm.LocalHostPort()
@@ -780,7 +782,7 @@ func (server *BgpServer) notifyPostPolicyUpdateWatcher(peer *peer, pathList []*t
Timestamp: cloned[0].GetTimestamp(),
PostPolicy: true,
PathList: cloned,
Neighbor: server.toConfig(peer, false),
Neighbor: n,
}
peer.fsm.lock.RUnlock()
server.notifyWatcher(watchEventTypePostUpdate, ev)