server: use write deadline

Seems that write() is blocked forever when a connection is not cleanly
closed.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

2 files changed, 15 insertions, 0 deletions

diff --git a/server/fsm.go b/server/fsm.go
index b40305f6..7bced26c 100644
--- a/server/fsm.go
+++ b/server/fsm.go
@@ -682,9 +682,20 @@ func (h *FSMHandler) sendMessageloop() error {
 			fsm.bgpMessageStateUpdate(0, false)
 			return nil
 		}
+		if err := conn.SetWriteDeadline(time.Now().Add(time.Second * 30)); err != nil {
+			h.errorCh <- true
+			conn.Close()
+			return fmt.Errorf("failed to set write deadline")
+		}
 		_, err = conn.Write(b)
 		if err != nil {
+			log.WithFields(log.Fields{
+				"Topic": "Peer",
+				"Key":   fsm.peerConfig.NeighborAddress,
+				"Data":  err,
+			}).Warn("failed to send")
 			h.errorCh <- true
+			conn.Close()
 			return fmt.Errorf("closed")
 		}
 		fsm.bgpMessageStateUpdate(m.Header.Type, false)
diff --git a/server/fsm_test.go b/server/fsm_test.go
index ef962598..6f18014d 100644
--- a/server/fsm_test.go
+++ b/server/fsm_test.go
@@ -46,6 +46,10 @@ func NewMockConnection() *MockConnection {
 	return m
 }
 
+func (m *MockConnection) SetWriteDeadline(t time.Time) error {
+	return nil
+}
+
 func (m *MockConnection) setData(data []byte) int {
 	dataChan := make(chan byte, 4096)
 	for _, b := range data {