From a95c19823acc877f9a6a5789c9a3d12aa982076b Mon Sep 17 00:00:00 2001
From: Oliver Herms <oliver.herms@exaring.de>
Date: Mon, 22 Oct 2018 15:02:01 +0200
Subject: [PATCH] Fix naming
---
protocols/bgp/server/bmp_router.go | 24 ++++++++++++------------
protocols/bgp/server/bmp_router_test.go | 8 ++++----
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/protocols/bgp/server/bmp_router.go b/protocols/bgp/server/bmp_router.go
index d2883033..6749368b 100644
--- a/protocols/bgp/server/bmp_router.go
+++ b/protocols/bgp/server/bmp_router.go
@@ -35,12 +35,12 @@ type router struct {
}
type neighbor struct {
- localAS uint32
- peerAS uint32
- address [16]byte
- routerID uint32
- fsm *FSM
- opt *packet.DecodeOptions
+ localAS uint32
+ peerAS uint32
+ peerAddress [16]byte
+ routerID uint32
+ fsm *FSM
+ opt *packet.DecodeOptions
}
func newRouter(addr net.IP, port uint16, rib4 *locRIB.LocRIB, rib6 *locRIB.LocRIB) *router {
@@ -275,12 +275,12 @@ func (r *router) processPeerUpNotification(msg *bmppkt.PeerUpNotification) error
fsm.state = newEstablishedState(fsm)
n := &neighbor{
- localAS: fsm.peer.localASN,
- peerAS: msg.PerPeerHeader.PeerAS,
- address: msg.PerPeerHeader.PeerAddress,
- routerID: recvOpen.BGPIdentifier,
- fsm: fsm,
- opt: fsm.decodeOptions(),
+ localAS: fsm.peer.localASN,
+ peerAS: msg.PerPeerHeader.PeerAS,
+ peerAddress: msg.PerPeerHeader.PeerAddress,
+ routerID: recvOpen.BGPIdentifier,
+ fsm: fsm,
+ opt: fsm.decodeOptions(),
}
r.neighbors[msg.PerPeerHeader.PeerAddress] = n
diff --git a/protocols/bgp/server/bmp_router_test.go b/protocols/bgp/server/bmp_router_test.go
index c67ca184..a25d419b 100644
--- a/protocols/bgp/server/bmp_router_test.go
+++ b/protocols/bgp/server/bmp_router_test.go
@@ -302,10 +302,10 @@ func TestProcessPeerUpNotification(t *testing.T) {
rib6: locRIB.New(),
neighbors: map[[16]byte]*neighbor{
[16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 255, 1}: {
- localAS: 200,
- peerAS: 100,
- address: [16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 255, 1},
- routerID: 169090610,
+ localAS: 200,
+ peerAS: 100,
+ peerAddress: [16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 255, 1},
+ routerID: 169090610,
opt: &packet.DecodeOptions{
AddPath: false,
Use32BitASN: false,
--
GitLab