diff --git a/net/ip.go b/net/ip.go
index 95d20029748741896f9b33916d41e28ca385de6e..b1956e9a719f9e9f62bc005cdab63da3edb3675e 100644
--- a/net/ip.go
+++ b/net/ip.go
@@ -25,9 +25,9 @@ func IPFromProtoIP(addr api.IP) IP {
// ToProto converts an IP to a proto IP
func (ip IP) ToProto() *api.IP {
- ver := api.IP_IPv4
+ ver := api.IP_IPv6
if ip.IsLegacy() {
- ver = api.IP_IPv6
+ ver = api.IP_IPv4
}
return &api.IP{
diff --git a/net/ip_test.go b/net/ip_test.go
index 9ebebcea60cee895757ee81068278bd01a54ee67..9ca3dec3de732eb0f03dbeeac3dc13c25fbf4e06 100644
--- a/net/ip_test.go
+++ b/net/ip_test.go
@@ -83,8 +83,8 @@ func TestIPToProto(t *testing.T) {
isLegacy: true,
},
expected: &api.IP{
- Lower: 255,
- IsLegacy: true,
+ Lower: 255,
+ Version: api.IP_IPv4,
},
},
{
@@ -95,9 +95,9 @@ func TestIPToProto(t *testing.T) {
isLegacy: false,
},
expected: &api.IP{
- Higher: 1000,
- Lower: 255,
- IsLegacy: false,
+ Higher: 1000,
+ Lower: 255,
+ Version: api.IP_IPv6,
},
},
}
@@ -117,9 +117,9 @@ func TestIPFromProtoIP(t *testing.T) {
{
name: "Test IPv4",
proto: api.IP{
- Lower: 100,
- Higher: 0,
- IsLegacy: true,
+ Lower: 100,
+ Higher: 0,
+ Version: api.IP_IPv4,
},
expected: IP{
lower: 100,
@@ -130,9 +130,9 @@ func TestIPFromProtoIP(t *testing.T) {
{
name: "Test IPv6",
proto: api.IP{
- Lower: 100,
- Higher: 200,
- IsLegacy: false,
+ Lower: 100,
+ Higher: 200,
+ Version: api.IP_IPv6,
},
expected: IP{
lower: 100,
diff --git a/net/prefix_test.go b/net/prefix_test.go
index cb10ed59ea5ec52889736d0f8ce620d7b264857b..e88136629f9cf9edaa63ae381b464e10740d270a 100644
--- a/net/prefix_test.go
+++ b/net/prefix_test.go
@@ -74,8 +74,8 @@ func TestPrefixToProto(t *testing.T) {
},
expected: api.Prefix{
Address: &api.IP{
- Lower: 200,
- IsLegacy: true,
+ Lower: 200,
+ Version: api.IP_IPv4,
},
Pfxlen: 24,
},
@@ -92,9 +92,9 @@ func TestPrefixToProto(t *testing.T) {
},
expected: api.Prefix{
Address: &api.IP{
- Higher: 100,
- Lower: 200,
- IsLegacy: false,
+ Higher: 100,
+ Lower: 200,
+ Version: api.IP_IPv6,
},
Pfxlen: 64,
},
@@ -117,9 +117,9 @@ func TestNewPrefixFromProtoPrefix(t *testing.T) {
name: "IPv4",
proto: api.Prefix{
Address: &api.IP{
- Higher: 0,
- Lower: 2000,
- IsLegacy: true,
+ Higher: 0,
+ Lower: 2000,
+ Version: api.IP_IPv4,
},
Pfxlen: 24,
},
@@ -136,9 +136,9 @@ func TestNewPrefixFromProtoPrefix(t *testing.T) {
name: "IPv6",
proto: api.Prefix{
Address: &api.IP{
- Higher: 1000,
- Lower: 2000,
- IsLegacy: false,
+ Higher: 1000,
+ Lower: 2000,
+ Version: api.IP_IPv6,
},
Pfxlen: 64,
},
diff --git a/protocols/bgp/server/server_test.go b/protocols/bgp/server/server_test.go
deleted file mode 100644
index a72a479a2cc347682c7224f5b8ac39e195e711ff..0000000000000000000000000000000000000000
--- a/protocols/bgp/server/server_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package server
-
-import (
- "testing"
- "time"
-
- "github.com/bio-routing/bio-rd/config"
- bnet "github.com/bio-routing/bio-rd/net"
- "github.com/bio-routing/bio-rd/routingtable"
- "github.com/bio-routing/bio-rd/routingtable/filter"
- "github.com/bio-routing/bio-rd/routingtable/locRIB"
- "github.com/stretchr/testify/assert"
-)
-
-func TestBgpServerPeerSnapshot(t *testing.T) {
- s := NewBgpServer()
- err := s.Start(&config.Global{
- LocalASN: 204880,
- RouterID: 2137,
- })
- if err != nil {
- t.Fatalf("server should have started, got err: %v", err)
- }
-
- info := s.GetPeerInfoAll()
- if len(info) != 0 {
- t.Fatalf("empty server should have 0 peers, has %d", len(info))
- }
-
- rib := locRIB.NewTestLocRIB()
- pc := config.Peer{
- AdminEnabled: true,
- PeerAS: 65300,
- PeerAddress: bnet.IPv4FromOctets(169, 254, 200, 1),
- LocalAddress: bnet.IPv4FromOctets(169, 254, 200, 0),
- ReconnectInterval: time.Second * 15,
- HoldTime: time.Second * 90,
- KeepAlive: time.Second * 30,
- Passive: true,
- RouterID: s.RouterID(),
- IPv4: &config.AddressFamilyConfig{
- RIB: rib,
- ImportFilter: filter.NewDrainFilter(),
- ExportFilter: filter.NewAcceptAllFilter(),
- AddPathSend: routingtable.ClientOptions{
- MaxPaths: 10,
- },
- },
- }
- s.AddPeer(pc)
-
- info = s.GetPeerInfoAll()
- if want, got := 1, len(info); want != got {
- t.Fatalf("empty server should have %d peers, has %d", want, got)
- }
-
- var peer PeerInfo
- for _, v := range info {
- peer = v
- break
- }
-
- want := PeerInfo{
- PeerAddr: bnet.IPv4FromOctets(169, 254, 200, 1),
- PeerASN: uint32(65300),
- LocalASN: uint32(204880),
- States: []string{"idle"},
- }
-
- assert.Equal(t, want, peer)
-}
diff --git a/regenreate_proto.sh b/regenreate_proto.sh
index 00007481a80bd389f2e22861ef86c16f5c37cd5e..0a8388fdcfe0ce2781b159e9baf64bedcb0cc837 100755
--- a/regenreate_proto.sh
+++ b/regenreate_proto.sh
@@ -1,5 +1,6 @@
#!/bin/sh
pushd $GOPATH/src
protoc --go_out=plugins=grpc:. github.com/bio-routing/bio-rd/net/api/*.proto
+protoc --go_out=plugins=grpc:. github.com/bio-routing/bio-rd/route/api/*.proto
protoc --go_out=plugins=grpc:. github.com/bio-routing/bio-rd/protocols/bgp/api/*.proto
popd
diff --git a/route/api/route.pb.go b/route/api/route.pb.go
index 9b9296a87f8db827a3cd4353d6f35d95504761ad..5e4916b4b84a7f7a7a0c54de5e749aca2b28ae81 100644
--- a/route/api/route.pb.go
+++ b/route/api/route.pb.go
@@ -1,12 +1,14 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: route/api/route.proto
+// source: github.com/bio-routing/bio-rd/route/api/route.proto
-package api // import "route/api"
+package api
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import api "net/api"
+import (
+ fmt "fmt"
+ api "github.com/bio-routing/bio-rd/net/api"
+ proto "github.com/golang/protobuf/proto"
+ math "math"
+)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
@@ -17,7 +19,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
type Path_Type int32
@@ -30,6 +32,7 @@ var Path_Type_name = map[int32]string{
0: "Static",
1: "BGP",
}
+
var Path_Type_value = map[string]int32{
"Static": 0,
"BGP": 1,
@@ -38,8 +41,9 @@ var Path_Type_value = map[string]int32{
func (x Path_Type) String() string {
return proto.EnumName(Path_Type_name, int32(x))
}
+
func (Path_Type) EnumDescriptor() ([]byte, []int) {
- return fileDescriptor_route_5b7763c861ad4226, []int{1, 0}
+ return fileDescriptor_00363871266b6b0e, []int{1, 0}
}
type Route struct {
@@ -54,16 +58,17 @@ func (m *Route) Reset() { *m = Route{} }
func (m *Route) String() string { return proto.CompactTextString(m) }
func (*Route) ProtoMessage() {}
func (*Route) Descriptor() ([]byte, []int) {
- return fileDescriptor_route_5b7763c861ad4226, []int{0}
+ return fileDescriptor_00363871266b6b0e, []int{0}
}
+
func (m *Route) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Route.Unmarshal(m, b)
}
func (m *Route) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Route.Marshal(b, m, deterministic)
}
-func (dst *Route) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Route.Merge(dst, src)
+func (m *Route) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Route.Merge(m, src)
}
func (m *Route) XXX_Size() int {
return xxx_messageInfo_Route.Size(m)
@@ -101,16 +106,17 @@ func (m *Path) Reset() { *m = Path{} }
func (m *Path) String() string { return proto.CompactTextString(m) }
func (*Path) ProtoMessage() {}
func (*Path) Descriptor() ([]byte, []int) {
- return fileDescriptor_route_5b7763c861ad4226, []int{1}
+ return fileDescriptor_00363871266b6b0e, []int{1}
}
+
func (m *Path) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Path.Unmarshal(m, b)
}
func (m *Path) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_Path.Marshal(b, m, deterministic)
}
-func (dst *Path) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Path.Merge(dst, src)
+func (m *Path) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_Path.Merge(m, src)
}
func (m *Path) XXX_Size() int {
return xxx_messageInfo_Path.Size(m)
@@ -153,16 +159,17 @@ func (m *StaticPath) Reset() { *m = StaticPath{} }
func (m *StaticPath) String() string { return proto.CompactTextString(m) }
func (*StaticPath) ProtoMessage() {}
func (*StaticPath) Descriptor() ([]byte, []int) {
- return fileDescriptor_route_5b7763c861ad4226, []int{2}
+ return fileDescriptor_00363871266b6b0e, []int{2}
}
+
func (m *StaticPath) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_StaticPath.Unmarshal(m, b)
}
func (m *StaticPath) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_StaticPath.Marshal(b, m, deterministic)
}
-func (dst *StaticPath) XXX_Merge(src proto.Message) {
- xxx_messageInfo_StaticPath.Merge(dst, src)
+func (m *StaticPath) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_StaticPath.Merge(m, src)
}
func (m *StaticPath) XXX_Size() int {
return xxx_messageInfo_StaticPath.Size(m)
@@ -204,16 +211,17 @@ func (m *BGPPath) Reset() { *m = BGPPath{} }
func (m *BGPPath) String() string { return proto.CompactTextString(m) }
func (*BGPPath) ProtoMessage() {}
func (*BGPPath) Descriptor() ([]byte, []int) {
- return fileDescriptor_route_5b7763c861ad4226, []int{3}
+ return fileDescriptor_00363871266b6b0e, []int{3}
}
+
func (m *BGPPath) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_BGPPath.Unmarshal(m, b)
}
func (m *BGPPath) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_BGPPath.Marshal(b, m, deterministic)
}
-func (dst *BGPPath) XXX_Merge(src proto.Message) {
- xxx_messageInfo_BGPPath.Merge(dst, src)
+func (m *BGPPath) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_BGPPath.Merge(m, src)
}
func (m *BGPPath) XXX_Size() int {
return xxx_messageInfo_BGPPath.Size(m)
@@ -334,16 +342,17 @@ func (m *ASPathSegment) Reset() { *m = ASPathSegment{} }
func (m *ASPathSegment) String() string { return proto.CompactTextString(m) }
func (*ASPathSegment) ProtoMessage() {}
func (*ASPathSegment) Descriptor() ([]byte, []int) {
- return fileDescriptor_route_5b7763c861ad4226, []int{4}
+ return fileDescriptor_00363871266b6b0e, []int{4}
}
+
func (m *ASPathSegment) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ASPathSegment.Unmarshal(m, b)
}
func (m *ASPathSegment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_ASPathSegment.Marshal(b, m, deterministic)
}
-func (dst *ASPathSegment) XXX_Merge(src proto.Message) {
- xxx_messageInfo_ASPathSegment.Merge(dst, src)
+func (m *ASPathSegment) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_ASPathSegment.Merge(m, src)
}
func (m *ASPathSegment) XXX_Size() int {
return xxx_messageInfo_ASPathSegment.Size(m)
@@ -381,16 +390,17 @@ func (m *LargeCommunity) Reset() { *m = LargeCommunity{} }
func (m *LargeCommunity) String() string { return proto.CompactTextString(m) }
func (*LargeCommunity) ProtoMessage() {}
func (*LargeCommunity) Descriptor() ([]byte, []int) {
- return fileDescriptor_route_5b7763c861ad4226, []int{5}
+ return fileDescriptor_00363871266b6b0e, []int{5}
}
+
func (m *LargeCommunity) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_LargeCommunity.Unmarshal(m, b)
}
func (m *LargeCommunity) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_LargeCommunity.Marshal(b, m, deterministic)
}
-func (dst *LargeCommunity) XXX_Merge(src proto.Message) {
- xxx_messageInfo_LargeCommunity.Merge(dst, src)
+func (m *LargeCommunity) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_LargeCommunity.Merge(m, src)
}
func (m *LargeCommunity) XXX_Size() int {
return xxx_messageInfo_LargeCommunity.Size(m)
@@ -437,16 +447,17 @@ func (m *UnknownAttribute) Reset() { *m = UnknownAttribute{} }
func (m *UnknownAttribute) String() string { return proto.CompactTextString(m) }
func (*UnknownAttribute) ProtoMessage() {}
func (*UnknownAttribute) Descriptor() ([]byte, []int) {
- return fileDescriptor_route_5b7763c861ad4226, []int{6}
+ return fileDescriptor_00363871266b6b0e, []int{6}
}
+
func (m *UnknownAttribute) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_UnknownAttribute.Unmarshal(m, b)
}
func (m *UnknownAttribute) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return xxx_messageInfo_UnknownAttribute.Marshal(b, m, deterministic)
}
-func (dst *UnknownAttribute) XXX_Merge(src proto.Message) {
- xxx_messageInfo_UnknownAttribute.Merge(dst, src)
+func (m *UnknownAttribute) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_UnknownAttribute.Merge(m, src)
}
func (m *UnknownAttribute) XXX_Size() int {
return xxx_messageInfo_UnknownAttribute.Size(m)
@@ -493,6 +504,7 @@ func (m *UnknownAttribute) GetValue() []byte {
}
func init() {
+ proto.RegisterEnum("bio.route.Path_Type", Path_Type_name, Path_Type_value)
proto.RegisterType((*Route)(nil), "bio.route.Route")
proto.RegisterType((*Path)(nil), "bio.route.Path")
proto.RegisterType((*StaticPath)(nil), "bio.route.StaticPath")
@@ -500,55 +512,58 @@ func init() {
proto.RegisterType((*ASPathSegment)(nil), "bio.route.ASPathSegment")
proto.RegisterType((*LargeCommunity)(nil), "bio.route.LargeCommunity")
proto.RegisterType((*UnknownAttribute)(nil), "bio.route.UnknownAttribute")
- proto.RegisterEnum("bio.route.Path_Type", Path_Type_name, Path_Type_value)
}
-func init() { proto.RegisterFile("route/api/route.proto", fileDescriptor_route_5b7763c861ad4226) }
-
-var fileDescriptor_route_5b7763c861ad4226 = []byte{
- // 701 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0xcd, 0x72, 0xd3, 0x3a,
- 0x14, 0xbe, 0x69, 0xfe, 0x9c, 0x93, 0x38, 0x4d, 0xcf, 0x6d, 0xef, 0xf8, 0xb6, 0x03, 0xa4, 0xee,
- 0x14, 0xb2, 0x21, 0x9d, 0x06, 0x86, 0x7d, 0xd2, 0x96, 0x50, 0xa6, 0x30, 0x46, 0x86, 0x0d, 0x1b,
- 0x8f, 0x92, 0x28, 0xa9, 0x06, 0xc7, 0x32, 0xb6, 0x5c, 0xda, 0x25, 0xcf, 0xc1, 0x6b, 0xf4, 0x01,
- 0x19, 0x49, 0x4e, 0xea, 0x94, 0x61, 0x77, 0xce, 0xf7, 0x9d, 0xbf, 0x4f, 0x3a, 0x12, 0xec, 0x25,
- 0x22, 0x93, 0xec, 0x84, 0xc6, 0xfc, 0x44, 0x5b, 0xfd, 0x38, 0x11, 0x52, 0x60, 0x63, 0xc2, 0x45,
- 0x5f, 0x03, 0xfb, 0x3b, 0x11, 0x93, 0x9a, 0x8f, 0x98, 0x34, 0xac, 0xfb, 0x09, 0xaa, 0x44, 0x71,
- 0x78, 0x08, 0xe5, 0x78, 0x7e, 0xeb, 0x94, 0xba, 0xa5, 0x5e, 0x73, 0xb0, 0xdd, 0x57, 0x49, 0x2a,
- 0xca, 0x4b, 0xd8, 0x9c, 0xdf, 0x12, 0xc5, 0xe1, 0x31, 0x54, 0x63, 0x2a, 0xaf, 0x53, 0x67, 0xab,
- 0x5b, 0x5e, 0x07, 0x99, 0x56, 0x1e, 0x95, 0xd7, 0xc4, 0xb0, 0xee, 0x7d, 0x09, 0x2a, 0xca, 0xc7,
- 0x1e, 0x54, 0xe4, 0x5d, 0xcc, 0x74, 0xcd, 0xf6, 0x60, 0xf7, 0x51, 0x78, 0xff, 0xf3, 0x5d, 0xcc,
- 0x88, 0x8e, 0xc0, 0x37, 0xd0, 0x4c, 0x25, 0x95, 0x7c, 0x1a, 0xa8, 0x12, 0xce, 0x96, 0x1e, 0x62,
- 0xaf, 0x90, 0xe0, 0x6b, 0x56, 0x77, 0x81, 0x74, 0x6d, 0xe3, 0x4b, 0xb0, 0x46, 0x63, 0xcf, 0x24,
- 0x95, 0x75, 0x12, 0x16, 0x92, 0x46, 0x63, 0x4f, 0x67, 0xd4, 0x73, 0xc3, 0x3d, 0x80, 0x8a, 0x6a,
- 0x8a, 0x00, 0x35, 0x53, 0xb0, 0xf3, 0x0f, 0xd6, 0xa1, 0x3c, 0x1a, 0x7b, 0x9d, 0x92, 0xfb, 0x1a,
- 0xe0, 0xa1, 0x0b, 0x3e, 0x07, 0x2b, 0x62, 0xb7, 0x32, 0xb8, 0x16, 0x71, 0x7e, 0x26, 0xcd, 0xf5,
- 0x99, 0x5c, 0x7a, 0xa4, 0xae, 0xc8, 0x77, 0x22, 0x76, 0xef, 0x2b, 0xb0, 0x2a, 0x8f, 0x2f, 0x60,
- 0x5b, 0x4d, 0x12, 0xf0, 0x19, 0x8b, 0x24, 0x9f, 0x73, 0x96, 0xe8, 0x54, 0x9b, 0xb4, 0x15, 0x7c,
- 0xb9, 0x46, 0x37, 0x8a, 0x6f, 0xfd, 0xbd, 0x38, 0x3e, 0x01, 0x08, 0xc5, 0x94, 0x86, 0x41, 0x9c,
- 0xb0, 0xb9, 0x16, 0x68, 0x93, 0x86, 0x46, 0xd4, 0xb5, 0xe0, 0x29, 0xd4, 0x87, 0xbe, 0x11, 0x5f,
- 0xd1, 0x37, 0xe2, 0x14, 0xc4, 0x0f, 0x7d, 0x35, 0x93, 0xcf, 0x16, 0x4b, 0x16, 0x49, 0x52, 0x33,
- 0x2e, 0xfe, 0x07, 0x35, 0x91, 0xf0, 0x05, 0x8f, 0x9c, 0xaa, 0xae, 0x96, 0x7b, 0xd8, 0x81, 0xf2,
- 0x87, 0x8b, 0x73, 0xa7, 0xa6, 0x41, 0x65, 0x22, 0x42, 0xe5, 0x62, 0x34, 0xf6, 0x9c, 0x7a, 0xb7,
- 0xd4, 0xb3, 0x88, 0xb6, 0xf1, 0x18, 0xda, 0xea, 0xb8, 0x0b, 0xfa, 0x2c, 0x9d, 0x60, 0x8f, 0xc6,
- 0x5e, 0x41, 0xde, 0x11, 0xd4, 0x52, 0x91, 0x25, 0x53, 0xe6, 0x34, 0xfe, 0x14, 0x97, 0x53, 0xd8,
- 0x85, 0xe6, 0x54, 0x2c, 0x97, 0x59, 0xc4, 0x25, 0x67, 0xa9, 0x03, 0xdd, 0x72, 0xcf, 0x26, 0x45,
- 0x08, 0xdf, 0xc2, 0x4e, 0x48, 0x93, 0x05, 0x0b, 0x8a, 0x71, 0x4d, 0x2d, 0xf4, 0xff, 0x82, 0xd0,
- 0x2b, 0x15, 0x73, 0x96, 0x87, 0xdc, 0x91, 0x4e, 0x58, 0xf4, 0x55, 0x9d, 0x23, 0xb0, 0x8d, 0x4a,
- 0x2a, 0x45, 0x12, 0xf0, 0x99, 0xd3, 0xd2, 0x43, 0xb7, 0x1e, 0xc0, 0xcb, 0x19, 0x1e, 0x42, 0x6b,
- 0x1a, 0x66, 0xa9, 0x64, 0x49, 0x10, 0xf2, 0x54, 0x3a, 0x76, 0x3e, 0x8f, 0xc1, 0xae, 0x78, 0x2a,
- 0xf1, 0x3d, 0x60, 0x16, 0x7d, 0x8b, 0xc4, 0x8f, 0x28, 0xa0, 0x52, 0x26, 0x7c, 0x92, 0x49, 0x96,
- 0x3a, 0x6d, 0x3d, 0xd0, 0x41, 0x61, 0xa0, 0x2f, 0x26, 0x68, 0xb8, 0x8a, 0x21, 0x3b, 0xd9, 0x23,
- 0x24, 0x75, 0xcf, 0xc1, 0xde, 0xb8, 0x20, 0x7c, 0x06, 0xcd, 0xa1, 0x1f, 0xa4, 0xec, 0x7b, 0xc6,
- 0xa2, 0xa9, 0x79, 0x32, 0x16, 0x81, 0xa1, 0xef, 0xe7, 0x88, 0xba, 0x8f, 0xa1, 0xff, 0xd1, 0xbc,
- 0x3d, 0x9b, 0x68, 0xdb, 0xfd, 0x59, 0x82, 0xf6, 0xa6, 0x7c, 0x3c, 0x85, 0xdd, 0x45, 0x28, 0x26,
- 0x34, 0x0c, 0xe8, 0x6c, 0xc9, 0x23, 0x9e, 0xca, 0x44, 0x29, 0xcc, 0x17, 0xf1, 0x5f, 0xc3, 0x0d,
- 0x8b, 0x94, 0xda, 0xb2, 0x19, 0x95, 0x34, 0x88, 0x69, 0x22, 0x4f, 0xf5, 0x3e, 0xda, 0xa4, 0xa1,
- 0x10, 0x4f, 0x01, 0x1b, 0xf4, 0x60, 0xb5, 0x84, 0x2b, 0x7a, 0xe0, 0xfe, 0x2a, 0x41, 0xe7, 0xb1,
- 0x62, 0xdc, 0x07, 0x4b, 0xc4, 0x92, 0x8b, 0x88, 0x86, 0xb9, 0x94, 0xb5, 0x8f, 0x4f, 0x01, 0x64,
- 0x42, 0xa3, 0x94, 0x4b, 0x7e, 0xc3, 0x74, 0x3b, 0x8b, 0x14, 0x10, 0x74, 0xa0, 0xae, 0x5a, 0x71,
- 0x1a, 0xea, 0x66, 0x16, 0x59, 0xb9, 0x78, 0x00, 0x0d, 0xf5, 0x5b, 0x04, 0x53, 0x31, 0x63, 0x4e,
- 0x45, 0x0f, 0x62, 0x29, 0xe0, 0x4c, 0xcc, 0x18, 0xee, 0x42, 0xf5, 0x86, 0x86, 0x19, 0xd3, 0x8b,
- 0xdd, 0x22, 0xc6, 0x19, 0x35, 0xbf, 0x36, 0xd6, 0xbf, 0xe2, 0xa4, 0xa6, 0xbf, 0xbc, 0x57, 0xbf,
- 0x03, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x9d, 0x92, 0xdc, 0x29, 0x05, 0x00, 0x00,
+func init() {
+ proto.RegisterFile("github.com/bio-routing/bio-rd/route/api/route.proto", fileDescriptor_00363871266b6b0e)
+}
+
+var fileDescriptor_00363871266b6b0e = []byte{
+ // 727 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x72, 0xd3, 0x3a,
+ 0x10, 0x3e, 0x69, 0xfe, 0x9c, 0x4d, 0x9c, 0xa6, 0x3a, 0x3d, 0x67, 0x7c, 0xda, 0x39, 0x90, 0xba,
+ 0x53, 0x1a, 0x2e, 0x9a, 0x4c, 0x53, 0x86, 0xfb, 0xa4, 0x2d, 0xa1, 0x4c, 0x61, 0x8c, 0x0c, 0x37,
+ 0xdc, 0x78, 0x14, 0x5b, 0x49, 0x34, 0x38, 0x96, 0xb1, 0xe5, 0xd2, 0x5e, 0xf2, 0x1c, 0xbc, 0x46,
+ 0x1f, 0x90, 0x91, 0xe4, 0xa4, 0x4e, 0x19, 0x18, 0xee, 0x76, 0xbf, 0xdd, 0x6f, 0x77, 0x3f, 0x69,
+ 0x25, 0x38, 0x9b, 0x33, 0xb1, 0xc8, 0xa6, 0x7d, 0x9f, 0x2f, 0x07, 0x53, 0xc6, 0x4f, 0x12, 0x9e,
+ 0x09, 0x16, 0xcd, 0xb5, 0x1d, 0x0c, 0xa4, 0x4b, 0x07, 0x24, 0x66, 0xda, 0xea, 0xc7, 0x09, 0x17,
+ 0x1c, 0x35, 0xa6, 0x8c, 0xf7, 0x15, 0xb0, 0x37, 0xf8, 0x3d, 0x3f, 0xa2, 0x42, 0xb1, 0x23, 0x2a,
+ 0x34, 0xd7, 0x7e, 0x0f, 0x55, 0x2c, 0x99, 0xe8, 0x00, 0xca, 0xf1, 0xec, 0xd6, 0x2a, 0x75, 0x4b,
+ 0xbd, 0xe6, 0x70, 0xbb, 0x2f, 0x4b, 0xca, 0x2c, 0x27, 0xa1, 0x33, 0x76, 0x8b, 0x65, 0x0c, 0x1d,
+ 0x41, 0x35, 0x26, 0x62, 0x91, 0x5a, 0x5b, 0xdd, 0xf2, 0x3a, 0x49, 0x0f, 0xe2, 0x10, 0xb1, 0xc0,
+ 0x3a, 0x6a, 0xdf, 0x97, 0xa0, 0x22, 0x7d, 0xd4, 0x83, 0x8a, 0xb8, 0x8b, 0xa9, 0xaa, 0xd9, 0x1e,
+ 0xee, 0x3e, 0x4a, 0xef, 0x7f, 0xb8, 0x8b, 0x29, 0x56, 0x19, 0xe8, 0x25, 0x34, 0x53, 0x41, 0x04,
+ 0xf3, 0x3d, 0x59, 0xc2, 0xda, 0x52, 0x43, 0xfc, 0x53, 0x20, 0xb8, 0x2a, 0xaa, 0xba, 0x40, 0xba,
+ 0xb6, 0xd1, 0x09, 0x18, 0xe3, 0x89, 0xa3, 0x49, 0x65, 0x45, 0x42, 0x05, 0xd2, 0x78, 0xe2, 0x28,
+ 0x46, 0x3d, 0x37, 0xec, 0x7d, 0xa8, 0xc8, 0xa6, 0x08, 0xa0, 0xa6, 0x0b, 0x76, 0xfe, 0x42, 0x75,
+ 0x28, 0x8f, 0x27, 0x4e, 0xa7, 0x64, 0xbf, 0x00, 0x78, 0xe8, 0x82, 0x9e, 0x81, 0x11, 0xd1, 0x5b,
+ 0xe1, 0x2d, 0x78, 0x9c, 0x9f, 0x49, 0x73, 0x7d, 0x26, 0x57, 0x0e, 0xae, 0xcb, 0xe0, 0x6b, 0x1e,
+ 0xdb, 0xf7, 0x15, 0x58, 0x95, 0x47, 0xc7, 0xb0, 0x2d, 0x27, 0xf1, 0x58, 0x40, 0x23, 0xc1, 0x66,
+ 0x8c, 0x26, 0x8a, 0x6a, 0xe2, 0xb6, 0x84, 0xaf, 0xd6, 0xe8, 0x46, 0xf1, 0xad, 0x5f, 0x17, 0x47,
+ 0xff, 0x03, 0x84, 0xdc, 0x27, 0xa1, 0x17, 0x27, 0x74, 0xa6, 0x04, 0x9a, 0xb8, 0xa1, 0x10, 0x79,
+ 0x2d, 0xe8, 0x14, 0xea, 0x23, 0x57, 0x8b, 0xaf, 0xa8, 0x1b, 0xb1, 0x0a, 0xe2, 0x47, 0xae, 0x9c,
+ 0xc9, 0xa5, 0xf3, 0x25, 0x8d, 0x04, 0xae, 0x69, 0x17, 0xfd, 0x0b, 0x35, 0x9e, 0xb0, 0x39, 0x8b,
+ 0xac, 0xaa, 0xaa, 0x96, 0x7b, 0xa8, 0x03, 0xe5, 0xb7, 0x97, 0x17, 0x56, 0x4d, 0x81, 0xd2, 0x44,
+ 0x08, 0x2a, 0x97, 0xe3, 0x89, 0x63, 0xd5, 0xbb, 0xa5, 0x9e, 0x81, 0x95, 0x8d, 0x8e, 0xa0, 0x2d,
+ 0x8f, 0xbb, 0xa0, 0xcf, 0x50, 0x04, 0x73, 0x3c, 0x71, 0x0a, 0xf2, 0x0e, 0xa1, 0x96, 0xf2, 0x2c,
+ 0xf1, 0xa9, 0xd5, 0xf8, 0x59, 0x5c, 0x1e, 0x42, 0x5d, 0x68, 0xfa, 0x7c, 0xb9, 0xcc, 0x22, 0x26,
+ 0x18, 0x4d, 0x2d, 0xe8, 0x96, 0x7b, 0x26, 0x2e, 0x42, 0xe8, 0x15, 0xec, 0x84, 0x24, 0x99, 0x53,
+ 0xaf, 0x98, 0xd7, 0x54, 0x42, 0xff, 0x2b, 0x08, 0xbd, 0x96, 0x39, 0xe7, 0x79, 0xca, 0x1d, 0xee,
+ 0x84, 0x45, 0x5f, 0xd6, 0x39, 0x04, 0x53, 0xab, 0x24, 0x82, 0x27, 0x1e, 0x0b, 0xac, 0x96, 0x1a,
+ 0xba, 0xf5, 0x00, 0x5e, 0x05, 0xe8, 0x00, 0x5a, 0x7e, 0x98, 0xa5, 0x82, 0x26, 0x5e, 0xc8, 0x52,
+ 0x61, 0x99, 0xf9, 0x3c, 0x1a, 0xbb, 0x66, 0xa9, 0x40, 0x6f, 0x00, 0x65, 0xd1, 0xe7, 0x88, 0x7f,
+ 0x8d, 0x3c, 0x22, 0x44, 0xc2, 0xa6, 0x99, 0xa0, 0xa9, 0xd5, 0x56, 0x03, 0xed, 0x17, 0x06, 0xfa,
+ 0xa8, 0x93, 0x46, 0xab, 0x1c, 0xbc, 0x93, 0x3d, 0x42, 0x52, 0xfb, 0x02, 0xcc, 0x8d, 0x0b, 0x42,
+ 0x4f, 0xa1, 0x39, 0x72, 0xbd, 0x94, 0x7e, 0xc9, 0x68, 0xe4, 0xeb, 0x27, 0x63, 0x60, 0x18, 0xb9,
+ 0x6e, 0x8e, 0xc8, 0xfb, 0x18, 0xb9, 0xef, 0xf4, 0xdb, 0x33, 0xb1, 0xb2, 0xed, 0x6f, 0x25, 0x68,
+ 0x6f, 0xca, 0x47, 0xa7, 0xb0, 0x3b, 0x0f, 0xf9, 0x94, 0x84, 0x1e, 0x09, 0x96, 0x2c, 0x62, 0xa9,
+ 0x48, 0xa4, 0xc2, 0x7c, 0x11, 0xff, 0xd6, 0xb1, 0x51, 0x31, 0x24, 0xb7, 0x2c, 0x20, 0x82, 0x78,
+ 0x31, 0x49, 0xc4, 0xa9, 0xda, 0x47, 0x13, 0x37, 0x24, 0xe2, 0x48, 0x60, 0x23, 0x3c, 0x5c, 0x2d,
+ 0xe1, 0x2a, 0x3c, 0xb4, 0xbf, 0x97, 0xa0, 0xf3, 0x58, 0x31, 0xda, 0x03, 0x83, 0xc7, 0x82, 0xf1,
+ 0x88, 0x84, 0xb9, 0x94, 0xb5, 0x8f, 0x9e, 0x00, 0x88, 0x84, 0x44, 0x29, 0x13, 0xec, 0x86, 0xaa,
+ 0x76, 0x06, 0x2e, 0x20, 0xc8, 0x82, 0xba, 0x6c, 0xc5, 0x48, 0xa8, 0x9a, 0x19, 0x78, 0xe5, 0xa2,
+ 0x7d, 0x68, 0xc8, 0xdf, 0xc2, 0xf3, 0x79, 0x40, 0xad, 0x8a, 0x1a, 0xc4, 0x90, 0xc0, 0x39, 0x0f,
+ 0x28, 0xda, 0x85, 0xea, 0x0d, 0x09, 0x33, 0xaa, 0x16, 0xbb, 0x85, 0xb5, 0x33, 0x7e, 0xfe, 0xe9,
+ 0xf8, 0x0f, 0x7f, 0xd4, 0x69, 0x4d, 0x7d, 0x88, 0x67, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x30,
+ 0xd6, 0x35, 0x6f, 0x83, 0x05, 0x00, 0x00,
}
diff --git a/route/api/route.proto b/route/api/route.proto
index 1738061031c04e0fcef76a7d29eee989aa7d3608..2518dce73157aaf73d67933dec48dc985642dc72 100644
--- a/route/api/route.proto
+++ b/route/api/route.proto
@@ -2,8 +2,8 @@ syntax = "proto3";
package bio.route;
-import "net/api/net.proto";
-option go_package = "route/api";
+import "github.com/bio-routing/bio-rd/net/api/net.proto";
+option go_package = "github.com/bio-routing/bio-rd/route/api";
message Route {
bio.net.Prefix pfx = 1;