diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-08-26 18:15:03 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-08-26 18:15:03 +0900 |
| commit | eef1fc0a7529a2ee12c822af1b393906cd114ef9 (patch) | |
| tree | d3ea1183f2f3d162b59b0c3197a8969dbcd6aaf6 /server | |
| parent | 982a5b448f5ba99033911cdcaeebeeb8c2ed81fa (diff) | |
add RemoteRouterId to config.NeighborState
Stop using config.NeighborState's Description in a hacky way for the
remote Router Id.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'server')
| -rw-r--r-- | server/mrt.go | 2 | ||||
| -rw-r--r-- | server/peer.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/mrt.go b/server/mrt.go index b92ce293..06537817 100644 --- a/server/mrt.go +++ b/server/mrt.go @@ -104,7 +104,7 @@ func (m *mrtWriter) loop() error { t := uint32(time.Now().Unix()) peers := make([]*mrt.Peer, 0, len(m.Neighbor)) for _, pconf := range m.Neighbor { - peers = append(peers, mrt.NewPeer(pconf.State.Description, pconf.Config.NeighborAddress, pconf.Config.PeerAs, true)) + peers = append(peers, mrt.NewPeer(pconf.State.RemoteRouterId, pconf.Config.NeighborAddress, pconf.Config.PeerAs, true)) } if bm, err := mrt.NewMRTMessage(t, mrt.TABLE_DUMPv2, mrt.PEER_INDEX_TABLE, mrt.NewPeerIndexTable(m.RouterId, "", peers)); err != nil { break diff --git a/server/peer.go b/server/peer.go index d27f96e6..f239033a 100644 --- a/server/peer.go +++ b/server/peer.go @@ -394,7 +394,7 @@ func (peer *Peer) ToConfig() *config.Neighbor { } conf.State.Capabilities.LocalList = localCap - conf.State.Description = peer.fsm.peerInfo.ID.To4().String() + conf.State.RemoteRouterId = peer.fsm.peerInfo.ID.To4().String() conf.State.SessionState = config.IntToSessionStateMap[int(peer.fsm.state)] conf.State.AdminState = peer.fsm.adminState.String() |