diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/peer.go | 5 | ||||
| -rw-r--r-- | server/peer_test.go | 1 | ||||
| -rw-r--r-- | server/server.go | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/server/peer.go b/server/peer.go index 02956788..91d7894b 100644 --- a/server/peer.go +++ b/server/peer.go @@ -89,7 +89,6 @@ func NewPeer(g config.Global, peer config.Neighbor, serverMsgCh chan *serverMsg, p.peerInfo = &table.PeerInfo{ AS: peer.PeerAs, LocalID: g.RouterId, - RF: p.rf, Address: peer.NeighborAddress, } p.adjRib = table.NewAdjRib() @@ -315,7 +314,7 @@ func (peer *Peer) handlePeerMsg(m *peerMsg) { pList, wList, _ := peer.rib.ProcessPaths(m.msgData.([]table.Path)) peer.sendUpdateMsgFromPaths(pList, wList) case PEER_MSG_PEER_DOWN: - pList, wList, _ := peer.rib.DeletePathsforPeer(m.msgData.(*table.PeerInfo)) + pList, wList, _ := peer.rib.DeletePathsforPeer(m.msgData.(*table.PeerInfo), peer.rf) peer.sendUpdateMsgFromPaths(pList, wList) } } @@ -344,7 +343,7 @@ func (peer *Peer) handleServerMsg(m *serverMsg) { _, found := peer.siblings[d.Address.String()] if found { delete(peer.siblings, d.Address.String()) - pList, wList, _ := peer.rib.DeletePathsforPeer(d) + pList, wList, _ := peer.rib.DeletePathsforPeer(d, peer.rf) peer.sendUpdateMsgFromPaths(pList, wList) } else { log.Warning("can not find peer: ", d.Address.String()) diff --git a/server/peer_test.go b/server/peer_test.go index 09ded7c3..9c5a9452 100644 --- a/server/peer_test.go +++ b/server/peer_test.go @@ -521,7 +521,6 @@ func makePeer(globalConfig config.Global, peerConfig config.Neighbor) *Peer { p.peerInfo = &table.PeerInfo{ AS: peerConfig.PeerAs, LocalID: globalConfig.RouterId, - RF: p.rf, Address: peerConfig.NeighborAddress, } p.adjRib = table.NewAdjRib() diff --git a/server/server.go b/server/server.go index 39f5fe48..3d852cb8 100644 --- a/server/server.go +++ b/server/server.go @@ -162,7 +162,7 @@ func (server *BgpServer) Serve() { d := &serverMsgDataPeer{ address: peer.NeighborAddress, peerMsgCh: pch, - rf: p.peerInfo.RF, + rf: p.rf, } msg := &serverMsg{ msgType: SRV_MSG_PEER_ADDED, |