summaryrefslogtreecommitdiffhomepage
path: root/server/server.go
diff options
context:
space:
mode:
authorWataru Ishida <ishida.wataru@lab.ntt.co.jp>2016-11-21 04:47:34 -0500
committerWataru Ishida <ishida.wataru@lab.ntt.co.jp>2016-11-21 19:41:38 -0500
commit5d4e9154b063aee1ecc1a90212965b561c6def99 (patch)
tree8cbfd0be28995757e5e86d8ae42cb37f9db4220a /server/server.go
parent7006ec15fe72bdcf41f03d9e76db6783e7970b0a (diff)
server: fix memory leak in infinite channel goroutine
infinite channel has internal goroutine which won't stop until all items in the buffer are dequeued. Signed-off-by: Wataru Ishida <ishida.wataru@lab.ntt.co.jp>
Diffstat (limited to 'server/server.go')
-rw-r--r--server/server.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/server.go b/server/server.go
index d18cf641..fd0ebf1f 100644
--- a/server/server.go
+++ b/server/server.go
@@ -703,7 +703,7 @@ func (server *BgpServer) handleFSMMessage(peer *Peer, e *FsmMsg) {
}
}
- peer.outgoing.Close()
+ cleanInfiniteChannel(peer.outgoing)
peer.outgoing = channels.NewInfiniteChannel()
if nextState == bgp.BGP_FSM_ESTABLISHED {
// update for export policy
@@ -1740,6 +1740,7 @@ func (server *BgpServer) deleteNeighbor(c *config.Neighbor, code, subcode uint8)
n.fsm.sendNotification(code, subcode, nil, "")
n.stopPeerRestarting()
+ cleanInfiniteChannel(n.outgoing)
go func(addr string) {
t1 := time.AfterFunc(time.Minute*5, func() {