diff options
Diffstat (limited to 'server/fsm.go')
| -rw-r--r-- | server/fsm.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/server/fsm.go b/server/fsm.go index 5c93fce6..b70f0860 100644 --- a/server/fsm.go +++ b/server/fsm.go @@ -388,9 +388,10 @@ func (h *FSMHandler) sendMessageloop() error { conn := h.conn fsm := h.fsm for { + // this function doesn't check Dying() because we + // can't die before sending notificaiton. After + // sending notification, we'll die. select { - case <-h.t.Dying(): - return nil case m := <-h.outgoing: b, _ := m.Serialize() _, err := conn.Write(b) @@ -407,6 +408,7 @@ func (h *FSMHandler) sendMessageloop() error { if m.Header.Type == bgp.BGP_MSG_NOTIFICATION { h.errorCh <- true + conn.Close() return nil } case <-fsm.keepaliveTicker.C: @@ -445,7 +447,6 @@ func (h *FSMHandler) established() bgp.FSMState { h.t.Kill(nil) return bgp.BGP_FSM_IDLE case <-h.t.Dying(): - h.conn.Close() return 0 } } |