2 files changed, 38 insertions, 6 deletions
diff --git a/server/fsm.go b/server/fsm.go
index 9b81d1f4..e0e26ce9 100644
--- a/server/fsm.go
+++ b/server/fsm.go
@@ -308,12 +308,24 @@ func (h *FSMHandler) sendMessageloop() error {
 		case <-h.t.Dying():
 			return nil
 		case m := <-fsm.outgoing:
-			b, _ := m.Serialize()
-			_, err := conn.Write(b)
-			if err != nil {
-				return nil
+			isSend := func(state int, Type uint8) bool {
+				switch Type {
+				case bgp.BGP_MSG_UPDATE:
+					if state == bgp.BGP_FSM_ESTABLISHED {
+						return true
+					}
+				}
+				return false
+			}(fsm.state, m.Header.Type)
+
+			if isSend {
+				b, _ := m.Serialize()
+				_, err := conn.Write(b)
+				if err != nil {
+					return nil
+				}
+				fsm.bgpMessageStateUpdate(m.Header.Type, false)
 			}
-			fsm.bgpMessageStateUpdate(m.Header.Type, false)
 		case <-fsm.keepaliveTicker.C:
 			m := bgp.NewBGPKeepAliveMessage()
 			b, _ := m.Serialize()
diff --git a/server/peer.go b/server/peer.go
index 8439e7f5..ab80e9bf 100644
--- a/server/peer.go
+++ b/server/peer.go
@@ -82,7 +82,27 @@ func (peer *Peer) handlePeermessage(m *message) {
 	switch m.event {
 	case PEER_MSG_PATH:
 		pList, wList, _ := peer.rib.ProcessPaths(m.data.([]table.Path))
-		fmt.Println(pList, wList)
+		// TODO: merge multiple messages
+		// TODO: 4bytes and 2bytes conversion.
+
+		msgs := make([]*bgp.BGPMessage, 0)
+		for _, p := range pList {
+			pathAttrs := p.GetPathAttrs()
+			nlri := p.GetNlri().(*bgp.NLRInfo)
+			m := bgp.NewBGPUpdateMessage([]bgp.WithdrawnRoute{}, pathAttrs, []bgp.NLRInfo{*nlri})
+			msgs = append(msgs, m)
+		}
+
+		for _, dest := range wList {
+			p := dest.GetOldBestPath()
+			draw := p.GetNlri().(*bgp.WithdrawnRoute)
+			m := bgp.NewBGPUpdateMessage([]bgp.WithdrawnRoute{*draw}, []bgp.PathAttributeInterface{}, []bgp.NLRInfo{})
+			msgs = append(msgs, m)
+		}
+
+		for _, m := range msgs {
+			peer.outgoing <- m
+		}
 	}
 }