Skip to content
Snippets Groups Projects
Commit 8dd06f05 authored by Oliver Herms's avatar Oliver Herms
Browse files

Fix build

parent d70ba033
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
config/peer.go 0 → 100644
+ 17
− 0
View file @ 8dd06f05
package config
import (
"net"
)
type Peer struct {
AdminEnabled bool
KeepAlive uint16
HoldTimer uint16
LocalAddress net.IP
PeerAddress net.IP
LocalAS uint32
PeerAS uint32
Passive bool
RouterID uint32
}
config/server.go 0 → 100644
+ 136
− 0
View file @ 8dd06f05
package config
import (
"fmt"
"net"
"strings"
"github.com/taktv6/tflow2/convert"
)
type Global struct {
LocalAS uint32
RouterID uint32
Port uint16
LocalAddressList []net.IP
Listen bool
}
const BGPPORT = uint16(179)
func (g *Global) SetDefaultGlobalConfigValues() error {
if g.LocalAddressList == nil {
g.LocalAddressList = make([]net.IP, 0)
g.LocalAddressList = append(g.LocalAddressList, net.ParseIP("0.0.0.0"))
g.LocalAddressList = append(g.LocalAddressList, net.ParseIP("::"))
}
if g.RouterID == 0 {
rtrid, err := generateRouterID()
if err != nil {
return fmt.Errorf("Unable to determine router ID: %v", err)
}
g.RouterID = rtrid
}
if g.Port == 0 {
g.Port = BGPPORT
}
return nil
}
func generateRouterID() (uint32, error) {
addr, err := getLoopbackIP()
if err == nil {
return convert.Uint32b([]byte(addr)[12:16]), nil
}
return 0, fmt.Errorf("Unable to determine router id")
}
func getHighestIP() (net.IP, error) {
ifs, err := net.Interfaces()
if err != nil {
return nil, fmt.Errorf("Unable to ")
}
return _getHighestIP(ifs)
}
func _getHighestIP(ifs []net.Interface) (net.IP, error) {
candidates := make([]net.IP, 0)
for _, iface := range ifs {
addrs, err := iface.Addrs()
if err != nil {
return nil, fmt.Errorf("Unable to get interface addrs for %s: %v", iface.Name, err)
}
for _, addr := range addrs {
a := net.ParseIP(addr.String())
if addr.String() != "127.0.0.1" && a.To4() != nil {
candidates = append(candidates, a)
}
}
}
if len(candidates) == 0 {
return nil, fmt.Errorf("No IPv4 address found on any interface")
}
max := candidates[0]
for _, c := range candidates[1:] {
if addrIsGreater(c, max) {
max = c
}
}
return nil, fmt.Errorf("No non localhost IPv4 address found on interface lo")
}
func getLoopbackIP() (net.IP, error) {
iface, err := net.InterfaceByName("lo")
if err != nil {
return nil, fmt.Errorf("Unable to get interface lo: %v", err)
}
return _getLoopbackIP(iface)
}
func _getLoopbackIP(iface *net.Interface) (net.IP, error) {
addrs, err := iface.Addrs()
if err != nil {
return nil, fmt.Errorf("Unable to get interface addresses: %v", err)
}
candidates := make([]net.IP, 0)
for _, addr := range addrs {
a := net.ParseIP(strings.Split(addr.String(), "/")[0])
if a.String() != "127.0.0.1" && a.To4() != nil {
candidates = append(candidates, a)
}
}
if len(candidates) == 0 {
return nil, fmt.Errorf("No non localhost IPv4 address found on interface lo")
}
max := candidates[0]
for _, c := range candidates {
if addrIsGreater(c, max) {
max = c
}
}
return max, nil
}
func addrIsGreater(a net.IP, b net.IP) bool {
/*
* FIXME: Implement proper comparison
*/
if a.String() > b.String() {
return true
}
return false
}
config/server_test.go 0 → 100644
+ 80
− 0
View file @ 8dd06f05
package config
import (
"net"
"reflect"
"testing"
)
func TestGetLoopbackIP(t *testing.T) {
type args struct {
iface *net.Interface
}
tests := []struct {
name string
args args
want net.IP
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := _getLoopbackIP(tt.args.iface)
if (err != nil) != tt.wantErr {
t.Errorf("_getLoopbackIP() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("_getLoopbackIP() = %v, want %v", got, tt.want)
}
})
}
}
func TestGetHighestIP(t *testing.T) {
type args struct {
ifs []net.Interface
}
tests := []struct {
name string
args args
want net.IP
wantErr bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := _getHighestIP(tt.args.ifs)
if (err != nil) != tt.wantErr {
t.Errorf("_getHighestIP() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("_getHighestIP() = %v, want %v", got, tt.want)
}
})
}
}
func TestAddrIsGreater(t *testing.T) {
type args struct {
a net.IP
b net.IP
}
tests := []struct {
name string
args args
want bool
}{
// TODO: Add test cases.
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := addrIsGreater(tt.args.a, tt.args.b); got != tt.want {
t.Errorf("addrIsGreater() = %v, want %v", got, tt.want)
}
})
}
}
main.go
+ 2
− 2
View file @ 8dd06f05
......@@ -7,8 +7,8 @@ import (
"github.com/sirupsen/logrus"
"github.com/taktv6/tbgp/config"
"github.com/taktv6/tbgp/server"
"github.com/bio-routing/bio-rd/config"
"github.com/bio-routing/bio-rd/protocols/bgp/server"
)
func main() {
......
protocols/bgp/server/fsm.go
+ 4
− 5
View file @ 8dd06f05
......@@ -7,12 +7,11 @@ import (
"net"
"time"
"github.com/taktv6/tbgp/rt"
"github.com/bio-routing/bio-rd/config"
tnet "github.com/bio-routing/bio-rd/net"
"github.com/bio-routing/bio-rd/protocols/bgp/packet"
"github.com/bio-routing/bio-rd/rt"
log "github.com/sirupsen/logrus"
"github.com/taktv6/tbgp/config"
tnet "github.com/taktv6/tbgp/net"
"github.com/taktv6/tbgp/packet"
"github.com/taktv6/tflow2/convert"
tomb "gopkg.in/tomb.v2"
)
......
protocols/bgp/server/peer.go
+ 1
− 1
View file @ 8dd06f05
......@@ -3,7 +3,7 @@ package server
import (
"net"
"github.com/taktv6/tbgp/config"
"github.com/bio-routing/bio-rd/config"
)
type Peer struct {
......
protocols/bgp/server/server.go
+ 2
− 2
View file @ 8dd06f05
......@@ -6,9 +6,9 @@ import (
"net"
"strings"
"github.com/bio-routing/bio-rd/config"
"github.com/bio-routing/bio-rd/protocols/bgp/packet"
log "github.com/sirupsen/logrus"
"github.com/taktv6/tbgp/config"
"github.com/taktv6/tbgp/packet"
)
const (
......
rt/routing_table_test.go
+ 24
− 24
View file @ 8dd06f05
......@@ -30,46 +30,46 @@ func TestRemovePath(t *testing.T) {
BGPPath: &BGPPath{},
},
}),
NewRoute(net.NewPfx(167772160, 9), []*Path{
NewRoute(net.NewPfx(strAddr("10.0.0.0"), 9), []*Path{
{
Type: BGPPathType,
BGPPath: &BGPPath{},
},
}), // 10.0.0.0/9
NewRoute(net.NewPfx(176160768, 9), []*Path{
}),
NewRoute(net.NewPfx(strAddr("10.128.0.0"), 9), []*Path{
{
Type: BGPPathType,
BGPPath: &BGPPath{},
},
}), // 10.128.0.0/9
}),
},
remove: []*Route{
NewRoute(net.NewPfx(167772160, 8), []*Path{
NewRoute(net.NewPfx(strAddr("10.0.0.0"), 8), []*Path{
{
Type: BGPPathType,
BGPPath: &BGPPath{},
},
}), // 10.0.0.0
}),
},
expected: []*Route{
NewRoute(net.NewPfx(167772160, 9), []*Path{
NewRoute(net.NewPfx(strAddr("10.0.0.0"), 9), []*Path{
{
Type: BGPPathType,
BGPPath: &BGPPath{},
},
}), // 10.0.0.0
NewRoute(net.NewPfx(176160768, 9), []*Path{
}),
NewRoute(net.NewPfx(strAddr("10.128.0.0"), 9), []*Path{
{
Type: BGPPathType,
BGPPath: &BGPPath{},
},
}), // 10.128.0.0
}),
},
},
{
name: "Remove a path that is one of two for a prefix",
routes: []*Route{
NewRoute(net.NewPfx(167772160, 8), []*Path{
NewRoute(net.NewPfx(strAddr("10.0.0.0"), 8), []*Path{
{
Type: BGPPathType,
BGPPath: &BGPPath{
......@@ -82,51 +82,51 @@ func TestRemovePath(t *testing.T) {
LocalPref: 2000,
},
},
}), // 10.0.0.0/8
NewRoute(net.NewPfx(167772160, 9), []*Path{
}),
NewRoute(net.NewPfx(strAddr("10.0.0.0"), 9), []*Path{
{
Type: BGPPathType,
BGPPath: &BGPPath{},
},
}), // 10.0.0.0/9
NewRoute(net.NewPfx(176160768, 9), []*Path{
}),
NewRoute(net.NewPfx(strAddr("10.128.0.0"), 9), []*Path{
{
Type: BGPPathType,
BGPPath: &BGPPath{},
},
}), // 10.128.0.0/9
}),
},
remove: []*Route{
NewRoute(net.NewPfx(167772160, 8), []*Path{
NewRoute(net.NewPfx(strAddr("10.0.0.0"), 8), []*Path{
{
Type: BGPPathType,
BGPPath: &BGPPath{
LocalPref: 1000,
},
},
}), // 10.0.0.0
}),
},
expected: []*Route{
NewRoute(net.NewPfx(167772160, 8), []*Path{
NewRoute(net.NewPfx(strAddr("10.0.0.0"), 8), []*Path{
{
Type: BGPPathType,
BGPPath: &BGPPath{
LocalPref: 2000,
},
},
}), // 10.0.0.0/8
NewRoute(net.NewPfx(167772160, 9), []*Path{
}),
NewRoute(net.NewPfx(strAddr("10.0.0.0"), 9), []*Path{
{
Type: BGPPathType,
BGPPath: &BGPPath{},
},
}), // 10.0.0.0/9
NewRoute(net.NewPfx(176160768, 9), []*Path{
}),
NewRoute(net.NewPfx(strAddr("10.128.0.0"), 9), []*Path{
{
Type: BGPPathType,
BGPPath: &BGPPath{},
},
}), // 10.128.0.0/9
}),
},
},
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment