diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-06-14 16:54:53 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-06-14 16:49:34 +0900 |
| commit | 1f5a66a33c485a97ae80688523f526dd945aabc1 (patch) | |
| tree | c3e645d2268231ee9c3eb141ca479684165b739b /server/fsm.go | |
| parent | ca2e7730bd8838b1f633e1f1808e0edce9269162 (diff) | |
server: replace SenderMsg workaround with InfiniteChannel
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'server/fsm.go')
| -rw-r--r-- | server/fsm.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/server/fsm.go b/server/fsm.go index 3069893b..e0fb53c2 100644 --- a/server/fsm.go +++ b/server/fsm.go @@ -360,12 +360,12 @@ type FSMHandler struct { errorCh chan FsmStateReason incoming *channels.InfiniteChannel stateCh chan *FsmMsg - outgoing chan *FsmOutgoingMsg + outgoing *channels.InfiniteChannel holdTimerResetCh chan bool sentNotification string } -func NewFSMHandler(fsm *FSM, incoming *channels.InfiniteChannel, stateCh chan *FsmMsg, outgoing chan *FsmOutgoingMsg) *FSMHandler { +func NewFSMHandler(fsm *FSM, incoming *channels.InfiniteChannel, stateCh chan *FsmMsg, outgoing *channels.InfiniteChannel) *FSMHandler { h := &FSMHandler{ fsm: fsm, errorCh: make(chan FsmStateReason, 2), @@ -1077,7 +1077,8 @@ func (h *FSMHandler) sendMessageloop() error { select { case <-h.t.Dying(): return nil - case m := <-h.outgoing: + case o := <-h.outgoing.Out(): + m := o.(*FsmOutgoingMsg) for _, msg := range table.CreateUpdateMsgFromPaths(m.Paths) { if err := send(msg); err != nil { return nil @@ -1163,7 +1164,7 @@ func (h *FSMHandler) established() (bgp.FSMState, FsmStateReason) { "State": fsm.state.String(), }).Warn("hold timer expired") m := bgp.NewBGPNotificationMessage(bgp.BGP_ERROR_HOLD_TIMER_EXPIRED, 0, nil) - h.outgoing <- &FsmOutgoingMsg{Notification: m} + h.outgoing.In() <- &FsmOutgoingMsg{Notification: m} return bgp.BGP_FSM_IDLE, FSM_HOLD_TIMER_EXPIRED case <-h.holdTimerResetCh: if fsm.pConf.Timers.State.NegotiatedHoldTime != 0 { @@ -1175,7 +1176,7 @@ func (h *FSMHandler) established() (bgp.FSMState, FsmStateReason) { switch s { case ADMIN_STATE_DOWN: m := bgp.NewBGPNotificationMessage(bgp.BGP_ERROR_CEASE, bgp.BGP_ERROR_SUB_ADMINISTRATIVE_SHUTDOWN, nil) - h.outgoing <- &FsmOutgoingMsg{Notification: m} + h.outgoing.In() <- &FsmOutgoingMsg{Notification: m} } } } |