From 22966a23135398515a514812f9792542d357cb0a Mon Sep 17 00:00:00 2001
From: Oliver Herms <oliver.herms@exaring.de>
Date: Wed, 20 Jun 2018 14:05:56 +0200
Subject: [PATCH] Cleanup
---
main.go | 4 ++--
protocols/bgp/server/fsm2.go | 1 -
protocols/bgp/server/fsm_open_sent.go | 4 +++-
protocols/bgp/server/server.go | 11 +++--------
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/main.go b/main.go
index d717d0a2..49d19c0f 100644
--- a/main.go
+++ b/main.go
@@ -38,7 +38,7 @@ func main() {
PeerAddress: net.IP([]byte{169, 254, 200, 1}),
LocalAddress: net.IP([]byte{169, 254, 200, 0}),
ReconnectInterval: time.Second * 15,
- HoldTimer: time.Second * 90,
+ HoldTime: time.Second * 90,
KeepAlive: time.Second * 30,
Passive: true,
RouterID: b.RouterID(),
@@ -56,7 +56,7 @@ func main() {
PeerAddress: net.IP([]byte{169, 254, 100, 0}),
LocalAddress: net.IP([]byte{169, 254, 100, 1}),
ReconnectInterval: time.Second * 15,
- HoldTimer: time.Second * 90,
+ HoldTime: time.Second * 90,
KeepAlive: time.Second * 30,
Passive: true,
RouterID: b.RouterID(),
diff --git a/protocols/bgp/server/fsm2.go b/protocols/bgp/server/fsm2.go
index b365e41c..1bd789b3 100644
--- a/protocols/bgp/server/fsm2.go
+++ b/protocols/bgp/server/fsm2.go
@@ -57,7 +57,6 @@ type FSM2 struct {
capAddPathRecv bool
local net.IP
- //remote net.IP
ribsInitialized bool
adjRIBIn routingtable.RouteTableClient
diff --git a/protocols/bgp/server/fsm_open_sent.go b/protocols/bgp/server/fsm_open_sent.go
index 5504a525..cf628699 100644
--- a/protocols/bgp/server/fsm_open_sent.go
+++ b/protocols/bgp/server/fsm_open_sent.go
@@ -106,7 +106,9 @@ func (s *openSentState) openMsgReceived(msg *packet.BGPMessage) (state, string)
openMsg := msg.Body.(*packet.BGPOpen)
s.fsm.neighborID = openMsg.BGPIdentifier
stopTimer(s.fsm.connectRetryTimer)
- s.fsm.peer.collisionHandling(s.fsm)
+ if s.fsm.peer.collisionHandling(s.fsm) {
+ return s.cease()
+ }
err := s.fsm.sendKeepalive()
if err != nil {
return s.tcpFailure()
diff --git a/protocols/bgp/server/server.go b/protocols/bgp/server/server.go
index bd1f662b..fef8b4e4 100644
--- a/protocols/bgp/server/server.go
+++ b/protocols/bgp/server/server.go
@@ -4,6 +4,7 @@ import (
"fmt"
"io"
"net"
+ "strings"
"github.com/bio-routing/bio-rd/config"
"github.com/bio-routing/bio-rd/protocols/bgp/packet"
@@ -60,10 +61,7 @@ func (b *BGPServer) Start(c *config.Global) error {
func (b *BGPServer) incomingConnectionWorker() {
for {
- // Disabled. We're active only for now.
- /*c := <-b.acceptCh
- fmt.Printf("Incoming connection!\n")
- fmt.Printf("Connection from: %v\n", c.RemoteAddr())
+ c := <-b.acceptCh
peerAddr := strings.Split(c.RemoteAddr().String(), ":")[0]
if _, ok := b.peers[peerAddr]; !ok {
@@ -79,19 +77,16 @@ func (b *BGPServer) incomingConnectionWorker() {
}).Info("Incoming TCP connection")
log.WithField("Peer", peerAddr).Debug("Sending incoming TCP connection to fsm for peer")
- fmt.Printf("Initiating new ActiveFSM due to incoming connection from peer %s\n", peerAddr)
fsm := NewActiveFSM2(b.peers[peerAddr])
fsm.state = newActiveState(fsm)
fsm.startConnectRetryTimer()
- fmt.Printf("Getting lock...\n")
b.peers[peerAddr].fsmsMu.Lock()
b.peers[peerAddr].fsms = append(b.peers[peerAddr].fsms, fsm)
- fmt.Printf("Releasing lock...\n")
b.peers[peerAddr].fsmsMu.Unlock()
go fsm.run()
- fsm.conCh <- c*/
+ fsm.conCh <- c
}
}
--
GitLab