malhuda/alice-lg
1
0
Fork 0
Code Issues 39 Pull Requests 11 Actions Packages Projects Releases 2 Wiki Activity

Fixing a issue with EnabledAdvertised and large datasets.

Browse Source
This commit is contained in:
Emil Palm 2019-05-21 07:02:41 +02:00
parent 50d18afe39
commit a9b0f37cd6
2 changed files with 40 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/sources/gobgp/routes.go
View File

@ -48,10 +48,10 @@ func (gobgp *GoBGP) lookupNeighbour(neighborId string) (*gobgpapi.Peer, error) {
}
func (gobgp *GoBGP) GetNeighbours() ([]*gobgpapi.Peer, error) {
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
defer cancel()
peerStream, err := gobgp.client.ListPeer(ctx, &gobgpapi.ListPeerRequest{EnableAdvertised: true})
peerStream, err := gobgp.client.ListPeer(ctx, &gobgpapi.ListPeerRequest{EnableAdvertised: false})
if err != nil {
return nil, err
}
@ -86,6 +86,7 @@ func (gobgp *GoBGP) parsePathIntoRoute(path *gobgpapi.Path, prefix string) (erro
return err, nil
}
route.Bgp.Communities = make(api.Communities, 0)
route.Bgp.LargeCommunities = make(api.Communities, 0)
route.Bgp.ExtCommunities = make(api.ExtCommunities, 0)
@ -147,7 +148,7 @@ func (gobgp *GoBGP) parsePathIntoRoute(path *gobgpapi.Path, prefix string) (erro
}
func (gobgp *GoBGP) GetRoutes(peer *gobgpapi.Peer, tableType gobgpapi.TableType, response *api.RoutesResponse) error {
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
defer cancel()
for _, family := range families {

87
backend/sources/gobgp/source.go
View File

@ -10,11 +10,12 @@ import (
"context"
"fmt"
"io"
"log"
"time"
)
var contextTimeout time.Duration = time.Second*30
type GoBGP struct {
config Config
client gobgpapi.GobgpApiClient
@ -88,34 +89,28 @@ func (gobgp *GoBGP) ExpireCaches() int {
}
func (gobgp *GoBGP) NeighboursStatus() (*api.NeighboursStatusResponse, error) {
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
response := api.NeighboursStatusResponse{}
response.Neighbours = make(api.NeighboursStatus, 0)
resp, err := gobgp.client.ListPeer(ctx, &gobgpapi.ListPeerRequest{})
peers, err := gobgp.GetNeighbours()
if err != nil {
return nil, err
return nil,err
}
for {
_resp, err := resp.Recv()
if err == io.EOF {
break
}
for _, peer := range peers {
ns := api.NeighbourStatus{}
ns.Id = PeerHash(_resp.Peer)
ns.Id = PeerHash(peer)
switch _resp.Peer.State.SessionState {
switch peer.State.SessionState {
case gobgpapi.PeerState_ESTABLISHED:
ns.State = "up"
default:
ns.State = "down"
}
if _resp.Peer.Timers.State.Uptime != nil {
ns.Since = time.Now().Sub(time.Unix(_resp.Peer.Timers.State.Uptime.Seconds, int64(_resp.Peer.Timers.State.Uptime.Nanos)))
if peer.Timers.State.Uptime != nil {
ns.Since = time.Now().Sub(time.Unix(peer.Timers.State.Uptime.Seconds, int64(peer.Timers.State.Uptime.Nanos)))
}
}
@ -123,7 +118,7 @@ func (gobgp *GoBGP) NeighboursStatus() (*api.NeighboursStatusResponse, error) {
}
func (gobgp *GoBGP) Status() (*api.StatusResponse, error) {
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
ctx, cancel := context.WithTimeout(context.Background(), contextTimeout)
defer cancel()
resp, err := gobgp.client.GetBgp(ctx, &gobgpapi.GetBgpRequest{})
@ -142,49 +137,39 @@ func (gobgp *GoBGP) Status() (*api.StatusResponse, error) {
}
func (gobgp *GoBGP) Neighbours() (*api.NeighboursResponse, error) {
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
response := api.NeighboursResponse{}
response.Neighbours = make(api.Neighbours, 0)
resp, err := gobgp.client.ListPeer(ctx, &gobgpapi.ListPeerRequest{EnableAdvertised: true})
peers, err := gobgp.GetNeighbours()
if err != nil {
return nil, err
}
for {
_resp, err := resp.Recv()
if err == io.EOF {
break
}
for _, peer := range peers {
neigh := api.Neighbour{}
if _resp != nil {
neigh.Address = _resp.Peer.State.NeighborAddress
neigh.Asn = int(_resp.Peer.State.PeerAs)
switch _resp.Peer.State.SessionState {
case gobgpapi.PeerState_ESTABLISHED:
neigh.State = "up"
default:
neigh.State = "down"
}
neigh.Description = _resp.Peer.Conf.Description
neigh.Id = PeerHash(_resp.Peer)
response.Neighbours = append(response.Neighbours, &neigh)
for _, afiSafi := range _resp.Peer.AfiSafis {
neigh.RoutesReceived += int(afiSafi.State.Received)
neigh.RoutesExported += int(afiSafi.State.Advertised)
neigh.RoutesAccepted += int(afiSafi.State.Accepted)
neigh.RoutesFiltered += (neigh.RoutesReceived - neigh.RoutesAccepted)
}
if _resp.Peer.Timers.State.Uptime != nil {
neigh.Uptime = time.Now().Sub(time.Unix(_resp.Peer.Timers.State.Uptime.Seconds, int64(_resp.Peer.Timers.State.Uptime.Nanos)))
}
neigh.Address = peer.State.NeighborAddress
neigh.Asn = int(peer.State.PeerAs)
switch peer.State.SessionState {
case gobgpapi.PeerState_ESTABLISHED:
neigh.State = "up"
default:
neigh.State = "down"
}
neigh.Description = peer.Conf.Description
neigh.Id = PeerHash(peer)
for _, afiSafi := range peer.AfiSafis {
neigh.RoutesReceived += int(afiSafi.State.Received)
neigh.RoutesExported += int(afiSafi.State.Advertised)
neigh.RoutesAccepted += int(afiSafi.State.Accepted)
neigh.RoutesFiltered += (neigh.RoutesReceived - neigh.RoutesAccepted)
}
if peer.Timers.State.Uptime != nil {
neigh.Uptime = time.Now().Sub(time.Unix(peer.Timers.State.Uptime.Seconds, int64(peer.Timers.State.Uptime.Nanos)))
}
response.Neighbours = append(response.Neighbours, &neigh)
}
@ -304,11 +289,11 @@ func (gobgp *GoBGP) AllRoutes() (*api.RoutesResponse, error) {
if err != nil {
return nil, err
}
for _, peer := range peers {
err = gobgp.GetRoutes(peer, gobgpapi.TableType_ADJ_IN, &routes)
if err != nil {
log.Print(err)
break
}
}