diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1412d587485e7f221678369a8ee01f34a9bb6d36..bf9991093eed64c26e48bea87dc8f5eaec36c6c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,5 +11,5 @@ test:cover: - go test -v -cover ./... include: -# - local: '/build/ci/.code-quality-ci.yml' + - local: '/build/ci/.code-quality-ci.yml' - local: '/build/ci/.security-and-compliance-ci.yml' diff --git a/README.md b/README.md index 0e5c3465a667fc4a961fe719f63c12c7eb9811a4..256cc5e8ae414070dc985329c59b277a30fe9130 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ A re-implementation of BGP, IS-IS and OSPF in go. We value respect and robustnes [](https://circleci.com/gh/bio-routing/bio-rd/tree/master) [](https://codecov.io/gh/bio-routing/bio-rd) [](http://goreportcard.com/report/bio-routing/bio-rd) -[](https://godoc.org/github.com/bio-routing/bio-rd) +[](https://godoc.org/code.fbi.h-da.de/danet/bio-rd) ## Building diff --git a/cmd/bio-rd/config/bgp.go b/cmd/bio-rd/config/bgp.go index 30da4b0e2cbc8c60c6c934bca669e7b5807363af..4f740b6d3b985b3616dc7615b5e816763b42af71 100644 --- a/cmd/bio-rd/config/bgp.go +++ b/cmd/bio-rd/config/bgp.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/routingtable/filter" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" "github.com/pkg/errors" ) diff --git a/cmd/bio-rd/config/policy.go b/cmd/bio-rd/config/policy.go index c9efff1575aea30c9e930b528ef927a5e595194a..3abeb1f8208ac294a13efcd56bf3408d4495acfe 100644 --- a/cmd/bio-rd/config/policy.go +++ b/cmd/bio-rd/config/policy.go @@ -3,9 +3,9 @@ package config import ( "fmt" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/routingtable/filter" - "github.com/bio-routing/bio-rd/routingtable/filter/actions" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter/actions" "github.com/pkg/errors" ) diff --git a/cmd/bio-rd/config/routing_options.go b/cmd/bio-rd/config/routing_options.go index 8bb3eb683a436a3c7497b23b98fd88116047d284..7009bfc8dc331a38fc2dda9ea4dbac14f54e75b8 100644 --- a/cmd/bio-rd/config/routing_options.go +++ b/cmd/bio-rd/config/routing_options.go @@ -1,7 +1,7 @@ package config import ( - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" "github.com/pkg/errors" ) diff --git a/cmd/bio-rd/main.go b/cmd/bio-rd/main.go index 2c6db6bdcc64a15c84215ca30058b84fb522ecf3..db7520a60523854f42dd86db15b618bc0c7c8ccb 100644 --- a/cmd/bio-rd/main.go +++ b/cmd/bio-rd/main.go @@ -7,12 +7,12 @@ import ( "syscall" "time" - "github.com/bio-routing/bio-rd/cmd/bio-rd/config" - bgpapi "github.com/bio-routing/bio-rd/protocols/bgp/api" - bgpserver "github.com/bio-routing/bio-rd/protocols/bgp/server" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/vrf" - "github.com/bio-routing/bio-rd/util/servicewrapper" + "code.fbi.h-da.de/danet/bio-rd/cmd/bio-rd/config" + bgpapi "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api" + bgpserver "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/server" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" + "code.fbi.h-da.de/danet/bio-rd/util/servicewrapper" "github.com/pkg/errors" log "github.com/sirupsen/logrus" "google.golang.org/grpc" diff --git a/cmd/bio-rdc/main.go b/cmd/bio-rdc/main.go index 77bfefe73fa4e2ea9f00bc4a6b3f638bdc20a8f3..f04b7629f23f2f1fe393ee259297024eac0cb654 100644 --- a/cmd/bio-rdc/main.go +++ b/cmd/bio-rdc/main.go @@ -8,9 +8,9 @@ import ( "os" "strings" - bnet "github.com/bio-routing/bio-rd/net" - bgpapi "github.com/bio-routing/bio-rd/protocols/bgp/api" - "github.com/bio-routing/bio-rd/route" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + bgpapi "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api" + "code.fbi.h-da.de/danet/bio-rd/route" log "github.com/sirupsen/logrus" "google.golang.org/grpc" ) diff --git a/cmd/ris-mirror/config/config.go b/cmd/ris-mirror/config/config.go index 6aa781f39c299a91abf9128e5a31f39d067857cc..40f0aa8a0d6041c6aa2d867a61f66ff0be9aa037 100644 --- a/cmd/ris-mirror/config/config.go +++ b/cmd/ris-mirror/config/config.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "net" - "github.com/bio-routing/bio-rd/routingtable/vrf" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" "github.com/pkg/errors" "gopkg.in/yaml.v2" ) diff --git a/cmd/ris-mirror/main.go b/cmd/ris-mirror/main.go index 65772646259911c9f83ada976b4e9dc56c0466a6..2ec60d614d2d1a7b43fa5cb3c7b0475e3daf1c5c 100644 --- a/cmd/ris-mirror/main.go +++ b/cmd/ris-mirror/main.go @@ -5,14 +5,14 @@ import ( "os" "time" - "github.com/bio-routing/bio-rd/cmd/ris-mirror/config" - "github.com/bio-routing/bio-rd/cmd/ris-mirror/rismirror" - pb "github.com/bio-routing/bio-rd/cmd/ris/api" - "github.com/bio-routing/bio-rd/cmd/ris/risserver" - prom_grpc_cm "github.com/bio-routing/bio-rd/metrics/grpc/clientmanager/adapter/prom" - prom_ris_mirror "github.com/bio-routing/bio-rd/metrics/ris-mirror/adapter/prom" - "github.com/bio-routing/bio-rd/util/grpc/clientmanager" - "github.com/bio-routing/bio-rd/util/servicewrapper" + "code.fbi.h-da.de/danet/bio-rd/cmd/ris-mirror/config" + "code.fbi.h-da.de/danet/bio-rd/cmd/ris-mirror/rismirror" + pb "code.fbi.h-da.de/danet/bio-rd/cmd/ris/api" + "code.fbi.h-da.de/danet/bio-rd/cmd/ris/risserver" + prom_grpc_cm "code.fbi.h-da.de/danet/bio-rd/metrics/grpc/clientmanager/adapter/prom" + prom_ris_mirror "code.fbi.h-da.de/danet/bio-rd/metrics/ris-mirror/adapter/prom" + "code.fbi.h-da.de/danet/bio-rd/util/grpc/clientmanager" + "code.fbi.h-da.de/danet/bio-rd/util/servicewrapper" "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" "google.golang.org/grpc" diff --git a/cmd/ris-mirror/rismirror/metrics/ris_mirror_metrics.go b/cmd/ris-mirror/rismirror/metrics/ris_mirror_metrics.go index 3d8948cb7c22582a52d60c687886b20d3396e746..8c85478477da387b5bf73c5a81d98e1b39cf8dab 100644 --- a/cmd/ris-mirror/rismirror/metrics/ris_mirror_metrics.go +++ b/cmd/ris-mirror/rismirror/metrics/ris_mirror_metrics.go @@ -3,8 +3,8 @@ package metrics import ( "net" - mlrib_metrics "github.com/bio-routing/bio-rd/routingtable/mergedlocrib/metrics" - vrf_metrics "github.com/bio-routing/bio-rd/routingtable/vrf/metrics" + mlrib_metrics "code.fbi.h-da.de/danet/bio-rd/routingtable/mergedlocrib/metrics" + vrf_metrics "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf/metrics" ) // RISMirrorMetrics contains per router BMP metrics diff --git a/cmd/ris-mirror/rismirror/rismirror.go b/cmd/ris-mirror/rismirror/rismirror.go index 3fed598fbbeb48ae89ff6ceee9f2d90a91285766..552ae4129138b6558f83e95cab4d7a1cc75e75ef 100644 --- a/cmd/ris-mirror/rismirror/rismirror.go +++ b/cmd/ris-mirror/rismirror/rismirror.go @@ -4,9 +4,9 @@ import ( "net" "sync" - "github.com/bio-routing/bio-rd/cmd/ris-mirror/rismirror/metrics" - "github.com/bio-routing/bio-rd/protocols/bgp/server" - "github.com/bio-routing/bio-rd/routingtable/vrf" + "code.fbi.h-da.de/danet/bio-rd/cmd/ris-mirror/rismirror/metrics" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/server" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" "google.golang.org/grpc" ) diff --git a/cmd/ris-mirror/rismirror/router.go b/cmd/ris-mirror/rismirror/router.go index eb8cb8061c19994160ee33dec07af0523ae4356c..e21316a28f55883a5f278ebbce076f29d4a8faee 100644 --- a/cmd/ris-mirror/rismirror/router.go +++ b/cmd/ris-mirror/rismirror/router.go @@ -4,11 +4,11 @@ import ( "fmt" "net" - "github.com/bio-routing/bio-rd/risclient" - "github.com/bio-routing/bio-rd/routingtable/vrf" + "code.fbi.h-da.de/danet/bio-rd/risclient" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" "google.golang.org/grpc" - "github.com/bio-routing/bio-rd/cmd/ris/api" + "code.fbi.h-da.de/danet/bio-rd/cmd/ris/api" ) // Router represents a router diff --git a/cmd/ris-mirror/rismirror/vrf.go b/cmd/ris-mirror/rismirror/vrf.go index 40ddfb16d81249bb6b988a308877ef5bfead0bb7..a5e0356a60772e2b496706a51c3945b98f53c453 100644 --- a/cmd/ris-mirror/rismirror/vrf.go +++ b/cmd/ris-mirror/rismirror/vrf.go @@ -1,8 +1,8 @@ package rismirror import ( - "github.com/bio-routing/bio-rd/routingtable/locRIB" - "github.com/bio-routing/bio-rd/routingtable/mergedlocrib" + "code.fbi.h-da.de/danet/bio-rd/routingtable/locRIB" + "code.fbi.h-da.de/danet/bio-rd/routingtable/mergedlocrib" ) type _vrf struct { diff --git a/cmd/ris/api/ris.pb.go b/cmd/ris/api/ris.pb.go index f6af06929d075612919cca76e4954f9046d124c9..9dc8d1c0e59e0bfaf9e868ebe3c0db718b778765 100644 --- a/cmd/ris/api/ris.pb.go +++ b/cmd/ris/api/ris.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/bio-routing/bio-rd/cmd/ris/api/ris.proto +// source: code.fbi.h-da.de/danet/bio-rd/cmd/ris/api/ris.proto package api import ( context "context" fmt "fmt" - api "github.com/bio-routing/bio-rd/net/api" - api1 "github.com/bio-routing/bio-rd/route/api" + api "code.fbi.h-da.de/danet/bio-rd/net/api" + api1 "code.fbi.h-da.de/danet/bio-rd/route/api" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" math "math" @@ -744,7 +744,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/bio-routing/bio-rd/cmd/ris/api/ris.proto", fileDescriptor_ffe1202aa518913f) + proto.RegisterFile("code.fbi.h-da.de/danet/bio-rd/cmd/ris/api/ris.proto", fileDescriptor_ffe1202aa518913f) } var fileDescriptor_ffe1202aa518913f = []byte{ @@ -1082,5 +1082,5 @@ var _RoutingInformationService_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, }, - Metadata: "github.com/bio-routing/bio-rd/cmd/ris/api/ris.proto", + Metadata: "code.fbi.h-da.de/danet/bio-rd/cmd/ris/api/ris.proto", } diff --git a/cmd/ris/api/ris.proto b/cmd/ris/api/ris.proto index 07736c6c18f4d09674386df7f7b33f92c0eb96ab..cd028a61940c2c7ea1e2a375ff7b0ec95559f0c4 100644 --- a/cmd/ris/api/ris.proto +++ b/cmd/ris/api/ris.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package bio.ris; -import "github.com/bio-routing/bio-rd/net/api/net.proto"; -import "github.com/bio-routing/bio-rd/route/api/route.proto"; -option go_package = "github.com/bio-routing/bio-rd/cmd/ris/api"; +import "code.fbi.h-da.de/danet/bio-rd/net/api/net.proto"; +import "code.fbi.h-da.de/danet/bio-rd/route/api/route.proto"; +option go_package = "code.fbi.h-da.de/danet/bio-rd/cmd/ris/api"; service RoutingInformationService { rpc LPM(LPMRequest) returns (LPMResponse) {}; diff --git a/cmd/ris/main.go b/cmd/ris/main.go index 75b1f903d0e2267679aef222d6517bd1cb91e953..1d2ebe7022ad65018e6aa3802a158e96234e04a6 100644 --- a/cmd/ris/main.go +++ b/cmd/ris/main.go @@ -8,15 +8,15 @@ import ( "google.golang.org/grpc" - "github.com/bio-routing/bio-rd/cmd/ris/config" - "github.com/bio-routing/bio-rd/cmd/ris/risserver" - "github.com/bio-routing/bio-rd/protocols/bgp/server" - "github.com/bio-routing/bio-rd/util/servicewrapper" + "code.fbi.h-da.de/danet/bio-rd/cmd/ris/config" + "code.fbi.h-da.de/danet/bio-rd/cmd/ris/risserver" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/server" + "code.fbi.h-da.de/danet/bio-rd/util/servicewrapper" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/keepalive" - pb "github.com/bio-routing/bio-rd/cmd/ris/api" - prom_bmp "github.com/bio-routing/bio-rd/metrics/bmp/adapter/prom" + pb "code.fbi.h-da.de/danet/bio-rd/cmd/ris/api" + prom_bmp "code.fbi.h-da.de/danet/bio-rd/metrics/bmp/adapter/prom" log "github.com/sirupsen/logrus" ) diff --git a/cmd/ris/risserver/server.go b/cmd/ris/risserver/server.go index 07bd98d17f62e2ec81a8f947e829d322376dbc04..277a780ecd49eaab1f04426e4acf8d3f2af21842 100644 --- a/cmd/ris/risserver/server.go +++ b/cmd/ris/risserver/server.go @@ -4,21 +4,21 @@ import ( "context" "fmt" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/server" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/locRIB" - "github.com/bio-routing/bio-rd/routingtable/vrf" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/server" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/locRIB" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - pb "github.com/bio-routing/bio-rd/cmd/ris/api" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/net/api" - netapi "github.com/bio-routing/bio-rd/net/api" - routeapi "github.com/bio-routing/bio-rd/route/api" + pb "code.fbi.h-da.de/danet/bio-rd/cmd/ris/api" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/net/api" + netapi "code.fbi.h-da.de/danet/bio-rd/net/api" + routeapi "code.fbi.h-da.de/danet/bio-rd/route/api" ) var ( diff --git a/cmd/ris/risserver/update_queue.go b/cmd/ris/risserver/update_queue.go index 719901163a9246e8736689292d00da532e5f46b5..3ecc361c74c0645de1cd86430e3eabbb7b1cf4b3 100644 --- a/cmd/ris/risserver/update_queue.go +++ b/cmd/ris/risserver/update_queue.go @@ -3,7 +3,7 @@ package risserver import ( "sync" - pb "github.com/bio-routing/bio-rd/cmd/ris/api" + pb "code.fbi.h-da.de/danet/bio-rd/cmd/ris/api" ) type updateFIFO struct { diff --git a/cmd/riscli/dump_loc_rib.go b/cmd/riscli/dump_loc_rib.go index 2baa824532e278c2032c2aa201bafc4640450351..20b90903f68a9b82e1ee5f55eda558a37aba92e0 100644 --- a/cmd/riscli/dump_loc_rib.go +++ b/cmd/riscli/dump_loc_rib.go @@ -6,7 +6,7 @@ import ( "io" "os" - pb "github.com/bio-routing/bio-rd/cmd/ris/api" + pb "code.fbi.h-da.de/danet/bio-rd/cmd/ris/api" "github.com/pkg/errors" log "github.com/sirupsen/logrus" "github.com/urfave/cli" diff --git a/cmd/riscli/lpm.go b/cmd/riscli/lpm.go index e87e6edc1d2c5d32f210edb660cb44a89abf12d8..507ff95db7e71811ed52607979293190474f3ae4 100644 --- a/cmd/riscli/lpm.go +++ b/cmd/riscli/lpm.go @@ -4,8 +4,8 @@ import ( "context" "os" - pb "github.com/bio-routing/bio-rd/cmd/ris/api" - bnet "github.com/bio-routing/bio-rd/net" + pb "code.fbi.h-da.de/danet/bio-rd/cmd/ris/api" + bnet "code.fbi.h-da.de/danet/bio-rd/net" "github.com/pkg/errors" log "github.com/sirupsen/logrus" "github.com/urfave/cli" diff --git a/cmd/riscli/route.go b/cmd/riscli/route.go index 9d6b8218389e15f6f1a0faa20c77b978ad652d95..d7dfd0110ce636fba7c1d2afd91b8d8bdeeb4877 100644 --- a/cmd/riscli/route.go +++ b/cmd/riscli/route.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/route/api" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/route/api" ) func printRoute(ar *api.Route) { diff --git a/config/isis.go b/config/isis.go index c0c5de5a773dac856ea466e0244e56149b40f838..c7fb158556d1409825a49a630a293ef497650a55 100644 --- a/config/isis.go +++ b/config/isis.go @@ -3,7 +3,7 @@ package config import ( "fmt" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" ) type ISISConfig struct { diff --git a/config/isis_test.go b/config/isis_test.go index 602606495b3b1f4a60986113e880cbbcf1cd679a..9d89a9aa91a489d20bd95c46cba637ffdf25a7a8 100644 --- a/config/isis_test.go +++ b/config/isis_test.go @@ -3,7 +3,7 @@ package config import ( "testing" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" "github.com/stretchr/testify/assert" ) diff --git a/config/netlink.go b/config/netlink.go index e5e151ca3e3078952271528de8fdd286881481d7..64100dfc7f9f057916feb45562e773d3effa8f0a 100644 --- a/config/netlink.go +++ b/config/netlink.go @@ -3,7 +3,7 @@ package config import ( "time" - "github.com/bio-routing/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" ) // Constants for default routing tables in the Linux Kernel diff --git a/config/server_test.go b/config/server_test.go index e674c197125565623795d79d588a295bd54e38e1..a542c52d5fd170b1db9ea758b637f885cd9004c6 100644 --- a/config/server_test.go +++ b/config/server_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) func TestGetLoopbackIP(t *testing.T) { diff --git a/examples/bgp/main.go b/examples/bgp/main.go index bfcbb47e5ba5c07bc005bccfbeb2484a49bfe63b..4da6a3f830488427adf8cd36febf4f0a34a48a7e 100644 --- a/examples/bgp/main.go +++ b/examples/bgp/main.go @@ -7,11 +7,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - prom_bgp "github.com/bio-routing/bio-rd/metrics/bgp/adapter/prom" - prom_vrf "github.com/bio-routing/bio-rd/metrics/vrf/adapter/prom" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/server" - "github.com/bio-routing/bio-rd/routingtable/vrf" + prom_bgp "code.fbi.h-da.de/danet/bio-rd/metrics/bgp/adapter/prom" + prom_vrf "code.fbi.h-da.de/danet/bio-rd/metrics/vrf/adapter/prom" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/server" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" "github.com/sirupsen/logrus" ) diff --git a/examples/bgp/main_ipv4.go b/examples/bgp/main_ipv4.go index 6b7a9395a4ecfe1f70cba6b58c362cdd47f30978..8519d98030611059e8238d068314ed56fe3b2451 100644 --- a/examples/bgp/main_ipv4.go +++ b/examples/bgp/main_ipv4.go @@ -6,16 +6,16 @@ import ( "net" "time" - "github.com/bio-routing/bio-rd/routingtable/vrf" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" "google.golang.org/grpc" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/server" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/filter" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/server" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" log "github.com/sirupsen/logrus" - api "github.com/bio-routing/bio-rd/protocols/bgp/api" + api "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api" ) func startServer(b server.BGPServer, v *vrf.VRF) { diff --git a/examples/bgp/main_ipv6.go b/examples/bgp/main_ipv6.go index 9e2372ff4a71ed1ffd67a4516115e6c0c79061ac..4c6b2f8ae33433932f7afd17f3f6bccbc0945ecc 100644 --- a/examples/bgp/main_ipv6.go +++ b/examples/bgp/main_ipv6.go @@ -6,12 +6,12 @@ import ( "net" "time" - "github.com/bio-routing/bio-rd/config" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/server" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/filter" - "github.com/bio-routing/bio-rd/routingtable/vrf" + "code.fbi.h-da.de/danet/bio-rd/config" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/server" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" "github.com/sirupsen/logrus" ) diff --git a/examples/bmp/main_bmp.go b/examples/bmp/main_bmp.go index 95ceee1676f52b0a59d53b5f1c88b7dbac0ef7d8..141f2cff201fdcfc439fc149f772d45dd2bee511 100644 --- a/examples/bmp/main_bmp.go +++ b/examples/bmp/main_bmp.go @@ -5,10 +5,10 @@ import ( "net" "time" - "github.com/bio-routing/bio-rd/protocols/bgp/server" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/server" "github.com/sirupsen/logrus" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) func main() { diff --git a/examples/device/main.go b/examples/device/main.go index 354817a18b59480ed24fa84b7ab234d601b938de..df64dcfb976b4f7280778d5cf39cb3312599c351 100644 --- a/examples/device/main.go +++ b/examples/device/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/bio-routing/bio-rd/protocols/device" + "code.fbi.h-da.de/danet/bio-rd/protocols/device" log "github.com/sirupsen/logrus" ) diff --git a/examples/kernel/main.go b/examples/kernel/main.go index f6b3f548ed144552e5c94c21d90c154dcc9ecaa3..d68ef085d9e2486478dd8a4c15512d6a3a55808d 100644 --- a/examples/kernel/main.go +++ b/examples/kernel/main.go @@ -4,10 +4,10 @@ import ( "os" "time" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/kernel" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable/vrf" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/kernel" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" log "github.com/sirupsen/logrus" ) diff --git a/fuzzing/packet/Makefile b/fuzzing/packet/Makefile index c4b419aee951dc61b5d91037828ac177735b2234..7ce4ffc1c89743348c5a1ee7e3a483d2fd496597 100644 --- a/fuzzing/packet/Makefile +++ b/fuzzing/packet/Makefile @@ -6,7 +6,7 @@ $(GOPATH)/bin/go-fuzz: go get -u github.com/dvyukov/go-fuzz/... packet-fuzz.zip: $(GOPATH)/bin/go-fuzz-build - $(GOPATH)/bin/go-fuzz-build github.com/bio-routing/bio-rd/protocols/bgp/packet + $(GOPATH)/bin/go-fuzz-build code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet corpus: mkdir -p corpus diff --git a/go.mod b/go.mod index e1077e5360c86f3f2c4173eb87a5a0ecde29cef2..60f56bf9063401fe353ff80953a555797652f0ac 100644 --- a/go.mod +++ b/go.mod @@ -1,28 +1,21 @@ -module github.com/bio-routing/bio-rd +module code.fbi.h-da.de/danet/bio-rd + +go 1.15 require ( - github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect - github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 // indirect - github.com/bio-routing/tflow2 v0.0.0-20181230153523-2e308a4a3c3a - github.com/golang/protobuf v1.4.0 - github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 + github.com/bio-routing/tflow2 v0.0.0-20200122091514-89924193643e + github.com/golang/protobuf v1.4.3 + github.com/google/gopacket v1.1.19 + github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 - github.com/pkg/errors v0.8.0 - github.com/prometheus/client_golang v1.0.0 - github.com/prometheus/common v0.6.0 - github.com/sirupsen/logrus v1.3.0 - github.com/stretchr/testify v1.3.0 - github.com/urfave/cli v1.21.0 - github.com/vishvananda/netlink v1.0.0 - github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect - golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect - golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect - golang.org/x/text v0.3.2 // indirect - golang.org/x/tools v0.0.0-20200714190737-9048b464a08d // indirect - google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36 // indirect - google.golang.org/grpc v1.28.0 - google.golang.org/protobuf v1.21.0 - gopkg.in/yaml.v2 v2.2.2 + github.com/pkg/errors v0.9.1 + github.com/prometheus/client_golang v1.8.0 + github.com/prometheus/common v0.14.0 + github.com/sirupsen/logrus v1.7.0 + github.com/stretchr/testify v1.6.1 + github.com/urfave/cli v1.22.4 + github.com/vishvananda/netlink v1.1.0 + golang.org/x/net v0.0.0-20201021035429-f5854403a974 + google.golang.org/grpc v1.33.1 + gopkg.in/yaml.v2 v2.3.0 ) - -go 1.13 diff --git a/go.sum b/go.sum index 62be50875a720908dad645aaa4cefc60d97163e6..c044ebeb26bc6e2fe9074aae0dab1139d499d09b 100644 --- a/go.sum +++ b/go.sum @@ -1,193 +1,484 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1CELW+XaDYmOH4hkBN4/N9og/AsOv7E= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/bio-routing/tflow2 v0.0.0-20181230153523-2e308a4a3c3a h1:CsHtkAummoG7yhc9+6NRBkoPcTzSSmTfiyzWx5NwFPw= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bio-routing/bio-rd v0.0.0-20190818170353-d73bc83147be/go.mod h1:vcvXfobV53gqekz1AJI9J5FfzFRkgQYtLv4I/sszDNA= github.com/bio-routing/tflow2 v0.0.0-20181230153523-2e308a4a3c3a/go.mod h1:tjzJ5IykdbWNs1FjmiJWsH6SRBl+aWgxO5I44DAegIw= +github.com/bio-routing/tflow2 v0.0.0-20200122091514-89924193643e h1:Zh5s5mFKBG1dwDLJU1fsPoFxTmixabOhqEuKrOkrKLM= +github.com/bio-routing/tflow2 v0.0.0-20200122091514-89924193643e/go.mod h1:4E2F/ExVEOHe9VF0fqQP60HTCWCMOWV4PyB8R/HndPU= +github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0 h1:aRz0NBceriICVtjhCgKkDvl+RudKu1CT6h0ZvUTrNfE= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 h1:Iju5GlWwrvL6UBg4zJJt3btmonfrMlCDdsejg4CZE7c= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= +github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 h1:FlFbCRLd5Jr4iYXZufAvgWN6Ao0JrI5chLINnUXDDr0= +github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.6.0 h1:YVPodQOcK15POxhgARIvnDRVpLcuK8mglnMrWfyrw6A= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.8.0 h1:zvJNkoCFAnYFNC24FV8nW4JdRJ3GIFcLbg65lL/JDcw= +github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.6.0 h1:kRhiuYSXR3+uv2IbVbZhUxK5zVD/2pp3Gd2PpvPkpEo= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.14.0 h1:RHRyE8UocrbjU+6UvRzwi6HjiDfxrrBU91TtbKzkGp4= +github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4= +github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME= github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/soniah/gosnmp v0.0.0-20181018115632-28507a583d6f/go.mod h1:2Tv1OISIqbjlOCmGzXl+hlZSAHsftdCWHLaLEezhwV8= +github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/urfave/cli v1.21.0 h1:wYSSj06510qPIzGSua9ZqsncMmWE3Zr55KBERygyrxE= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= -github.com/vishvananda/netlink v1.0.0 h1:bqNY2lgheFIu1meHUFSH3d7vG93AFyqg3oGbJCOJgSM= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA= +github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vishvananda/netlink v1.0.0/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= -github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4= +github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= +github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k= +github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY= -golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211 h1:9UQO31fZ+0aKQOFldThf7BKPMJTiBfWycGh/u3UoO88= +golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 h1:5Beo0mZN8dRzgrMMkDp0jc8YXQKx9DiJ2k1dkvGsn5A= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200714190737-9048b464a08d h1:hYhnolbefSSt3WZp66sgmgnEOFv5PD6a5PIcnKJ8jdU= -golang.org/x/tools v0.0.0-20200714190737-9048b464a08d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= +google.golang.org/genproto v0.0.0-20181221175505-bd9b4fb69e2f/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36 h1:j7CmVRD4Kec0+f8VuBAc2Ak2MFfXm5Q2/RxuJLL+76E= -google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215 h1:0Uz5jLJQioKgVozXa1gzGbzYxbb/rhQEVvSWxzw5oUs= +google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.33.1 h1:DGeFlSan2f+WEtCERJ4J9GJWk15TxUi8QGagfI87Xyc= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/metrics/bgp/adapter/prom/bgp_prom_adapter.go b/metrics/bgp/adapter/prom/bgp_prom_adapter.go index a2088ee31a24b89610add12b50e536ff39e512ef..3efebc55d9af9c204c5f769bc5840b75605910de 100644 --- a/metrics/bgp/adapter/prom/bgp_prom_adapter.go +++ b/metrics/bgp/adapter/prom/bgp_prom_adapter.go @@ -4,8 +4,8 @@ import ( "strconv" "time" - "github.com/bio-routing/bio-rd/protocols/bgp/metrics" - "github.com/bio-routing/bio-rd/protocols/bgp/server" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/metrics" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/server" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/log" diff --git a/metrics/bmp/adapter/prom/bmp_prom_adapter.go b/metrics/bmp/adapter/prom/bmp_prom_adapter.go index 5be9cacd1fc700d20efa907e7b7d7694d03e9e8b..8375a3b679c57d021625de6d16ed52ddf864580b 100644 --- a/metrics/bmp/adapter/prom/bmp_prom_adapter.go +++ b/metrics/bmp/adapter/prom/bmp_prom_adapter.go @@ -1,13 +1,13 @@ package prom import ( - "github.com/bio-routing/bio-rd/protocols/bgp/metrics" - "github.com/bio-routing/bio-rd/protocols/bgp/server" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/metrics" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/server" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - bgp_prom "github.com/bio-routing/bio-rd/metrics/bgp/adapter/prom" - vrf_prom "github.com/bio-routing/bio-rd/metrics/vrf/adapter/prom" + bgp_prom "code.fbi.h-da.de/danet/bio-rd/metrics/bgp/adapter/prom" + vrf_prom "code.fbi.h-da.de/danet/bio-rd/metrics/vrf/adapter/prom" log "github.com/sirupsen/logrus" ) diff --git a/metrics/grpc/clientmanager/adapter/prom/clientmanager_prom.go b/metrics/grpc/clientmanager/adapter/prom/clientmanager_prom.go index 7473284c123b16212339bcc1f75e352321435083..1dd437ac1e1a538563bcbcc4add4dd3d4de8061e 100644 --- a/metrics/grpc/clientmanager/adapter/prom/clientmanager_prom.go +++ b/metrics/grpc/clientmanager/adapter/prom/clientmanager_prom.go @@ -1,7 +1,7 @@ package prom import ( - "github.com/bio-routing/bio-rd/util/grpc/clientmanager" + "code.fbi.h-da.de/danet/bio-rd/util/grpc/clientmanager" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/ris-mirror/adapter/prom/ris_mirror_prom_adapter.go b/metrics/ris-mirror/adapter/prom/ris_mirror_prom_adapter.go index da40d8df8274eec72abdbaa2c15dc669fa020ea6..08e1942fd1e7c3b9dfd6a81c7baadc7aa936df8a 100644 --- a/metrics/ris-mirror/adapter/prom/ris_mirror_prom_adapter.go +++ b/metrics/ris-mirror/adapter/prom/ris_mirror_prom_adapter.go @@ -3,13 +3,13 @@ package prom import ( "fmt" - "github.com/bio-routing/bio-rd/cmd/ris-mirror/rismirror" - "github.com/bio-routing/bio-rd/cmd/ris-mirror/rismirror/metrics" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - "github.com/bio-routing/bio-rd/routingtable/vrf" + "code.fbi.h-da.de/danet/bio-rd/cmd/ris-mirror/rismirror" + "code.fbi.h-da.de/danet/bio-rd/cmd/ris-mirror/rismirror/metrics" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" "github.com/prometheus/client_golang/prometheus" - vrf_prom "github.com/bio-routing/bio-rd/metrics/vrf/adapter/prom" + vrf_prom "code.fbi.h-da.de/danet/bio-rd/metrics/vrf/adapter/prom" ) const ( diff --git a/metrics/vrf/adapter/prom/vrf_prom_adapter.go b/metrics/vrf/adapter/prom/vrf_prom_adapter.go index 0342801880d18a2cd21abf9c6c786ba13f6383e3..362a914fbac1ca92ffd2d32a79ee1bf02de9cfa4 100644 --- a/metrics/vrf/adapter/prom/vrf_prom_adapter.go +++ b/metrics/vrf/adapter/prom/vrf_prom_adapter.go @@ -3,8 +3,8 @@ package prom import ( "strconv" - "github.com/bio-routing/bio-rd/routingtable/vrf" - "github.com/bio-routing/bio-rd/routingtable/vrf/metrics" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/net/api/net.pb.go b/net/api/net.pb.go index 8a8230a69f4615d5a555ff6ec9eaa29ee4a2186e..8420d048cf164f51448f3645bf39af4a315ba8c8 100644 --- a/net/api/net.pb.go +++ b/net/api/net.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/bio-routing/bio-rd/net/api/net.proto +// source: code.fbi.h-da.de/danet/bio-rd/net/api/net.proto package api @@ -154,7 +154,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/bio-routing/bio-rd/net/api/net.proto", fileDescriptor_e879b68d7a71dcc0) + proto.RegisterFile("code.fbi.h-da.de/danet/bio-rd/net/api/net.proto", fileDescriptor_e879b68d7a71dcc0) } var fileDescriptor_e879b68d7a71dcc0 = []byte{ diff --git a/net/api/net.proto b/net/api/net.proto index cdc9767c23a53e19c99965ee554cf12ddb5ac5d8..ca435a4cf01ecb17e078ff3c36a8f21cd701edb7 100644 --- a/net/api/net.proto +++ b/net/api/net.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package bio.net; -option go_package = "github.com/bio-routing/bio-rd/net/api"; +option go_package = "code.fbi.h-da.de/danet/bio-rd/net/api"; message Prefix { IP address = 1; diff --git a/net/ip.go b/net/ip.go index 34721c723e563643a7806bc43994f1b57280bed0..7380d21ab33a6885d439e823c6a7f7ce3a222482 100644 --- a/net/ip.go +++ b/net/ip.go @@ -5,8 +5,8 @@ import ( "math" "net" - api "github.com/bio-routing/bio-rd/net/api" - bmath "github.com/bio-routing/bio-rd/util/math" + api "code.fbi.h-da.de/danet/bio-rd/net/api" + bmath "code.fbi.h-da.de/danet/bio-rd/util/math" ) // IP represents an IPv4 or IPv6 address diff --git a/net/ip_test.go b/net/ip_test.go index 5a646b7261d7b30f27dc24d451c9a4174855cd20..460eb3b5028d3735f3fd30df4ab5150514815ecd 100644 --- a/net/ip_test.go +++ b/net/ip_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/bio-routing/bio-rd/net/api" + "code.fbi.h-da.de/danet/bio-rd/net/api" "github.com/stretchr/testify/assert" ) diff --git a/net/prefix.go b/net/prefix.go index 978f8a080c0e9a6a68e7274f54885faf69c818cb..2eac485c12d5e22234b5915e71f5977d3baf0990 100644 --- a/net/prefix.go +++ b/net/prefix.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/bio-routing/bio-rd/net/api" + "code.fbi.h-da.de/danet/bio-rd/net/api" "github.com/pkg/errors" ) diff --git a/net/prefix_test.go b/net/prefix_test.go index 3a72b024299438739a3f1a887b62ead6a4e75fe7..3a2822e227ceac740336a57619f0a65db5815732 100644 --- a/net/prefix_test.go +++ b/net/prefix_test.go @@ -4,7 +4,7 @@ import ( gonet "net" "testing" - "github.com/bio-routing/bio-rd/net/api" + "code.fbi.h-da.de/danet/bio-rd/net/api" "github.com/stretchr/testify/assert" ) diff --git a/protocols/bgp/api/bgp.pb.go b/protocols/bgp/api/bgp.pb.go index 65de520e03c74ebf22d3a7e129710db1d4d5134e..8a061052d51ccfa110808b29292de56109dd5aa4 100644 --- a/protocols/bgp/api/bgp.pb.go +++ b/protocols/bgp/api/bgp.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/bio-routing/bio-rd/protocols/bgp/api/bgp.proto +// source: code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api/bgp.proto package api import ( context "context" fmt "fmt" - api "github.com/bio-routing/bio-rd/net/api" - api1 "github.com/bio-routing/bio-rd/route/api" + api "code.fbi.h-da.de/danet/bio-rd/net/api" + api1 "code.fbi.h-da.de/danet/bio-rd/route/api" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" math "math" @@ -212,7 +212,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/bio-routing/bio-rd/protocols/bgp/api/bgp.proto", fileDescriptor_2d4ce551e16bb738) + proto.RegisterFile("code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api/bgp.proto", fileDescriptor_2d4ce551e16bb738) } var fileDescriptor_2d4ce551e16bb738 = []byte{ @@ -433,5 +433,5 @@ var _BgpService_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, }, - Metadata: "github.com/bio-routing/bio-rd/protocols/bgp/api/bgp.proto", + Metadata: "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api/bgp.proto", } diff --git a/protocols/bgp/api/bgp.proto b/protocols/bgp/api/bgp.proto index 9a75b055974431154bc6c3b167a00f68cea3bf17..7f59444a340fb0c5b91dc3633eed9960bc17dc53 100644 --- a/protocols/bgp/api/bgp.proto +++ b/protocols/bgp/api/bgp.proto @@ -2,10 +2,10 @@ syntax = "proto3"; package bio.bgp; -import "github.com/bio-routing/bio-rd/net/api/net.proto"; -import "github.com/bio-routing/bio-rd/route/api/route.proto"; -import "github.com/bio-routing/bio-rd/protocols/bgp/api/session.proto"; -option go_package = "github.com/bio-routing/bio-rd/protocols/bgp/api"; +import "code.fbi.h-da.de/danet/bio-rd/net/api/net.proto"; +import "code.fbi.h-da.de/danet/bio-rd/route/api/route.proto"; +import "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api/session.proto"; +option go_package = "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api"; message ListSessionsRequest { SessionFilter filter = 1; diff --git a/protocols/bgp/api/session.pb.go b/protocols/bgp/api/session.pb.go index 0b693a07fc65b03830a2b342ff2fcf138a7073e7..9ecad4c62f237ed5bb8ba82ee1aa4391309ebd8e 100644 --- a/protocols/bgp/api/session.pb.go +++ b/protocols/bgp/api/session.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/bio-routing/bio-rd/protocols/bgp/api/session.proto +// source: code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api/session.proto package api import ( fmt "fmt" - api "github.com/bio-routing/bio-rd/net/api" + api "code.fbi.h-da.de/danet/bio-rd/net/api" proto "github.com/golang/protobuf/proto" math "math" ) @@ -242,7 +242,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/bio-routing/bio-rd/protocols/bgp/api/session.proto", fileDescriptor_5b53032c0bb76d75) + proto.RegisterFile("code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api/session.proto", fileDescriptor_5b53032c0bb76d75) } var fileDescriptor_5b53032c0bb76d75 = []byte{ diff --git a/protocols/bgp/api/session.proto b/protocols/bgp/api/session.proto index 9ca2f2d302c2bbbb114d96740ad6b14bf06f7bd6..2ac5e0484eed80cf7f67c965b6495b2b60809305 100644 --- a/protocols/bgp/api/session.proto +++ b/protocols/bgp/api/session.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package bio.bgp; -import "github.com/bio-routing/bio-rd/net/api/net.proto"; -option go_package = "github.com/bio-routing/bio-rd/protocols/bgp/api"; +import "code.fbi.h-da.de/danet/bio-rd/net/api/net.proto"; +option go_package = "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api"; message Session { bio.net.IP local_address = 1; diff --git a/protocols/bgp/metrics/bgp_peer_metrics.go b/protocols/bgp/metrics/bgp_peer_metrics.go index 8cad4d3aac2e3fb418c72a0b1baf7f1bac4d0adb..adf8a0d09faa302692116e6dd880cc6d0861c0ef 100644 --- a/protocols/bgp/metrics/bgp_peer_metrics.go +++ b/protocols/bgp/metrics/bgp_peer_metrics.go @@ -3,7 +3,7 @@ package metrics import ( "time" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) const ( diff --git a/protocols/bgp/metrics/bmp_metrics.go b/protocols/bgp/metrics/bmp_metrics.go index fcb73d5071c3e224a0b029f65c31e6b6e1732784..cebd4831d915fcccf50c3d903e3a6fb082a9bc95 100644 --- a/protocols/bgp/metrics/bmp_metrics.go +++ b/protocols/bgp/metrics/bmp_metrics.go @@ -3,7 +3,7 @@ package metrics import ( "net" - vrf_metrics "github.com/bio-routing/bio-rd/routingtable/vrf/metrics" + vrf_metrics "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf/metrics" ) // BMPMetrics contains per router BMP metrics diff --git a/protocols/bgp/packet/decoder.go b/protocols/bgp/packet/decoder.go index a9574bbb79f6aa9793a70495df73bda36714623c..998f5f70a2beb07229cb805421d79244e63a6997 100644 --- a/protocols/bgp/packet/decoder.go +++ b/protocols/bgp/packet/decoder.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/decode" "github.com/bio-routing/tflow2/convert" "github.com/pkg/errors" ) diff --git a/protocols/bgp/packet/decoder_test.go b/protocols/bgp/packet/decoder_test.go index 10b8f35203d8675d16c5b5b8bdccc50a75435175..63db0f1a855cb6a64a71cc74975abaa26732f8b4 100644 --- a/protocols/bgp/packet/decoder_test.go +++ b/protocols/bgp/packet/decoder_test.go @@ -6,9 +6,9 @@ import ( "strconv" "testing" - "github.com/bio-routing/bio-rd/net" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" "github.com/bio-routing/tflow2/convert" "github.com/stretchr/testify/assert" ) diff --git a/protocols/bgp/packet/helper.go b/protocols/bgp/packet/helper.go index cac7ec19abc92cb7aa6d418b5f03c54c1fde2c02..c94a7c86e5a7567a190dd8f60efcc39ab1f5dc1e 100644 --- a/protocols/bgp/packet/helper.go +++ b/protocols/bgp/packet/helper.go @@ -3,7 +3,7 @@ package packet import ( "fmt" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) func serializePrefix(pfx bnet.Prefix) []byte { diff --git a/protocols/bgp/packet/mp_reach_nlri.go b/protocols/bgp/packet/mp_reach_nlri.go index 5c2301fc0a7428dd2eb58dde913af3d13530cd1d..ca0c5c7f19a73fa5d12c30ba5823ec986e1377a5 100644 --- a/protocols/bgp/packet/mp_reach_nlri.go +++ b/protocols/bgp/packet/mp_reach_nlri.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/util/decode" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/util/decode" "github.com/bio-routing/tflow2/convert" "github.com/pkg/errors" ) diff --git a/protocols/bgp/packet/mp_reach_nlri_test.go b/protocols/bgp/packet/mp_reach_nlri_test.go index 81e6c5b4ff33bb96f11f33f029fb90e6dedbed08..7ffb03a6ef1079984b6e3906c98aaca436e05aaf 100644 --- a/protocols/bgp/packet/mp_reach_nlri_test.go +++ b/protocols/bgp/packet/mp_reach_nlri_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" "github.com/stretchr/testify/assert" ) diff --git a/protocols/bgp/packet/mp_unreach_nlri.go b/protocols/bgp/packet/mp_unreach_nlri.go index e9e887aed1005e09afdfdd2e68ca185524b58556..de05fe6c6d079939c6754ad90b3ae7acc1d4dae7 100644 --- a/protocols/bgp/packet/mp_unreach_nlri.go +++ b/protocols/bgp/packet/mp_unreach_nlri.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/decode" "github.com/bio-routing/tflow2/convert" ) diff --git a/protocols/bgp/packet/mp_unreach_nlri_test.go b/protocols/bgp/packet/mp_unreach_nlri_test.go index 246b55e64648af4170750bf1b15a18dd86bf2355..2f2c5932621a3dbda140b658964a0d02e4b223d2 100644 --- a/protocols/bgp/packet/mp_unreach_nlri_test.go +++ b/protocols/bgp/packet/mp_unreach_nlri_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" "github.com/stretchr/testify/assert" ) diff --git a/protocols/bgp/packet/nlri.go b/protocols/bgp/packet/nlri.go index 526ab712fdd85b360fad0891913a2b99129de848..8b0576c614bedf5c6d4d15e6defd24d9727d7dd5 100644 --- a/protocols/bgp/packet/nlri.go +++ b/protocols/bgp/packet/nlri.go @@ -5,8 +5,8 @@ import ( "fmt" "math" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/util/decode" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/util/decode" "github.com/bio-routing/tflow2/convert" "github.com/pkg/errors" ) diff --git a/protocols/bgp/packet/nlri_test.go b/protocols/bgp/packet/nlri_test.go index e59a4f62dc151cfc471f57cd41d5223d05872c5f..cbea0bc80975d3d8c936434eb7557298f97c9c54 100644 --- a/protocols/bgp/packet/nlri_test.go +++ b/protocols/bgp/packet/nlri_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" "github.com/stretchr/testify/assert" ) diff --git a/protocols/bgp/packet/path_attribute_flags.go b/protocols/bgp/packet/path_attribute_flags.go index 8c74b3c96a057ed6b45e476c2a15d9dee2769a8f..43fc69a7d8d78848b9876450c7145f4b35cc7c1e 100644 --- a/protocols/bgp/packet/path_attribute_flags.go +++ b/protocols/bgp/packet/path_attribute_flags.go @@ -3,7 +3,7 @@ package packet import ( "bytes" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/decode" ) func decodePathAttrFlags(buf *bytes.Buffer, pa *PathAttribute) error { diff --git a/protocols/bgp/packet/path_attributes.go b/protocols/bgp/packet/path_attributes.go index ee0c5d89329d571ed298e780f4824027c7876d1a..3c5254af198a1b57875159751e4d4389d9857c7b 100644 --- a/protocols/bgp/packet/path_attributes.go +++ b/protocols/bgp/packet/path_attributes.go @@ -5,10 +5,10 @@ import ( "fmt" "math" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/util/decode" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/util/decode" "github.com/bio-routing/tflow2/convert" "github.com/pkg/errors" ) diff --git a/protocols/bgp/packet/path_attributes_test.go b/protocols/bgp/packet/path_attributes_test.go index a9e684b30876a92088656ac8ebc381814b9ee42b..c42489631b96ff9323e33eb03fd86d5bd4dea6ee 100644 --- a/protocols/bgp/packet/path_attributes_test.go +++ b/protocols/bgp/packet/path_attributes_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" "github.com/stretchr/testify/assert" ) diff --git a/protocols/bgp/server/bgp_api.go b/protocols/bgp/server/bgp_api.go index 242c7fb02f76925232933705ab9fd7f1d62e4cd8..d2210465cd91466669e4d7358362673018576152 100644 --- a/protocols/bgp/server/bgp_api.go +++ b/protocols/bgp/server/bgp_api.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/bio-routing/bio-rd/protocols/bgp/api" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api" + "code.fbi.h-da.de/danet/bio-rd/route" - bnet "github.com/bio-routing/bio-rd/net" - routeapi "github.com/bio-routing/bio-rd/route/api" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + routeapi "code.fbi.h-da.de/danet/bio-rd/route/api" ) type BGPAPIServer struct { diff --git a/protocols/bgp/server/bgp_api_test.go b/protocols/bgp/server/bgp_api_test.go index 5ae69c0e94f9c95e850da90d0c9b09481c4d32a9..cd9565bbf02424bbb4de6b81fb2d90ada6f76486 100644 --- a/protocols/bgp/server/bgp_api_test.go +++ b/protocols/bgp/server/bgp_api_test.go @@ -7,20 +7,20 @@ import ( "testing" "time" - "github.com/bio-routing/bio-rd/protocols/bgp/api" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" - routeapi "github.com/bio-routing/bio-rd/route/api" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/adjRIBIn" - "github.com/bio-routing/bio-rd/routingtable/adjRIBOut" - "github.com/bio-routing/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" + routeapi "code.fbi.h-da.de/danet/bio-rd/route/api" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/adjRIBIn" + "code.fbi.h-da.de/danet/bio-rd/routingtable/adjRIBOut" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" "github.com/stretchr/testify/assert" "google.golang.org/grpc" "google.golang.org/grpc/test/bufconn" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) func TestDumpRIBInOut(t *testing.T) { diff --git a/protocols/bgp/server/bmp_metrics_service.go b/protocols/bgp/server/bmp_metrics_service.go index 2c068e8c44ba386d155c36d8efe288054441dc93..939e8220fb6fdef19e071d49d3ab1b480427c39c 100644 --- a/protocols/bgp/server/bmp_metrics_service.go +++ b/protocols/bgp/server/bmp_metrics_service.go @@ -3,10 +3,10 @@ package server import ( "sync/atomic" - "github.com/bio-routing/bio-rd/protocols/bgp/metrics" - bgp_metrics "github.com/bio-routing/bio-rd/protocols/bgp/metrics" - "github.com/bio-routing/bio-rd/routingtable/vrf" - vrf_metrics "github.com/bio-routing/bio-rd/routingtable/vrf/metrics" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/metrics" + bgp_metrics "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/metrics" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" + vrf_metrics "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf/metrics" ) type bmpMetricsService struct { diff --git a/protocols/bgp/server/bmp_router.go b/protocols/bgp/server/bmp_router.go index f4b9343d87a7cc48b906fbaf6d0399a968836791..bdf506b0147a0eeaee42ae61104a56c466ec1f90 100644 --- a/protocols/bgp/server/bmp_router.go +++ b/protocols/bgp/server/bmp_router.go @@ -11,12 +11,12 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - bmppkt "github.com/bio-routing/bio-rd/protocols/bmp/packet" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/filter" - "github.com/bio-routing/bio-rd/routingtable/vrf" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + bmppkt "code.fbi.h-da.de/danet/bio-rd/protocols/bmp/packet" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" "github.com/bio-routing/tflow2/convert" ) diff --git a/protocols/bgp/server/bmp_server.go b/protocols/bgp/server/bmp_server.go index 85caa197c2a6df0ca6cd9564dbefce86ad85c115..12fe62600406a6a765685854a267b7aa5f0fc99b 100644 --- a/protocols/bgp/server/bmp_server.go +++ b/protocols/bgp/server/bmp_server.go @@ -8,9 +8,9 @@ import ( "sync/atomic" "time" - "github.com/bio-routing/bio-rd/protocols/bgp/metrics" - bmppkt "github.com/bio-routing/bio-rd/protocols/bmp/packet" - "github.com/bio-routing/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/metrics" + bmppkt "code.fbi.h-da.de/danet/bio-rd/protocols/bmp/packet" + "code.fbi.h-da.de/danet/bio-rd/routingtable" "github.com/bio-routing/tflow2/convert" "github.com/pkg/errors" diff --git a/protocols/bgp/server/bmp_server_test.go b/protocols/bgp/server/bmp_server_test.go index 9ff9d124f327db36e40607e2c27c5baa58c582f7..ab951cf4d37bb9f8aae721fd20215e0133062816 100644 --- a/protocols/bgp/server/bmp_server_test.go +++ b/protocols/bgp/server/bmp_server_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) func TestBMPServer(t *testing.T) { diff --git a/protocols/bgp/server/fsm.go b/protocols/bgp/server/fsm.go index 18017bbbffb6760fd19333da49eadac164e5d409..f216ef31d0b6588c3d7a673fd6ebd2b5ebdcf697 100644 --- a/protocols/bgp/server/fsm.go +++ b/protocols/bgp/server/fsm.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/bio-routing/bio-rd/net/tcp" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - "github.com/bio-routing/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/net/tcp" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" "github.com/pkg/errors" log "github.com/sirupsen/logrus" ) diff --git a/protocols/bgp/server/fsm_address_family.go b/protocols/bgp/server/fsm_address_family.go index 102241ab93a868c7f1a89c1a68eaf43e6e829fef..6c9033c4943ab0d29e192ccbd4f11e5a2c62895d 100644 --- a/protocols/bgp/server/fsm_address_family.go +++ b/protocols/bgp/server/fsm_address_family.go @@ -3,15 +3,15 @@ package server import ( "time" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/adjRIBIn" - "github.com/bio-routing/bio-rd/routingtable/adjRIBOut" - "github.com/bio-routing/bio-rd/routingtable/filter" - "github.com/bio-routing/bio-rd/routingtable/locRIB" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/adjRIBIn" + "code.fbi.h-da.de/danet/bio-rd/routingtable/adjRIBOut" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/routingtable/locRIB" ) // fsmAddressFamily holds RIBs and the UpdateSender of an peer for an AFI/SAFI combination diff --git a/protocols/bgp/server/fsm_address_family_test.go b/protocols/bgp/server/fsm_address_family_test.go index 45b9412a52f41e3be4d03762cd1180b404489a0a..8357289b99f03be8faa0d1d2dc7cd90597e9883f 100644 --- a/protocols/bgp/server/fsm_address_family_test.go +++ b/protocols/bgp/server/fsm_address_family_test.go @@ -4,12 +4,12 @@ import ( "sync" "testing" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/filter" - "github.com/bio-routing/bio-rd/routingtable/locRIB" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/routingtable/locRIB" "github.com/stretchr/testify/assert" ) diff --git a/protocols/bgp/server/fsm_established.go b/protocols/bgp/server/fsm_established.go index c21ef2235d9e6cb7c20af95e27b5c5b50c44ac78..d282c35abaaaf5ac6a7a72b0e5e3c2fb7e1f95c5 100644 --- a/protocols/bgp/server/fsm_established.go +++ b/protocols/bgp/server/fsm_established.go @@ -7,10 +7,10 @@ import ( "sync/atomic" "time" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" "github.com/pkg/errors" log "github.com/sirupsen/logrus" ) diff --git a/protocols/bgp/server/fsm_open_confirm.go b/protocols/bgp/server/fsm_open_confirm.go index 26c32ace0700b1daf4b1c6b0f71ddb5169cb4592..24f898e87727a2e04a22bb66e082456a457888a4 100644 --- a/protocols/bgp/server/fsm_open_confirm.go +++ b/protocols/bgp/server/fsm_open_confirm.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" ) type openConfirmState struct { diff --git a/protocols/bgp/server/fsm_open_sent.go b/protocols/bgp/server/fsm_open_sent.go index 63b3689780306929a45f9705fac867d03e1b44a5..e6fb50f46e81762b8d3b4c91a08b1ec8bb037933 100644 --- a/protocols/bgp/server/fsm_open_sent.go +++ b/protocols/bgp/server/fsm_open_sent.go @@ -6,7 +6,7 @@ import ( "math" "time" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" ) type openSentState struct { diff --git a/protocols/bgp/server/fsm_open_sent_test.go b/protocols/bgp/server/fsm_open_sent_test.go index 128e7681f701e499eff5311ba08173a9cd3916c8..2539436d7f92d7241ae14f7c325f148de12e56ea 100644 --- a/protocols/bgp/server/fsm_open_sent_test.go +++ b/protocols/bgp/server/fsm_open_sent_test.go @@ -1,12 +1,12 @@ package server import ( - "github.com/bio-routing/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable" "net" "testing" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - btesting "github.com/bio-routing/bio-rd/testing" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + btesting "code.fbi.h-da.de/danet/bio-rd/testing" "github.com/stretchr/testify/assert" ) diff --git a/protocols/bgp/server/fsm_test.go b/protocols/bgp/server/fsm_test.go index 6dfc54ff97830ba06af67ef34de0cdd56f16c00c..ffbcc95248e7eda87e911679bc5219a7cf0cf30a 100644 --- a/protocols/bgp/server/fsm_test.go +++ b/protocols/bgp/server/fsm_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - "github.com/bio-routing/bio-rd/routingtable/filter" - "github.com/bio-routing/bio-rd/routingtable/locRIB" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/routingtable/locRIB" "github.com/stretchr/testify/assert" ) diff --git a/protocols/bgp/server/metrics_service.go b/protocols/bgp/server/metrics_service.go index 80c686872f0358b74315dbaeed327a3fd14761ba..93d10e9889bf52c7ebd2b473d3de17e7440733af 100644 --- a/protocols/bgp/server/metrics_service.go +++ b/protocols/bgp/server/metrics_service.go @@ -1,7 +1,7 @@ package server import ( - "github.com/bio-routing/bio-rd/protocols/bgp/metrics" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/metrics" ) type metricsService struct { diff --git a/protocols/bgp/server/metrics_service_test.go b/protocols/bgp/server/metrics_service_test.go index 625353c48a6a2ed3a575c39315ec84261d0eff19..01f202a20e568a5afe4775aa5d603adc7c263d1b 100644 --- a/protocols/bgp/server/metrics_service_test.go +++ b/protocols/bgp/server/metrics_service_test.go @@ -4,13 +4,13 @@ import ( "testing" "time" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/vrf" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" "github.com/stretchr/testify/assert" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/metrics" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/metrics" ) func TestMetrics(t *testing.T) { diff --git a/protocols/bgp/server/peer.go b/protocols/bgp/server/peer.go index 979e88a35e97fd8243e33a4bbb240c3f20725da9..06b85ec3235e47662f72751e7f48566186559915 100644 --- a/protocols/bgp/server/peer.go +++ b/protocols/bgp/server/peer.go @@ -5,14 +5,14 @@ import ( "sync" "time" - "github.com/bio-routing/bio-rd/routingtable/vrf" - - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/filter" - "github.com/bio-routing/bio-rd/routingtable/locRIB" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf" + + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/routingtable/locRIB" ) type peer struct { diff --git a/protocols/bgp/server/peer_manager.go b/protocols/bgp/server/peer_manager.go index 6faf71ec5e9e299dc37513d4fef3a0e0fb842c13..decc2bf14c4f06da69f06c783de25d0922a384ef 100644 --- a/protocols/bgp/server/peer_manager.go +++ b/protocols/bgp/server/peer_manager.go @@ -3,7 +3,7 @@ package server import ( "sync" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) type peerManager struct { diff --git a/protocols/bgp/server/peer_manager_test.go b/protocols/bgp/server/peer_manager_test.go index e0a09cd3bae3b2cb9394428a523032eee45a34be..02ccde327d12ec79886f6d5e1a01e352aa72f132 100644 --- a/protocols/bgp/server/peer_manager_test.go +++ b/protocols/bgp/server/peer_manager_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) func TestAdd(t *testing.T) { diff --git a/protocols/bgp/server/server.go b/protocols/bgp/server/server.go index bcfb9601df585c8fae3eed0b6d13303924f087a4..b2ea12235ab7949fdf7911780582f6691a90a640 100644 --- a/protocols/bgp/server/server.go +++ b/protocols/bgp/server/server.go @@ -4,14 +4,14 @@ import ( "fmt" "net" - "github.com/bio-routing/bio-rd/routingtable/adjRIBOut" - "github.com/bio-routing/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/routingtable/adjRIBOut" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" - "github.com/bio-routing/bio-rd/routingtable/adjRIBIn" + "code.fbi.h-da.de/danet/bio-rd/routingtable/adjRIBIn" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/metrics" - bnetutils "github.com/bio-routing/bio-rd/util/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/metrics" + bnetutils "code.fbi.h-da.de/danet/bio-rd/util/net" "github.com/pkg/errors" log "github.com/sirupsen/logrus" ) diff --git a/protocols/bgp/server/sockopt.go b/protocols/bgp/server/sockopt.go index 3f946735e62dfa56030e4ae14cf5190911a8a0b5..7a765aad472be17b7311f99bb76b5a7bd787c85e 100644 --- a/protocols/bgp/server/sockopt.go +++ b/protocols/bgp/server/sockopt.go @@ -3,7 +3,7 @@ package server import ( "net" - "github.com/bio-routing/bio-rd/net/tcp" + "code.fbi.h-da.de/danet/bio-rd/net/tcp" ) func setTTL(c net.Conn, ttl uint8) error { diff --git a/protocols/bgp/server/tcplistener.go b/protocols/bgp/server/tcplistener.go index 37c6173e70a81d7fe2886f5b660c2a8c6f2fc089..6f6ac120d00d7da579dd3db79da35730ced493c4 100644 --- a/protocols/bgp/server/tcplistener.go +++ b/protocols/bgp/server/tcplistener.go @@ -3,7 +3,7 @@ package server import ( "net" - "github.com/bio-routing/bio-rd/net/tcp" + "code.fbi.h-da.de/danet/bio-rd/net/tcp" log "github.com/sirupsen/logrus" ) diff --git a/protocols/bgp/server/update_helper.go b/protocols/bgp/server/update_helper.go index f8822dece7ab3b4390ec3e53cc698d8c65d3f37e..15043b2ecd8e6b2c491dd71678ac46c033d26f3f 100644 --- a/protocols/bgp/server/update_helper.go +++ b/protocols/bgp/server/update_helper.go @@ -3,7 +3,7 @@ package server import ( "io" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" "github.com/pkg/errors" log "github.com/sirupsen/logrus" diff --git a/protocols/bgp/server/update_helper_test.go b/protocols/bgp/server/update_helper_test.go index 858af85b0d27ef739263810e7308607aad18ccb3..71ccea2f1bce12d0e1c4170b43e4fda32e80824e 100644 --- a/protocols/bgp/server/update_helper_test.go +++ b/protocols/bgp/server/update_helper_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" "github.com/pkg/errors" "github.com/stretchr/testify/assert" ) diff --git a/protocols/bgp/server/update_sender.go b/protocols/bgp/server/update_sender.go index 86c7601dc70097b68b78784bfcdd794d9a2da9d6..1691809209f73365e9b05accc57864d7f7dd8b7d 100644 --- a/protocols/bgp/server/update_sender.go +++ b/protocols/bgp/server/update_sender.go @@ -8,12 +8,12 @@ import ( "sync/atomic" "time" - "github.com/bio-routing/bio-rd/net" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" log "github.com/sirupsen/logrus" ) diff --git a/protocols/bgp/server/update_sender_test.go b/protocols/bgp/server/update_sender_test.go index d2e438ccdc69e3db2798f86a11904dad9f9afe16..9ae89f31d57eb253a1dd720ac169fdc3e039651b 100644 --- a/protocols/bgp/server/update_sender_test.go +++ b/protocols/bgp/server/update_sender_test.go @@ -7,14 +7,14 @@ import ( "testing" "time" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/packet" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/filter" - "github.com/bio-routing/bio-rd/routingtable/locRIB" - btest "github.com/bio-routing/bio-rd/testing" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/packet" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/routingtable/locRIB" + btest "code.fbi.h-da.de/danet/bio-rd/testing" "github.com/stretchr/testify/assert" ) diff --git a/protocols/bgp/types/as_path.go b/protocols/bgp/types/as_path.go index 3f7ebe4a537ee6f83d75d4c6c8c214c615a02a3e..b197d105003051185a535eed87263b51e525d8fc 100644 --- a/protocols/bgp/types/as_path.go +++ b/protocols/bgp/types/as_path.go @@ -3,7 +3,7 @@ package types import ( "fmt" - "github.com/bio-routing/bio-rd/route/api" + "code.fbi.h-da.de/danet/bio-rd/route/api" ) // ASPath Segment Types diff --git a/protocols/bgp/types/large_community.go b/protocols/bgp/types/large_community.go index cbc5d18e71646e5ff586b7286c974e1643f82aae..a57ef835c3ad33409586c7349b2910a6140574d8 100644 --- a/protocols/bgp/types/large_community.go +++ b/protocols/bgp/types/large_community.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/bio-routing/bio-rd/route/api" + "code.fbi.h-da.de/danet/bio-rd/route/api" ) type LargeCommunities []LargeCommunity diff --git a/protocols/bgp/types/large_community_test.go b/protocols/bgp/types/large_community_test.go index d1f7bc2b16d9d4d00559318a4c4ae1428ffb6668..5b96d7caf904966aa791b8e7d8575075de4abb6f 100644 --- a/protocols/bgp/types/large_community_test.go +++ b/protocols/bgp/types/large_community_test.go @@ -9,7 +9,7 @@ import ( "strconv" - "github.com/bio-routing/bio-rd/route/api" + "code.fbi.h-da.de/danet/bio-rd/route/api" "github.com/stretchr/testify/assert" ) diff --git a/protocols/bgp/types/unknown_attribute.go b/protocols/bgp/types/unknown_attribute.go index 828cdc1e24c236ad75f9b27ce918db350d3f48c2..bd5f4fe11c1415a02275fddd2a8cea52b248ce67 100644 --- a/protocols/bgp/types/unknown_attribute.go +++ b/protocols/bgp/types/unknown_attribute.go @@ -1,7 +1,7 @@ package types import ( - "github.com/bio-routing/bio-rd/route/api" + "code.fbi.h-da.de/danet/bio-rd/route/api" ) // UnknownPathAttribute represents an unknown path attribute BIO does not support diff --git a/protocols/bmp/packet/common_header.go b/protocols/bmp/packet/common_header.go index b5b59f063d7c0902be87bf2000265ff12ca3a573..ec3d8a7adf93b0e2a954db4357b9efd58cf34c4c 100644 --- a/protocols/bmp/packet/common_header.go +++ b/protocols/bmp/packet/common_header.go @@ -3,7 +3,7 @@ package packet import ( "bytes" - "github.com/bio-routing/bio-rd/util/decoder" + "code.fbi.h-da.de/danet/bio-rd/util/decoder" "github.com/bio-routing/tflow2/convert" ) diff --git a/protocols/bmp/packet/information_tlv.go b/protocols/bmp/packet/information_tlv.go index f939729fa93387b00422385fd40fcc5d778f555f..858631d1766355536b44b16512fd65cbfc2a50f0 100644 --- a/protocols/bmp/packet/information_tlv.go +++ b/protocols/bmp/packet/information_tlv.go @@ -3,7 +3,7 @@ package packet import ( "bytes" - "github.com/bio-routing/bio-rd/util/decoder" + "code.fbi.h-da.de/danet/bio-rd/util/decoder" ) const ( diff --git a/protocols/bmp/packet/peer_down.go b/protocols/bmp/packet/peer_down.go index c81d46f905c94b33a24f5a8b3bdd69fc531cdb39..bbb83bd3a6ca5d5e9b3e702a33338a2f505bd510 100644 --- a/protocols/bmp/packet/peer_down.go +++ b/protocols/bmp/packet/peer_down.go @@ -3,7 +3,7 @@ package packet import ( "bytes" - "github.com/bio-routing/bio-rd/util/decoder" + "code.fbi.h-da.de/danet/bio-rd/util/decoder" "github.com/pkg/errors" ) diff --git a/protocols/bmp/packet/peer_up.go b/protocols/bmp/packet/peer_up.go index c0e4433745023143480a08deab80d74a3dfda63c..daec128b08689c0bc890e000d51425ffb14fb383 100644 --- a/protocols/bmp/packet/peer_up.go +++ b/protocols/bmp/packet/peer_up.go @@ -3,7 +3,7 @@ package packet import ( "bytes" - "github.com/bio-routing/bio-rd/util/decoder" + "code.fbi.h-da.de/danet/bio-rd/util/decoder" "github.com/pkg/errors" ) diff --git a/protocols/bmp/packet/per_peer_header.go b/protocols/bmp/packet/per_peer_header.go index 6fdfedbe3e15abbca30dd9f044d13b489febea62..853dce8eb31b6b4abf1b47d481d526cc2018134d 100644 --- a/protocols/bmp/packet/per_peer_header.go +++ b/protocols/bmp/packet/per_peer_header.go @@ -3,7 +3,7 @@ package packet import ( "bytes" - "github.com/bio-routing/bio-rd/util/decoder" + "code.fbi.h-da.de/danet/bio-rd/util/decoder" "github.com/bio-routing/tflow2/convert" ) diff --git a/protocols/bmp/packet/route_monitoring.go b/protocols/bmp/packet/route_monitoring.go index 8f69c64ce211fa1af382ec3b40c37cb465422eb5..7a80b68ffb9220e80b1022a90edce26f7a7ad8fd 100644 --- a/protocols/bmp/packet/route_monitoring.go +++ b/protocols/bmp/packet/route_monitoring.go @@ -3,7 +3,7 @@ package packet import ( "bytes" - "github.com/bio-routing/bio-rd/util/decoder" + "code.fbi.h-da.de/danet/bio-rd/util/decoder" "github.com/pkg/errors" ) diff --git a/protocols/bmp/packet/stats_report.go b/protocols/bmp/packet/stats_report.go index f9a9709cc055008d0baae2d91b971df1a91487af..7fd98dcfddbac5921326a119748ae508d385ac49 100644 --- a/protocols/bmp/packet/stats_report.go +++ b/protocols/bmp/packet/stats_report.go @@ -3,7 +3,7 @@ package packet import ( "bytes" - "github.com/bio-routing/bio-rd/util/decoder" + "code.fbi.h-da.de/danet/bio-rd/util/decoder" "github.com/pkg/errors" ) diff --git a/protocols/device/device.go b/protocols/device/device.go index 88512f6690280bd2d58f136d36eac5354968985e..3c3b2227e894b99ff7f0d6b8ccdd49bef8687199 100644 --- a/protocols/device/device.go +++ b/protocols/device/device.go @@ -4,7 +4,7 @@ import ( "net" "sync" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) const ( diff --git a/protocols/device/device_test.go b/protocols/device/device_test.go index 171506a6ed47f4391b00b353540cca44cbd16e9c..3eabdf044724d525fa0a35ec7b59061d68cd647f 100644 --- a/protocols/device/device_test.go +++ b/protocols/device/device_test.go @@ -3,7 +3,7 @@ package device import ( "testing" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" "github.com/stretchr/testify/assert" ) diff --git a/protocols/device/server_linux.go b/protocols/device/server_linux.go index 5fe3783a7fb0b685a5dc4375c892bd37602bb6d2..3f39fd5763e0b1cf9315b164eec959a5f06239a2 100644 --- a/protocols/device/server_linux.go +++ b/protocols/device/server_linux.go @@ -1,7 +1,7 @@ package device import ( - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" "github.com/pkg/errors" log "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" diff --git a/protocols/isis/packet/csnp.go b/protocols/isis/packet/csnp.go index 6e578a660b81f2d69517058f6a30f676a64a2e8b..616ee9b8c7cbccb55e9243cc88481a60dd871c35 100644 --- a/protocols/isis/packet/csnp.go +++ b/protocols/isis/packet/csnp.go @@ -6,9 +6,9 @@ import ( "math" "sort" - "github.com/bio-routing/bio-rd/protocols/isis/types" - "github.com/bio-routing/bio-rd/util/decode" - umath "github.com/bio-routing/bio-rd/util/math" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/util/decode" + umath "code.fbi.h-da.de/danet/bio-rd/util/math" "github.com/bio-routing/tflow2/convert" "github.com/pkg/errors" ) diff --git a/protocols/isis/packet/csnp_test.go b/protocols/isis/packet/csnp_test.go index a47761a4fbec8bb4e37fe6351ee4af6e165637f7..3f23cc27c1a2091ab18f704de42a2b4b00a6f1cd 100644 --- a/protocols/isis/packet/csnp_test.go +++ b/protocols/isis/packet/csnp_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/packet/header.go b/protocols/isis/packet/header.go index 475087eda962b7b06229f094c7d97926e3c8f331..25e5a7b810023bd2088d11c4bc677f140efc298e 100644 --- a/protocols/isis/packet/header.go +++ b/protocols/isis/packet/header.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/decode" ) const ( diff --git a/protocols/isis/packet/hello.go b/protocols/isis/packet/hello.go index 910042b2e66b1ece730edff86808b7fd27e2eb41..b0ccb8983d7c3b1f77462c3218428dfcaca5c155 100644 --- a/protocols/isis/packet/hello.go +++ b/protocols/isis/packet/hello.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/protocols/isis/types" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/util/decode" "github.com/bio-routing/tflow2/convert" ) diff --git a/protocols/isis/packet/hello_test.go b/protocols/isis/packet/hello_test.go index 2f3fa776bfd6ed3844a84620f3add4f06c849082..c63b810933918af7209d39f578f34f61895e6d13 100644 --- a/protocols/isis/packet/hello_test.go +++ b/protocols/isis/packet/hello_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/packet/isis_test.go b/protocols/isis/packet/isis_test.go index 31f8038a5a63f63664df2e9ff93db8f04bd26fba..8e0af1992b1817954c755445135a1aeb480320af 100644 --- a/protocols/isis/packet/isis_test.go +++ b/protocols/isis/packet/isis_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/packet/lsp.go b/protocols/isis/packet/lsp.go index 63a38a0db7874bc595d25686a39dc2fdb6434858..e438d75df406bb574fc9dc90a8b2c8f70bf40058 100644 --- a/protocols/isis/packet/lsp.go +++ b/protocols/isis/packet/lsp.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/protocols/isis/types" - "github.com/bio-routing/bio-rd/util/decode" - "github.com/bio-routing/bio-rd/util/math" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/math" "github.com/bio-routing/tflow2/convert" ) diff --git a/protocols/isis/packet/lsp_entry.go b/protocols/isis/packet/lsp_entry.go index f81df25cb93ee835bc61e74835e7db6b46cb0a41..3c8c0690b829a274581c569ec7c806e998f93c43 100644 --- a/protocols/isis/packet/lsp_entry.go +++ b/protocols/isis/packet/lsp_entry.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/decode" "github.com/bio-routing/tflow2/convert" ) diff --git a/protocols/isis/packet/lsp_test.go b/protocols/isis/packet/lsp_test.go index 3b125aafc5693ed7d319f5582a0cb5965bb5c6d6..8a4a42620669d36a7442d60c4bf4e193f4e529c5 100644 --- a/protocols/isis/packet/lsp_test.go +++ b/protocols/isis/packet/lsp_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/packet/psnp.go b/protocols/isis/packet/psnp.go index 6d25f07379895d30c7f7f27d26ed57bdc64518a2..08ab84b247b36e40e589101c93460e65ddaa3144 100644 --- a/protocols/isis/packet/psnp.go +++ b/protocols/isis/packet/psnp.go @@ -5,9 +5,9 @@ import ( "fmt" "math" - "github.com/bio-routing/bio-rd/protocols/isis/types" - "github.com/bio-routing/bio-rd/util/decode" - umath "github.com/bio-routing/bio-rd/util/math" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/util/decode" + umath "code.fbi.h-da.de/danet/bio-rd/util/math" "github.com/bio-routing/tflow2/convert" ) diff --git a/protocols/isis/packet/psnp_test.go b/protocols/isis/packet/psnp_test.go index 020032ff5070146efe9978b3ae6fbd61393bade7..18102cf830f463a50844634bd6b9da78ddc29e34 100644 --- a/protocols/isis/packet/psnp_test.go +++ b/protocols/isis/packet/psnp_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/packet/tlv.go b/protocols/isis/packet/tlv.go index 7a203d53f2350235597ab377ceff6c22fa5f3572..0bbc210948231ef883bf70a29751095fae64306b 100644 --- a/protocols/isis/packet/tlv.go +++ b/protocols/isis/packet/tlv.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/decode" "github.com/pkg/errors" ) diff --git a/protocols/isis/packet/tlv_area_addresses.go b/protocols/isis/packet/tlv_area_addresses.go index cb3ff01815bf970860e3b383b758ba380dcbd0e4..0a5a175740cbcc0ba324ac31cbc9b2e8a2327b3a 100644 --- a/protocols/isis/packet/tlv_area_addresses.go +++ b/protocols/isis/packet/tlv_area_addresses.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" ) // AreaAddressesTLVType is the type value of an area address TLV diff --git a/protocols/isis/packet/tlv_area_addresses_test.go b/protocols/isis/packet/tlv_area_addresses_test.go index 0962b4213faaa80253ad3031da3a582ceddd9f83..499578c104ae1cc498b29a3ba506813087c76bc1 100644 --- a/protocols/isis/packet/tlv_area_addresses_test.go +++ b/protocols/isis/packet/tlv_area_addresses_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/packet/tlv_checksum.go b/protocols/isis/packet/tlv_checksum.go index 3dfb509849874ba3beebb66c182c3706041f5983..b5903e87eea52d7fdc9513e85bd626dd2f202ad8 100644 --- a/protocols/isis/packet/tlv_checksum.go +++ b/protocols/isis/packet/tlv_checksum.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/decode" "github.com/bio-routing/tflow2/convert" ) diff --git a/protocols/isis/packet/tlv_dynamic_hostname.go b/protocols/isis/packet/tlv_dynamic_hostname.go index 1a2b74977718b3e9c99fc0bd6677956897b89bd6..86f74b2120135526748003fd905114287181923f 100644 --- a/protocols/isis/packet/tlv_dynamic_hostname.go +++ b/protocols/isis/packet/tlv_dynamic_hostname.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/decode" ) // DynamicHostNameTLVType is the type value of dynamic hostname TLV diff --git a/protocols/isis/packet/tlv_extended_ip_reachability.go b/protocols/isis/packet/tlv_extended_ip_reachability.go index 4da8ecb937499196037e73874fa1ad9bb0fdae55..d7c59a7721711e99e5366696a5b1605f5b17662b 100644 --- a/protocols/isis/packet/tlv_extended_ip_reachability.go +++ b/protocols/isis/packet/tlv_extended_ip_reachability.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/decode" "github.com/bio-routing/tflow2/convert" "github.com/pkg/errors" ) diff --git a/protocols/isis/packet/tlv_extended_is_reachability.go b/protocols/isis/packet/tlv_extended_is_reachability.go index 01bccd246238bda773865dd717a73e95d1c3d70d..0b4286045007b416d5b90eab64bd833bf26b923f 100644 --- a/protocols/isis/packet/tlv_extended_is_reachability.go +++ b/protocols/isis/packet/tlv_extended_is_reachability.go @@ -3,7 +3,7 @@ package packet import ( "bytes" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" "github.com/bio-routing/tflow2/convert" ) diff --git a/protocols/isis/packet/tlv_extended_is_reachability_test.go b/protocols/isis/packet/tlv_extended_is_reachability_test.go index ce6b754cfcda39d05848c89c6f4b4f21d57abcac..bf8a2440fc911c4fcf176a4dd651e45756033f49 100644 --- a/protocols/isis/packet/tlv_extended_is_reachability_test.go +++ b/protocols/isis/packet/tlv_extended_is_reachability_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/packet/tlv_ip_interface_addresses.go b/protocols/isis/packet/tlv_ip_interface_addresses.go index cabe7b4312ba8d8b1171c8bdcc5b632e01f50c7c..e2b18f87d2176026a7cc4892245b741cbc6a090d 100644 --- a/protocols/isis/packet/tlv_ip_interface_addresses.go +++ b/protocols/isis/packet/tlv_ip_interface_addresses.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/decode" "github.com/bio-routing/tflow2/convert" ) diff --git a/protocols/isis/packet/tlv_is_neighbors.go b/protocols/isis/packet/tlv_is_neighbors.go index 1296fee65da74f6dc3ca707521583bf83dee0253..1dcadb9332de99602c11de125a108a758101dade 100644 --- a/protocols/isis/packet/tlv_is_neighbors.go +++ b/protocols/isis/packet/tlv_is_neighbors.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/protocols/isis/types" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/util/decode" ) // ISNeighborsTLVType is the type value of an IS Neighbor TLV diff --git a/protocols/isis/packet/tlv_is_neighbors_test.go b/protocols/isis/packet/tlv_is_neighbors_test.go index fa238877b2e5781c0a606d8530b4b3b1c5d9ad3a..2e12e406e36837fda1da08ff83aa1c4c4150c326 100644 --- a/protocols/isis/packet/tlv_is_neighbors_test.go +++ b/protocols/isis/packet/tlv_is_neighbors_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/packet/tlv_lsp_entries_test.go b/protocols/isis/packet/tlv_lsp_entries_test.go index 7d3d73856898a8f9b27ea1675791d19b4e4bf793..4be24bbc8a3761625915ad9cf65596c3c242c717 100644 --- a/protocols/isis/packet/tlv_lsp_entries_test.go +++ b/protocols/isis/packet/tlv_lsp_entries_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/packet/tlv_p2p_adj_state.go b/protocols/isis/packet/tlv_p2p_adj_state.go index 42cde1a3fe0badcb3859a5f78d0772a13428bb27..874f56ac2a4dde74fc0dcbc1f25a3789a5773a66 100644 --- a/protocols/isis/packet/tlv_p2p_adj_state.go +++ b/protocols/isis/packet/tlv_p2p_adj_state.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/protocols/isis/types" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/util/decode" "github.com/bio-routing/tflow2/convert" ) diff --git a/protocols/isis/packet/tlv_p2p_adj_state_test.go b/protocols/isis/packet/tlv_p2p_adj_state_test.go index 609ab9b1d3da2b755c56178ef28e02969db8aeea..51cdae3f314541fc5da880557d11e3bd6c61da9a 100644 --- a/protocols/isis/packet/tlv_p2p_adj_state_test.go +++ b/protocols/isis/packet/tlv_p2p_adj_state_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/packet/tlv_protocols_supported.go b/protocols/isis/packet/tlv_protocols_supported.go index 648ee36a0e1589620fe9602e2d88476114771dfa..5d7d5e050b51d5cce104bc6cd4fd3d16787dd4e1 100644 --- a/protocols/isis/packet/tlv_protocols_supported.go +++ b/protocols/isis/packet/tlv_protocols_supported.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/decode" ) const ( diff --git a/protocols/isis/packet/tlv_traffic_engineering_router_id.go b/protocols/isis/packet/tlv_traffic_engineering_router_id.go index 0720607b586fe9b22a70990c1d945b571971ae3f..00c4a896dbdabe25b3146c7a44d4e206cb8a78a4 100644 --- a/protocols/isis/packet/tlv_traffic_engineering_router_id.go +++ b/protocols/isis/packet/tlv_traffic_engineering_router_id.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/bio-routing/bio-rd/util/decode" + "code.fbi.h-da.de/danet/bio-rd/util/decode" ) const ( diff --git a/protocols/isis/server/device.go b/protocols/isis/server/device.go index 1df586558224a7deca49aa3bd4692dadeef08181..f3324211acd658efe56d092ef2518807226747ee 100644 --- a/protocols/isis/server/device.go +++ b/protocols/isis/server/device.go @@ -4,9 +4,9 @@ import ( "fmt" "sync" - "github.com/bio-routing/bio-rd/config" - "github.com/bio-routing/bio-rd/protocols/device" - "github.com/bio-routing/bio-rd/protocols/isis/packet" + "code.fbi.h-da.de/danet/bio-rd/config" + "code.fbi.h-da.de/danet/bio-rd/protocols/device" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/packet" "github.com/pkg/errors" log "github.com/sirupsen/logrus" diff --git a/protocols/isis/server/device_test.go b/protocols/isis/server/device_test.go index 4b67c879f74d42623e46b5f76d0af49090cdf15d..e6e4f1f57bc9b8c2559c520ceae7d1e53ea4d08a 100644 --- a/protocols/isis/server/device_test.go +++ b/protocols/isis/server/device_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "github.com/bio-routing/bio-rd/protocols/device" + "code.fbi.h-da.de/danet/bio-rd/protocols/device" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/server/devices.go b/protocols/isis/server/devices.go index c0ec70dcc6d365f902b115e5907ba17ec6f53665..940393555ab5301d3c8f5cd7b89c5dca49354bde 100644 --- a/protocols/isis/server/devices.go +++ b/protocols/isis/server/devices.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/bio-routing/bio-rd/config" + "code.fbi.h-da.de/danet/bio-rd/config" "github.com/pkg/errors" ) diff --git a/protocols/isis/server/devices_test.go b/protocols/isis/server/devices_test.go index 0aaec1dabb680bbbf2df43f6b8f715a5f6e0b0f6..5663e2c3f7d34625d2815b98b5f540a74c23e4c0 100644 --- a/protocols/isis/server/devices_test.go +++ b/protocols/isis/server/devices_test.go @@ -3,8 +3,8 @@ package server import ( "testing" - "github.com/bio-routing/bio-rd/config" - "github.com/bio-routing/bio-rd/protocols/device" + "code.fbi.h-da.de/danet/bio-rd/config" + "code.fbi.h-da.de/danet/bio-rd/protocols/device" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/server/lsdb.go b/protocols/isis/server/lsdb.go index 0bf96060ae54b15e9eaceb4d6793196eb859bc86..558ccc03f0239a81174a2fc7939d50f5804143ad 100644 --- a/protocols/isis/server/lsdb.go +++ b/protocols/isis/server/lsdb.go @@ -3,8 +3,8 @@ package server import ( "sync" - "github.com/bio-routing/bio-rd/protocols/isis/packet" - btime "github.com/bio-routing/bio-rd/util/time" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/packet" + btime "code.fbi.h-da.de/danet/bio-rd/util/time" ) type lsdb struct { diff --git a/protocols/isis/server/lsdb_test.go b/protocols/isis/server/lsdb_test.go index 6c6c27aed5d2e5566a54e7b04904542f905b1b59..3f9ef83ed7639982d63fca30c4901d6d6547179a 100644 --- a/protocols/isis/server/lsdb_test.go +++ b/protocols/isis/server/lsdb_test.go @@ -3,9 +3,9 @@ package server import ( "testing" - "github.com/bio-routing/bio-rd/protocols/isis/packet" - "github.com/bio-routing/bio-rd/protocols/isis/types" - btime "github.com/bio-routing/bio-rd/util/time" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/packet" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" + btime "code.fbi.h-da.de/danet/bio-rd/util/time" "github.com/stretchr/testify/assert" ) diff --git a/protocols/isis/server/neighbor.go b/protocols/isis/server/neighbor.go index 62982b32d8938c80e4b978888fb80efb73a169ff..b3a86d859747cb178173a7ab4177d9edb4f1eaf0 100644 --- a/protocols/isis/server/neighbor.go +++ b/protocols/isis/server/neighbor.go @@ -1,6 +1,6 @@ package server -import "github.com/bio-routing/bio-rd/protocols/isis/types" +import "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" type neighbor struct { systemID types.SystemID diff --git a/protocols/isis/server/neighbors.go b/protocols/isis/server/neighbors.go index fcfb1549d2791cf744629f3ca01730db29ff1874..e21bc4baedf6c2819a3e7a4110c4703b0897b489 100644 --- a/protocols/isis/server/neighbors.go +++ b/protocols/isis/server/neighbors.go @@ -3,7 +3,7 @@ package server import ( "sync" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" ) type neighbors struct { diff --git a/protocols/isis/server/server.go b/protocols/isis/server/server.go index fbac57bec5300f634f09a40fe49639b3e9948f30..50e7417023d10cd608f6e4c382064eb0328dfda6 100644 --- a/protocols/isis/server/server.go +++ b/protocols/isis/server/server.go @@ -3,9 +3,9 @@ package server import ( "time" - "github.com/bio-routing/bio-rd/config" - "github.com/bio-routing/bio-rd/protocols/device" - btime "github.com/bio-routing/bio-rd/util/time" + "code.fbi.h-da.de/danet/bio-rd/config" + "code.fbi.h-da.de/danet/bio-rd/protocols/device" + btime "code.fbi.h-da.de/danet/bio-rd/util/time" ) //Server represents an ISIS server diff --git a/protocols/isis/server/sys.go b/protocols/isis/server/sys.go index 400542cf87a0f0efec827e1f711e2dc2ea482bb5..59ec781d077bdd4326f198442549a479980e662f 100644 --- a/protocols/isis/server/sys.go +++ b/protocols/isis/server/sys.go @@ -3,8 +3,8 @@ package server import ( "fmt" - "github.com/bio-routing/bio-rd/protocols/device" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/device" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" ) type sys interface { diff --git a/protocols/isis/server/sys_darwin.go b/protocols/isis/server/sys_darwin.go index eff533dd801c3ba378b7614c0bd3fc882a503dd1..5dbe2cf91bc03ee1c0040f19e4c47d0b63628b7c 100644 --- a/protocols/isis/server/sys_darwin.go +++ b/protocols/isis/server/sys_darwin.go @@ -3,7 +3,7 @@ package server import ( "fmt" - "github.com/bio-routing/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" ) func (b *bioSys) openPacketSocket() error { diff --git a/protocols/isis/server/sys_linux.go b/protocols/isis/server/sys_linux.go index bfe690cf6e036c459c324da9dbd74501f3027445..1220edc36f4a3c8e67cb754625a76fe079284c17 100644 --- a/protocols/isis/server/sys_linux.go +++ b/protocols/isis/server/sys_linux.go @@ -4,8 +4,8 @@ import ( "fmt" "syscall" - "github.com/bio-routing/bio-rd/protocols/isis/types" - "github.com/bio-routing/bio-rd/syscallwrappers" + "code.fbi.h-da.de/danet/bio-rd/protocols/isis/types" + "code.fbi.h-da.de/danet/bio-rd/syscallwrappers" ) func (b *bioSys) openPacketSocket() error { diff --git a/protocols/kernel/kernel.go b/protocols/kernel/kernel.go index ab2473d49133a431b9093c7486a59878f67eda1f..94824a5bd005619f46d29b8f2fdc25028d2efb51 100644 --- a/protocols/kernel/kernel.go +++ b/protocols/kernel/kernel.go @@ -1,10 +1,10 @@ package kernel import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" ) type Kernel struct { diff --git a/protocols/kernel/kernel_linux.go b/protocols/kernel/kernel_linux.go index ac4b49a352fe88c82a2807ffcb7f63a9602c4826..eae7e2dfe553c68954ba6eca176d4f6eae822aad 100644 --- a/protocols/kernel/kernel_linux.go +++ b/protocols/kernel/kernel_linux.go @@ -1,12 +1,12 @@ package kernel import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" "github.com/pkg/errors" "github.com/vishvananda/netlink" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) const ( diff --git a/protocols/ospf/packetv3/common.go b/protocols/ospf/packetv3/common.go new file mode 100644 index 0000000000000000000000000000000000000000..3171e93123f00ced5dc74cba08c6db768b43b022 --- /dev/null +++ b/protocols/ospf/packetv3/common.go @@ -0,0 +1,92 @@ +package packetv3 + +import ( + "bytes" + "encoding/binary" + + "code.fbi.h-da.de/danet/bio-rd/net" + "github.com/bio-routing/tflow2/convert" + "github.com/pkg/errors" +) + +// Serializable represents any packet which can be serialized +// to bytes to be on the wire +type Serializable interface { + Serialize(buf *bytes.Buffer) +} + +// ID is a common type used for 32-bit IDs in OSPF +type ID uint32 + +func DeserializeID(buf *bytes.Buffer) (ID, int, error) { + var id uint32 + if err := binary.Read(buf, binary.BigEndian, &id); err != nil { + return ID(id), 0, errors.Wrap(err, "unable to read ID from buffer") + } + return ID(id), 4, nil +} + +func (i ID) Serialize(buf *bytes.Buffer) { + buf.Write(convert.Uint32Byte(uint32(i))) +} + +// bitmasks for flags in RouterOptions +const ( + RouterOptV6 uint16 = 1 << iota + RouterOptE + _ + RouterOptN + RouterOptR + RouterOptDC + _ + _ + RouterOptAF +) + +type RouterOptions struct { + _ uint8 + Flags uint16 +} + +func OptionsFromFlags(flags ...uint16) RouterOptions { + opts := RouterOptions{Flags: 0} + for _, flag := range flags { + opts.Flags = opts.Flags | flag + } + return opts +} + +func (r RouterOptions) HasFlag(flag uint16) bool { + return r.Flags&flag != 0 +} + +func (r RouterOptions) SetFlag(flag uint16) RouterOptions { + return RouterOptions{ + Flags: r.Flags | flag, + } +} + +func (r *RouterOptions) Serialize(buf *bytes.Buffer) { + buf.WriteByte(0) + buf.Write(convert.Uint16Byte(uint16(r.Flags))) +} + +type deserializableIP struct { + Higher uint64 + Lower uint64 +} + +func (ip deserializableIP) ToNetIP() net.IP { + return net.IPv6(ip.Higher, ip.Lower) +} + +func serializeIPv6(ip net.IP, buf *bytes.Buffer) { + if ip.IsIPv4() { + for i := 0; i < 16; i++ { + buf.WriteByte(0) + } + return + } + + buf.Write(ip.Bytes()) +} diff --git a/protocols/ospf/packetv3/decode_test.go b/protocols/ospf/packetv3/decode_test.go new file mode 100644 index 0000000000000000000000000000000000000000..e3e06b1a56b7ed5f413185b26dfad133a3af1edd --- /dev/null +++ b/protocols/ospf/packetv3/decode_test.go @@ -0,0 +1,980 @@ +package packetv3_test + +import ( + "bytes" + "testing" + + "code.fbi.h-da.de/danet/bio-rd/net" + ospf "code.fbi.h-da.de/danet/bio-rd/protocols/ospf/packetv3" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +type decodeTest struct { + name string + input []byte + wantFail bool + expected *ospf.OSPFv3Message +} + +func runDecodeTest(t *testing.T, testCase decodeTest, src, dst net.IP) { + t.Run(testCase.name, func(t *testing.T) { + buf := bytes.NewBuffer(testCase.input) + msg, _, err := ospf.DeserializeOSPFv3Message(buf, src, dst) + if testCase.wantFail { + require.Error(t, err) + return + } + + require.NoError(t, err) + assert.Equal(t, testCase.expected, msg) + assert.Len(t, testCase.input, int(testCase.expected.PacketLength)) + }) +} + +func routerID(o1, o2, o3, o4 uint8) ospf.ID { + return ospf.ID(net.IPv4FromOctets(o1, o2, o3, o4).Ptr().ToUint32()) +} + +func TestDecodeHello(t *testing.T) { + tests := []decodeTest{ + { + name: "Default", + input: []byte{ + // Header + 3, // Version + 1, // Type: Hello + 0, 36, // Length + 3, 3, 3, 3, // Router ID + 0, 0, 0, 0, // Area ID + 0x94, 0x1c, // Checksum + 0, // Instance ID + 0, // Reserved + + // Payload (Hello) + 0, 0, 0, 6, // Interface ID + 100, // Router Prio + 0, // Reserved + 0, 0x13, // Options: R, E, V6 + 0, 30, // Hello Interval + 0, 120, // Dead Interval + 0, 0, 0, 0, // Designated Router + 0, 0, 0, 0, // Backup Designated Router + }, + expected: &ospf.OSPFv3Message{ + Version: 3, + Type: ospf.MsgTypeHello, + Checksum: 0x941c, + PacketLength: 36, + RouterID: routerID(3, 3, 3, 3), + AreaID: 0, + InstanceID: 0, + Body: &ospf.Hello{ + InterfaceID: 6, + RouterPriority: 100, + HelloInterval: 30, + RouterDeadInterval: 120, + Options: ospf.OptionsFromFlags(ospf.RouterOptR, ospf.RouterOptE, ospf.RouterOptV6), + }, + }, + }, + { + name: "InvalidLength", + input: []byte{ + // Header + 3, // Version + 1, // Type: Hello + 0, 38, // Length (invalid, expecting 36) + 3, 3, 3, 3, // Router ID + 0, 0, 0, 0, // Area ID + 0x94, 0x1a, // Checksum + 0, // Instance ID + 0, // Reserved + + // Payload (20 bytes) + 0, 0, 0, 6, 100, 0, 0, 0x13, 0, 30, 0, 120, 0, 0, 0, 0, 0, 0, 0, 0, + }, + wantFail: true, + }, + { + name: "InvalidChecksum", + input: []byte{ + // Header + 3, // Version + 1, // Type: Hello + 0, 36, // Length + 3, 3, 3, 3, // Router ID + 0, 0, 0, 0, // Area ID + 0x94, 0x1d, // Checksum (invalid) + 0, // Instance ID + 0, // Reserved + + // Payload (20 bytes) + 0, 0, 0, 6, 100, 0, 0, 0x13, 0, 30, 0, 120, 0, 0, 0, 0, 0, 0, 0, 0, + }, + wantFail: true, + }, + { + name: "WithNeighbors", + input: []byte{ + // Header + 3, // Version + 1, // Type: Hello + 0, 44, // Length + 3, 3, 3, 3, // Router ID + 0, 0, 0, 0, // Area ID + 0x8e, 0x06, // Checksum + 0, // Instance ID + 0, // Reserved + + // Payload (Hello) + 0, 0, 0, 6, // Interface ID + 100, // Router Prio + 0, // Reserved + 0, 0x13, // Options: R, E, V6 + 0, 30, // Hello Interval + 0, 120, // Dead Interval + 0, 0, 0, 0, // Designated Router + 0, 0, 0, 0, // Backup Designated Router + 1, 1, 1, 1, // Neighbor 1 + 2, 2, 2, 2, // Neighbor 2 + }, + expected: &ospf.OSPFv3Message{ + Version: 3, + Type: ospf.MsgTypeHello, + Checksum: 0x8e06, + PacketLength: 44, + RouterID: routerID(3, 3, 3, 3), + AreaID: 0, + InstanceID: 0, + Body: &ospf.Hello{ + InterfaceID: 6, + RouterPriority: 100, + HelloInterval: 30, + RouterDeadInterval: 120, + Options: ospf.OptionsFromFlags(ospf.RouterOptR, ospf.RouterOptE, ospf.RouterOptV6), + Neighbors: []ospf.ID{ + routerID(1, 1, 1, 1), + routerID(2, 2, 2, 2), + }, + }, + }, + }, + { + name: "WithDR", + input: []byte{ + // Header + 3, // Version + 1, // Type: Hello + 0, 44, // Length + 3, 3, 3, 3, // Router ID + 0, 0, 0, 0, // Area ID + 0x8c, 0x04, // Checksum + 0, // Instance ID + 0, // Reserved + + // Payload (Hello) + 0, 0, 0, 6, // Interface ID + 100, // Router Prio + 0, // Reserved + 0, 0x13, // Options: R, E, V6 + 0, 30, // Hello Interval + 0, 120, // Dead Interval + 1, 1, 1, 1, // Designated Router + 0, 0, 0, 0, // Backup Designated Router + 1, 1, 1, 1, // Neighbor 1 + 2, 2, 2, 2, // Neighbor 2 + }, + expected: &ospf.OSPFv3Message{ + Version: 3, + Type: ospf.MsgTypeHello, + Checksum: 0x8c04, + PacketLength: 44, + RouterID: routerID(3, 3, 3, 3), + AreaID: 0, + InstanceID: 0, + Body: &ospf.Hello{ + InterfaceID: 6, + RouterPriority: 100, + HelloInterval: 30, + RouterDeadInterval: 120, + Options: ospf.OptionsFromFlags(ospf.RouterOptR, ospf.RouterOptE, ospf.RouterOptV6), + DesignatedRouterID: routerID(1, 1, 1, 1), + Neighbors: []ospf.ID{ + routerID(1, 1, 1, 1), + routerID(2, 2, 2, 2), + }, + }, + }, + }, + { + name: "WithBDR", + input: []byte{ + // Header + 3, // Version + 1, // Type: Hello + 0, 44, // Length + 3, 3, 3, 3, // Router ID + 0, 0, 0, 0, // Area ID + 0x88, 0x00, // Checksum + 0, // Instance ID + 0, // Reserved + + // Payload (Hello) + 0, 0, 0, 6, // Interface ID + 100, // Router Prio + 0, // Reserved + 0, 0x13, // Options: R, E, V6 + 0, 30, // Hello Interval + 0, 120, // Dead Interval + 1, 1, 1, 1, // Designated Router + 2, 2, 2, 2, // Backup Designated Router + 1, 1, 1, 1, // Neighbor 1 + 2, 2, 2, 2, // Neighbor 2 + }, + expected: &ospf.OSPFv3Message{ + Version: 3, + Type: ospf.MsgTypeHello, + Checksum: 0x8800, + PacketLength: 44, + RouterID: routerID(3, 3, 3, 3), + AreaID: 0, + InstanceID: 0, + Body: &ospf.Hello{ + InterfaceID: 6, + RouterPriority: 100, + HelloInterval: 30, + RouterDeadInterval: 120, + Options: ospf.OptionsFromFlags(ospf.RouterOptR, ospf.RouterOptE, ospf.RouterOptV6), + DesignatedRouterID: routerID(1, 1, 1, 1), + BackupDesignatedRouterID: routerID(2, 2, 2, 2), + Neighbors: []ospf.ID{ + routerID(1, 1, 1, 1), + routerID(2, 2, 2, 2), + }, + }, + }, + }, + } + + src, err := net.IPFromString("fe80::3") + require.NoError(t, err) + dst, err := net.IPFromString("ff02::5") + require.NoError(t, err) + + for _, test := range tests { + runDecodeTest(t, test, src, dst) + } +} + +func TestDecodeDBDesc(t *testing.T) { + tests := []decodeTest{ + { + name: "Default", + input: []byte{ + // Header + 0x03, // Version + 0x02, // Type: Database Description + 0x00, 0x1c, // Length + 0x03, 0x03, 0x03, 0x03, // Router ID + 0x00, 0x00, 0x00, 0x00, // Area ID + 0xe7, 0xad, // Checksum + 0x00, // Instance ID + 0x00, // Reserved + + // Payload + 0x00, // Reserved + 0x00, 0x00, 0x13, // Options + 0x05, 0xdc, // MTU + 0x00, // Reserved + 0x07, // Description Flags + 0x00, 0x00, 0x0b, 0xbd, // Sequence Number + }, + expected: &ospf.OSPFv3Message{ + Version: 3, + Type: ospf.MsgTypeDatabaseDescription, + Checksum: 0xe7ad, + PacketLength: 28, + RouterID: routerID(3, 3, 3, 3), + AreaID: 0, + InstanceID: 0, + Body: &ospf.DatabaseDescription{ + Options: ospf.OptionsFromFlags(ospf.RouterOptR, ospf.RouterOptE, ospf.RouterOptV6), + InterfaceMTU: 1500, + DBFlags: ospf.DBFlagInit | ospf.DBFlagMore | ospf.DBFlagMS, + DDSequenceNumber: 3005, + }, + }, + }, + { + name: "WithLSAs", + input: []byte{ + // Header + 0x03, // Version + 0x02, // Type: Database Description + 0x00, 0xbc, // Length + 0x01, 0x01, 0x01, 0x01, // Router ID + 0x00, 0x00, 0x00, 0x00, // Area ID + 0xb6, 0xd0, // Checksum + 0x00, // Instance ID + 0x00, // Reserved + + // Payload + 0x00, // Reserved + 0x00, 0x00, 0x13, // Options + 0x05, 0xdc, // Link MTU + 0x00, // Reserved + 0x02, // Flags + 0x00, 0x00, 0x0b, 0xbd, // Seq Num + + // LSA Header + 0x00, 0x1d, + 0x20, 0x01, // Type: Router-LSA + 0x00, 0x00, 0x00, 0x00, // LS ID + 0x01, 0x01, 0x01, 0x01, // Router ID + 0x80, 0x00, 0x00, 0x12, // Seq Num + 0xb1, 0x4a, // Checksum + 0x00, 0x18, // Length + + // LSA Header + 0x01, 0xb4, + 0x20, 0x01, // Type: Router-LSA + 0x00, 0x00, 0x00, 0x00, + 0x02, 0x02, 0x02, 0x02, + 0x80, 0x00, 0x00, 0x0f, + 0x02, 0x8e, + 0x00, 0x28, + + // LSA Header: Network-LSA + 0x01, 0xdc, 0x20, 0x02, 0x00, 0x00, 0x00, 0x06, + 0x03, 0x03, 0x03, 0x03, 0x80, 0x00, 0x00, 0x02, + 0x6d, 0x6c, 0x00, 0x24, + + // LSA-Header: Inter-Area-Prefix-LSA + 0x00, 0x1e, 0x20, 0x03, 0x00, 0x00, 0x00, 0x05, + 0x01, 0x01, 0x01, 0x01, 0x80, 0x00, 0x00, 0x01, + 0xdb, 0x0f, 0x00, 0x24, + + // LSA-Header: Inter-Area-Prefix-LSA + 0x03, 0x2a, 0x20, 0x03, 0x00, 0x00, 0x00, 0x04, + 0x02, 0x02, 0x02, 0x02, 0x80, 0x00, 0x00, 0x01, + 0xc7, 0x20, 0x00, 0x24, + + // LSA-Header: Link-LSA + 0x00, 0x1d, 0x00, 0x08, 0x00, 0x00, 0x00, 0x06, + 0x01, 0x01, 0x01, 0x01, 0x80, 0x00, 0x00, 0x01, + 0x86, 0xd0, 0x00, 0x38, + + // LSA-Header: Intra-Area-Prefix-LSA + 0x00, 0x1d, 0x20, 0x09, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x01, 0x01, 0x01, 0x80, 0x00, 0x00, 0x01, + 0x74, 0x18, 0x00, 0x34, + + // LSA-Header: Unknown type + 0x00, 0x1d, + 0x20, 0x22, // Type: Unknown + 0x00, 0x00, 0x00, 0x00, + 0x01, 0x01, 0x01, 0x01, + 0x80, 0x00, 0x00, 0x01, + 0x74, 0x18, 0x00, 0x34, + }, + expected: &ospf.OSPFv3Message{ + Version: 3, + Type: ospf.MsgTypeDatabaseDescription, + Checksum: 0xb6d0, + PacketLength: 188, + RouterID: routerID(1, 1, 1, 1), + AreaID: 0, + InstanceID: 0, + Body: &ospf.DatabaseDescription{ + Options: ospf.OptionsFromFlags(ospf.RouterOptR, ospf.RouterOptE, ospf.RouterOptV6), + InterfaceMTU: 1500, + DBFlags: ospf.DBFlagMore, + DDSequenceNumber: 3005, + LSAHeaders: []*ospf.LSA{ + { + Type: ospf.LSATypeRouter, + Age: 29, + ID: 0, + AdvertisingRouter: routerID(1, 1, 1, 1), + SequenceNumber: 0x80000012, + Checksum: 0xb14a, + Length: 0x18, + }, + { + Type: ospf.LSATypeRouter, + Age: 436, + ID: 0, + AdvertisingRouter: routerID(2, 2, 2, 2), + SequenceNumber: 0x8000000f, + Checksum: 0x028e, + Length: 0x28, + }, + { + Type: ospf.LSATypeNetwork, + Age: 476, + ID: 6, + AdvertisingRouter: routerID(3, 3, 3, 3), + SequenceNumber: 0x80000002, + Checksum: 0x6d6c, + Length: 0x24, + }, + { + Type: ospf.LSATypeInterAreaPrefix, + Age: 30, + ID: 5, + AdvertisingRouter: routerID(1, 1, 1, 1), + SequenceNumber: 0x80000001, + Checksum: 0xdb0f, + Length: 0x24, + }, + { + Type: ospf.LSATypeInterAreaPrefix, + Age: 0x032a, + ID: 4, + AdvertisingRouter: routerID(2, 2, 2, 2), + SequenceNumber: 0x80000001, + Checksum: 0xc720, + Length: 0x24, + }, + { + Type: ospf.LSATypeLink, + Age: 0x001d, + ID: 6, + AdvertisingRouter: routerID(1, 1, 1, 1), + SequenceNumber: 0x80000001, + Checksum: 0x86d0, + Length: 0x38, + }, + { + Type: ospf.LSATypeIntraAreaPrefix, + Age: 0x001d, + ID: 0, + AdvertisingRouter: routerID(1, 1, 1, 1), + SequenceNumber: 0x80000001, + Checksum: 0x7418, + Length: 0x34, + }, + { + Type: 0x2022, // Unknown + Age: 0x001d, + ID: 0, + AdvertisingRouter: routerID(1, 1, 1, 1), + SequenceNumber: 0x80000001, + Checksum: 0x7418, + Length: 0x34, + }, + }, + }, + }, + }, + } + + src, err := net.IPFromString("fe80::3") + require.NoError(t, err) + dst, err := net.IPFromString("fe80::1") + require.NoError(t, err) + + for _, test := range tests { + runDecodeTest(t, test, src, dst) + } +} + +func TestDecodeLSRequest(t *testing.T) { + tests := []decodeTest{ + { + name: "Default", + input: []byte{ + // Header + 0x03, // Version + 0x03, // Type + 0x00, 0x34, // Length + 0x03, 0x03, 0x03, 0x03, // Router ID + 0x00, 0x00, 0x00, 0x00, // Area ID + 0x8b, 0x13, // Checksum + 0x00, // Instance ID + 0x00, // Reserved + + // LS Request + 0x00, 0x00, // Reserved + 0x20, 0x01, // Type + 0x00, 0x00, 0x00, 0x00, // Link State ID + 0x01, 0x01, 0x01, 0x01, // Advertising Router + + // LS Request + 0x00, 0x00, + 0x20, 0x02, + 0x00, 0x00, 0x00, 0x06, + 0x03, 0x03, 0x03, 0x03, + + // LS Request + 0x00, 0x00, + 0x20, 0x03, + 0x00, 0x00, 0x00, 0x02, + 0x03, 0x03, 0x03, 0x03, + }, + expected: &ospf.OSPFv3Message{ + Version: 3, + Type: ospf.MsgTypeLinkStateRequest, + Checksum: 0x8b13, + PacketLength: 52, + RouterID: routerID(3, 3, 3, 3), + AreaID: 0, + InstanceID: 0, + Body: ospf.LinkStateRequestMsg{ + { + LSType: ospf.LSATypeRouter, + LinkStateID: 0, + AdvertisingRouter: routerID(1, 1, 1, 1), + }, + { + LSType: ospf.LSATypeNetwork, + LinkStateID: 6, + AdvertisingRouter: routerID(3, 3, 3, 3), + }, + { + LSType: ospf.LSATypeInterAreaPrefix, + LinkStateID: 2, + AdvertisingRouter: routerID(3, 3, 3, 3), + }, + }, + }, + }, + } + + src, err := net.IPFromString("fe80::3") + require.NoError(t, err) + dst, err := net.IPFromString("fe80::1") + require.NoError(t, err) + + for _, test := range tests { + runDecodeTest(t, test, src, dst) + } +} + +func mustIP(ip net.IP, err error) net.IP { + if err != nil { + panic(err) + } + return ip +} + +func TestDecodeLSUpdate(t *testing.T) { + tests := []decodeTest{ + { + name: "Default", + input: []byte{ + // Header + 0x03, // Version + 0x04, // Type: LS Update + 0x00, 0xf0, // Length + 0x01, 0x01, 0x01, 0x01, // Router ID + 0x00, 0x00, 0x00, 0x00, // Area ID + 0xa6, 0x81, // Checksum + 0x00, // Instance ID + 0x00, // Reserved + + // Payload + 0x00, 0x00, 0x00, 0x05, // Num of Updates + + // Router LSA + 0x00, 0x01, // Age + 0x20, 0x01, // Type: Router + 0x00, 0x00, 0x00, 0x00, // Link State ID + 0x01, 0x01, 0x01, 0x01, // Router ID + 0x80, 0x00, 0x00, 0x13, // Seq Num + 0x11, 0x80, // Checksum + 0x00, 0x28, // Length + 0x01, // Flags + 0x00, 0x00, 0x33, // Options + // Interface #1 + 0x01, // Type: PTP + 0x00, // Reserved + 0x00, 0x40, // Metric + 0x00, 0x00, 0x00, 0x06, // Interface ID + 0x00, 0x00, 0x00, 0x06, // Neighbor Interface ID + 0x03, 0x03, 0x03, 0x03, // Neighbor Router ID + + // Inter-Area-Prefix LSA + 0x00, 0x24, // Age + 0x20, 0x03, // Type: Inter-Area-Prefix + 0x00, 0x00, 0x00, 0x05, // LS ID + 0x03, 0x03, 0x03, 0x03, // Router ID + 0x80, 0x00, 0x00, 0x01, // Seq Num + 0x06, 0xba, // Checksum + 0x00, 0x24, // Length + 0x00, // Reserved + 0x00, 0x00, 0x0a, // Metric + 0x40, // Prefix Length + 0x00, // Prefix Options + 0x00, 0x00, //Reserved + // Address + 0x20, 0x01, 0x0d, 0xb8, + 0x00, 0x00, 0x00, 0x34, + + // Link LSA + 0x00, 0x23, // Ags + 0x00, 0x08, // Type: Link + 0x00, 0x00, 0x00, 0x06, // LS ID + 0x03, 0x03, 0x03, 0x03, // Router ID + 0x80, 0x00, 0x00, 0x01, // Seq Num + 0xa0, 0x49, // Checksum + 0x00, 0x38, // Length + 0x64, // Router Priority + 0x00, 0x00, 0x33, // Options + // Link local addr + 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, + 0x00, 0x00, 0x00, 0x01, // Num prefixes + // LSA Prefix + 0x40, 0x00, 0x00, 0x00, // Len & Opts + 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, // Addr + + // Intra-Area-Prefix LSA + 0x00, 0x23, // Age + 0x20, 0x09, // Type: Intra Area Prefix + 0x00, 0x00, 0x00, 0x00, // LS ID + 0x03, 0x03, 0x03, 0x03, // Router ID + 0x80, 0x00, 0x00, 0x01, // Seq Num + 0xe0, 0x99, // Checksum + 0x00, 0x34, // Length + 0x00, 0x01, // Num prefixes + 0x20, 0x01, // Referenced type + 0x00, 0x00, 0x00, 0x00, // Referenced ID + 0x03, 0x03, 0x03, 0x03, // Referenced Router + 0x80, // Pfx Len + 0x02, // Pfx Opts + 0x00, 0x00, // Metric + // Pfx Addr + 0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, + + // Network LSA + 0x0e, 0x10, // Age + 0x20, 0x02, // Type: Network + 0x00, 0x00, 0x00, 0x06, // LS ID + 0x03, 0x03, 0x03, 0x03, // Router ID + 0x80, 0x00, 0x00, 0x03, // Seq Num + 0x6b, 0x6d, // Checksum + 0x00, 0x24, // Length + 0x00, // Reserved + 0x00, 0x00, 0x33, // Options + // Attached Routers + 0x03, 0x03, 0x03, 0x03, + 0x02, 0x02, 0x02, 0x02, + 0x01, 0x01, 0x01, 0x01, + }, + expected: &ospf.OSPFv3Message{ + Version: 3, + Type: ospf.MsgTypeLinkStateUpdate, + Checksum: 0xa681, + PacketLength: 240, + RouterID: routerID(1, 1, 1, 1), + AreaID: 0, + InstanceID: 0, + Body: ospf.LinkStateUpdate{ + { + Age: 1, + Type: ospf.LSATypeRouter, + ID: 0, + AdvertisingRouter: routerID(1, 1, 1, 1), + SequenceNumber: 0x80000013, + Checksum: 0x1180, + Length: 40, + Body: &ospf.RouterLSA{ + Flags: ospf.RouterLSAFlagsFrom(ospf.RouterLSAFlagBorder), + Options: ospf.OptionsFromFlags( + ospf.RouterOptDC, ospf.RouterOptR, ospf.RouterOptE, ospf.RouterOptV6, + ), + LinkDescriptions: []ospf.AreaLinkDescription{ + { + Type: ospf.ALDTypePTP, + Metric: 64, + InterfaceID: 6, + NeighborInterfaceID: 6, + NeighborRouterID: routerID(3, 3, 3, 3), + }, + }, + }, + }, + { + Age: 0x24, + Type: ospf.LSATypeInterAreaPrefix, + ID: 5, + AdvertisingRouter: routerID(3, 3, 3, 3), + SequenceNumber: 0x80000001, + Checksum: 0x06ba, + Length: 0x24, + Body: &ospf.InterAreaPrefixLSA{ + Metric: 10, + Prefix: ospf.LSAPrefix{ + PrefixLength: 64, + Options: ospf.PrefixOptions{}, + Address: mustIP(net.IPFromString("2001:db8:0:34::")), + }, + }, + }, + { + Age: 0x23, + Type: ospf.LSATypeLink, + ID: 6, + AdvertisingRouter: routerID(3, 3, 3, 3), + SequenceNumber: 0x80000001, + Checksum: 0xa049, + Length: 0x38, + Body: &ospf.LinkLSA{ + RouterPriority: 100, + Options: ospf.OptionsFromFlags( + ospf.RouterOptDC, ospf.RouterOptR, ospf.RouterOptE, ospf.RouterOptV6), + LinkLocalInterfaceAddress: mustIP(net.IPFromString("fe80::3")), + PrefixNum: 1, + Prefixes: []ospf.LSAPrefix{ + { + PrefixLength: 64, + Options: ospf.PrefixOptions{}, + Address: mustIP(net.IPFromString("2001:db8::")), + }, + }, + }, + }, + { + Age: 0x23, + Type: ospf.LSATypeIntraAreaPrefix, + ID: 0, + AdvertisingRouter: routerID(3, 3, 3, 3), + SequenceNumber: 0x80000001, + Checksum: 0xe099, + Length: 0x34, + Body: &ospf.IntraAreaPrefixLSA{ + ReferencedLSType: ospf.LSATypeRouter, + ReferencedLinkStateID: 0, + ReferencedAdvertisingRouter: routerID(3, 3, 3, 3), + Prefixes: []ospf.LSAPrefix{ + { + PrefixLength: 128, + Options: ospf.PrefixOptions{ + LocalAddress: true, + }, + Special: 0, // Metric + Address: mustIP(net.IPFromString("2001:db8::3")), + }, + }, + }, + }, + { + Age: 0xe10, + Type: ospf.LSATypeNetwork, + ID: 6, + AdvertisingRouter: routerID(3, 3, 3, 3), + SequenceNumber: 0x80000003, + Checksum: 0x6b6d, + Length: 0x24, + Body: &ospf.NetworkLSA{ + Options: ospf.OptionsFromFlags( + ospf.RouterOptDC, ospf.RouterOptR, ospf.RouterOptE, ospf.RouterOptV6), + AttachedRouter: []ospf.ID{ + routerID(3, 3, 3, 3), + routerID(2, 2, 2, 2), + routerID(1, 1, 1, 1), + }, + }, + }, + }, + }, + }, + } + + src, err := net.IPFromString("fe80::1") + require.NoError(t, err) + dst, err := net.IPFromString("fe80::3") + require.NoError(t, err) + + for _, test := range tests { + runDecodeTest(t, test, src, dst) + } +} + +func TestDecodeLSAck(t *testing.T) { + tests := []decodeTest{ + { + name: "Default", + input: []byte{ + // Header + 0x03, // Version + 0x05, // Type: LS Ack + 0x00, 0xc4, // Length + 0x03, 0x03, 0x03, 0x03, // Router ID + 0x00, 0x00, 0x00, 0x00, // Area ID + 0x8c, 0x8f, // Checksum + 0x00, // Instance ID + 0x00, // Reserved + + // LSA Type 1 + 0x00, 0x1e, // Age + 0x20, 0x01, // Type: Router-LSA + 0x00, 0x00, 0x00, 0x00, // LS ID + 0x01, 0x01, 0x01, 0x01, // Router ID + 0x80, 0x00, 0x00, 0x12, // Seq Num + 0xb1, 0x4a, // Checksum + 0x00, 0x18, // Length + + // LSA Type 2 + 0x01, 0xdd, 0x20, 0x02, + 0x00, 0x00, 0x00, 0x06, + 0x03, 0x03, 0x03, 0x03, + 0x80, 0x00, 0x00, 0x02, + 0x6d, 0x6c, 0x00, 0x24, + + // LSA Type 3 + 0x02, 0x54, 0x20, 0x03, + 0x00, 0x00, 0x00, 0x02, + 0x03, 0x03, 0x03, 0x03, + 0x80, 0x00, 0x00, 0x01, + 0xfc, 0xec, 0x00, 0x24, + + // LSA Type 3 + 0x02, 0x5e, 0x20, 0x03, + 0x00, 0x00, 0x00, 0x01, + 0x03, 0x03, 0x03, 0x03, + 0x80, 0x00, 0x00, 0x01, + 0x2e, 0x96, 0x00, 0x24, + + // LSA Type 3 + 0x02, 0x5e, 0x20, 0x03, + 0x00, 0x00, 0x00, 0x00, + 0x03, 0x03, 0x03, 0x03, + 0x80, 0x00, 0x00, 0x01, + 0xc2, 0x34, 0x00, 0x24, + + // LSA Type 3 + 0x00, 0x1f, 0x20, 0x03, + 0x00, 0x00, 0x00, 0x05, + 0x01, 0x01, 0x01, 0x01, + 0x80, 0x00, 0x00, 0x01, + 0xdb, 0x0f, 0x00, 0x24, + + // LSA Type 8 + 0x00, 0x1e, 0x00, 0x08, + 0x00, 0x00, 0x00, 0x06, + 0x01, 0x01, 0x01, 0x01, + 0x80, 0x00, 0x00, 0x01, + 0x86, 0xd0, 0x00, 0x38, + + // LSA Type 9 + 0x01, 0xdd, 0x20, 0x09, + 0x00, 0x00, 0x18, 0x00, + 0x03, 0x03, 0x03, 0x03, + 0x80, 0x00, 0x00, 0x02, + 0xbd, 0xe9, 0x00, 0x2c, + + // LSA Type 9 + 0x00, 0x1e, 0x20, 0x09, + 0x00, 0x00, 0x00, 0x00, + 0x01, 0x01, 0x01, 0x01, + 0x80, 0x00, 0x00, 0x01, + 0x74, 0x18, 0x00, 0x34, + }, + expected: &ospf.OSPFv3Message{ + Version: 3, + Type: ospf.MsgTypeLinkStateAcknowledgment, + PacketLength: 196, + RouterID: routerID(3, 3, 3, 3), + AreaID: 0, + Checksum: 0x8c8f, + InstanceID: 0, + Body: ospf.LinkStateAcknowledgement{ + { + Type: ospf.LSATypeRouter, + Age: 0x1e, + ID: 0, + AdvertisingRouter: routerID(1, 1, 1, 1), + SequenceNumber: 0x80000012, + Checksum: 0xb14a, + Length: 0x18, + }, + { + Type: ospf.LSATypeNetwork, + Age: 0x1dd, + ID: 6, + AdvertisingRouter: routerID(3, 3, 3, 3), + SequenceNumber: 0x80000002, + Checksum: 0x6d6c, + Length: 0x24, + }, + { + Type: ospf.LSATypeInterAreaPrefix, + Age: 0x254, + ID: 2, + AdvertisingRouter: routerID(3, 3, 3, 3), + SequenceNumber: 0x80000001, + Checksum: 0xfcec, + Length: 0x24, + }, + { + Type: ospf.LSATypeInterAreaPrefix, + Age: 0x25e, + ID: 1, + AdvertisingRouter: routerID(3, 3, 3, 3), + SequenceNumber: 0x80000001, + Checksum: 0x2e96, + Length: 0x24, + }, + { + Type: ospf.LSATypeInterAreaPrefix, + Age: 0x25e, + ID: 0, + AdvertisingRouter: routerID(3, 3, 3, 3), + SequenceNumber: 0x80000001, + Checksum: 0xc234, + Length: 0x24, + }, + { + Type: ospf.LSATypeInterAreaPrefix, + Age: 0x1f, + ID: 5, + AdvertisingRouter: routerID(1, 1, 1, 1), + SequenceNumber: 0x80000001, + Checksum: 0xdb0f, + Length: 0x24, + }, + { + Type: ospf.LSATypeLink, + Age: 0x1e, + ID: 6, + AdvertisingRouter: routerID(1, 1, 1, 1), + SequenceNumber: 0x80000001, + Checksum: 0x86d0, + Length: 0x38, + }, + { + Type: ospf.LSATypeIntraAreaPrefix, + Age: 0x1dd, + ID: 0x1800, + AdvertisingRouter: routerID(3, 3, 3, 3), + SequenceNumber: 0x80000002, + Checksum: 0xbde9, + Length: 0x2c, + }, + { + Type: ospf.LSATypeIntraAreaPrefix, + Age: 0x1e, + ID: 0, + AdvertisingRouter: routerID(1, 1, 1, 1), + SequenceNumber: 0x80000001, + Checksum: 0x7418, + Length: 0x34, + }, + }, + }, + }, + } + + src, err := net.IPFromString("fe80::3") + require.NoError(t, err) + dst, err := net.IPFromString("fe80::2") + require.NoError(t, err) + + for _, test := range tests { + runDecodeTest(t, test, src, dst) + } +} diff --git a/protocols/ospf/packetv3/encode_test.go b/protocols/ospf/packetv3/encode_test.go new file mode 100644 index 0000000000000000000000000000000000000000..6dcd31fbef1a6b12ecbdb32b8df2d310dbfbe7d0 --- /dev/null +++ b/protocols/ospf/packetv3/encode_test.go @@ -0,0 +1,165 @@ +package packetv3_test + +import ( + "bytes" + "testing" + + "code.fbi.h-da.de/danet/bio-rd/net" + ospf "code.fbi.h-da.de/danet/bio-rd/protocols/ospf/packetv3" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +type encodeTest struct { + name string + msg *ospf.OSPFv3Message + expected []byte +} + +func runEncodeTest(t *testing.T, testCase encodeTest, src, dst net.IP) { + t.Run(testCase.name, func(t *testing.T) { + out := new(bytes.Buffer) + testCase.msg.Serialize(out, src, dst) + assert.Equal(t, testCase.expected, out.Bytes()) + }) +} + +func TestEncodeHello(t *testing.T) { + tests := []encodeTest{ + { + name: "Init", + msg: &ospf.OSPFv3Message{ + Version: 3, + Type: ospf.MsgTypeHello, + RouterID: routerID(5, 5, 5, 5), + AreaID: 0, + InstanceID: 0, + Body: &ospf.Hello{ + InterfaceID: 4, + RouterPriority: 200, + Options: ospf.OptionsFromFlags(ospf.RouterOptR, ospf.RouterOptE, ospf.RouterOptV6), + HelloInterval: 20, + RouterDeadInterval: 60, + }, + }, + expected: []byte{ + 0x03, // Version + 0x01, // Type: Hello + 0x00, 0x24, // Length + 0x05, 0x05, 0x05, 0x05, // Router ID + 0x00, 0x00, 0x00, 0x00, // Area ID + 0xd0, 0x7a, // Checksum + 0x00, // Instance ID + 0x00, // Reserved + + // Payload + 0x00, 0x00, 0x00, 0x04, // Interface ID + 0xc8, // prio + 0x00, // reserved + 0x00, 0x13, // Options + 0x00, 0x14, // Hello Interval + 0x00, 0x3c, // Dead Interval + 0x00, 0x00, 0x00, 0x00, // DR + 0x00, 0x00, 0x00, 0x00, // BDR + }, + }, + { + name: "WithDR", + msg: &ospf.OSPFv3Message{ + Version: 3, + Type: ospf.MsgTypeHello, + RouterID: routerID(5, 5, 5, 5), + AreaID: 0, + InstanceID: 0, + Body: &ospf.Hello{ + InterfaceID: 4, + RouterPriority: 200, + Options: ospf.OptionsFromFlags(ospf.RouterOptR, ospf.RouterOptE, ospf.RouterOptV6), + HelloInterval: 20, + RouterDeadInterval: 60, + DesignatedRouterID: routerID(3, 3, 3, 3), + Neighbors: []ospf.ID{ + routerID(3, 3, 3, 3), + routerID(6, 6, 6, 6), + }, + }, + }, + expected: []byte{ + 0x03, // Version + 0x01, // Type: Hello + 0x00, 0x2c, // Length + 0x05, 0x05, 0x05, 0x05, // Router ID + 0x00, 0x00, 0x00, 0x00, // Area ID + 0xb8, 0x52, // Checksum + 0x00, // Instance ID + 0x00, // Reserved + + // Payload + 0x00, 0x00, 0x00, 0x04, // Interface ID + 0xc8, // prio + 0x00, // reserved + 0x00, 0x13, // Options + 0x00, 0x14, // Hello Interval + 0x00, 0x3c, // Dead Interval + 0x03, 0x03, 0x03, 0x03, // DR + 0x00, 0x00, 0x00, 0x00, // BDR + // Neighbors + 0x03, 0x03, 0x03, 0x03, + 0x06, 0x06, 0x06, 0x06, + }, + }, + { + name: "WithDRSelf", + msg: &ospf.OSPFv3Message{ + Version: 3, + Type: ospf.MsgTypeHello, + RouterID: routerID(5, 5, 5, 5), + AreaID: 0, + InstanceID: 0, + Body: &ospf.Hello{ + InterfaceID: 4, + RouterPriority: 200, + Options: ospf.OptionsFromFlags(ospf.RouterOptR, ospf.RouterOptE, ospf.RouterOptV6), + HelloInterval: 20, + RouterDeadInterval: 60, + DesignatedRouterID: routerID(5, 5, 5, 5), + BackupDesignatedRouterID: routerID(3, 3, 3, 3), + Neighbors: []ospf.ID{ + routerID(3, 3, 3, 3), + }, + }, + }, + expected: []byte{ + 0x03, // Version + 0x01, // Type: Hello + 0x00, 0x28, // Length + 0x05, 0x05, 0x05, 0x05, // Router ID + 0x00, 0x00, 0x00, 0x00, // Area ID + 0xba, 0x5c, // Checksum + 0x00, // Instance ID + 0x00, // Reserved + + // Payload + 0x00, 0x00, 0x00, 0x04, // Interface ID + 0xc8, // prio + 0x00, // reserved + 0x00, 0x13, // Options + 0x00, 0x14, // Hello Interval + 0x00, 0x3c, // Dead Interval + 0x05, 0x05, 0x05, 0x05, // DR + 0x03, 0x03, 0x03, 0x03, // BDR + // Neighbors + 0x03, 0x03, 0x03, 0x03, + }, + }, + } + + src, err := net.IPFromString("fe80::c92:6b3f:92b0:d49e") + require.NoError(t, err) + dst, err := net.IPFromString("fe80::acac:d4ff:fe15:fd8b") + require.NoError(t, err) + + for _, test := range tests { + runEncodeTest(t, test, src, dst) + } +} diff --git a/protocols/ospf/packetv3/fixtures/OSPFv3_NBMA_adjacencies.cap b/protocols/ospf/packetv3/fixtures/OSPFv3_NBMA_adjacencies.cap new file mode 100644 index 0000000000000000000000000000000000000000..7aa8fae0f5175f4fe00bdcad8942d575e299a5c5 Binary files /dev/null and b/protocols/ospf/packetv3/fixtures/OSPFv3_NBMA_adjacencies.cap differ diff --git a/protocols/ospf/packetv3/fixtures/OSPFv3_broadcast_adjacency.cap b/protocols/ospf/packetv3/fixtures/OSPFv3_broadcast_adjacency.cap new file mode 100644 index 0000000000000000000000000000000000000000..15cb2dd29a982eb5feb1918730386fe827294997 Binary files /dev/null and b/protocols/ospf/packetv3/fixtures/OSPFv3_broadcast_adjacency.cap differ diff --git a/protocols/ospf/packetv3/fixtures/OSPFv3_multipoint_adjacencies.cap b/protocols/ospf/packetv3/fixtures/OSPFv3_multipoint_adjacencies.cap new file mode 100644 index 0000000000000000000000000000000000000000..9ba769892d7bb3f079f9df8db85a9488484aae47 Binary files /dev/null and b/protocols/ospf/packetv3/fixtures/OSPFv3_multipoint_adjacencies.cap differ diff --git a/protocols/ospf/packetv3/fixtures/utils.go b/protocols/ospf/packetv3/fixtures/utils.go new file mode 100644 index 0000000000000000000000000000000000000000..8b8e644911040e5d054a358e92c8e3a651e91e47 --- /dev/null +++ b/protocols/ospf/packetv3/fixtures/utils.go @@ -0,0 +1,49 @@ +package fixtures + +import ( + "os" + "testing" + + "code.fbi.h-da.de/danet/bio-rd/net" + "github.com/google/gopacket" + "github.com/google/gopacket/layers" + "github.com/google/gopacket/pcapgo" +) + +func PacketReader(t *testing.T, path string) (*pcapgo.Reader, *os.File) { + f, err := os.Open(path) + if err != nil { + t.Error(err) + } + + r, err := pcapgo.NewReader(f) + if err != nil { + t.Error(err) + } + return r, f +} + +func Payload(raw []byte) (pl []byte, src, dst net.IP, err error) { + packet := gopacket.NewPacket(raw, layers.LayerTypeEthernet, gopacket.Default) + if perr := packet.ErrorLayer(); perr != nil { + // fallback to handling of FrameRelay (cut-off header) + packet = gopacket.NewPacket(raw[4:], layers.LayerTypeIPv6, gopacket.Default) + if perr = packet.ErrorLayer(); perr != nil { + err = perr.Error() + return + } + } + + flowSrc, flowDst := packet.NetworkLayer().NetworkFlow().Endpoints() + src, err = net.IPFromBytes(flowSrc.Raw()) + if err != nil { + return + } + dst, err = net.IPFromBytes(flowDst.Raw()) + if err != nil { + return + } + + pl = packet.NetworkLayer().LayerPayload() + return +} diff --git a/protocols/ospf/packetv3/lsa.go b/protocols/ospf/packetv3/lsa.go new file mode 100644 index 0000000000000000000000000000000000000000..c9f78c048fe8dffe0e4869e138df26cc79353785 --- /dev/null +++ b/protocols/ospf/packetv3/lsa.go @@ -0,0 +1,621 @@ +package packetv3 + +import ( + "bytes" + "encoding/binary" + "fmt" + + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/util/decode" + "github.com/bio-routing/tflow2/convert" + "github.com/pkg/errors" +) + +type LSAType uint16 + +func (t LSAType) Serialize(buf *bytes.Buffer) { + buf.Write(convert.Uint16Byte(uint16(t))) +} + +func (t LSAType) FloodIfUnknown() bool { + return t&(1<<15) != 0 // test for top bit +} + +type FloodingScope uint8 + +const ( + FloodLinkLocal FloodingScope = iota + FloodArea + FloodAS + FloodReserved +) + +func (t LSAType) FloodingScope() FloodingScope { + return FloodingScope((t & 0b0110000000000000) >> 13) // second and third bit as int +} + +// OSPF LSA types +const ( + LSATypeUnknown LSAType = 0 + LSATypeRouter = 0x2001 + LSATypeNetwork = 0x2002 + LSATypeInterAreaPrefix = 0x2003 + LSATypeInterAreaRouter = 0x2004 + LSATypeASExternal = 0x4005 + LSATypeDeprecated = 0x2006 + LSATypeNSSA = 0x2007 + LSATypeLink = 0x0008 + LSATypeIntraAreaPrefix = 0x2009 +) + +type LSA struct { + Age uint16 + Type LSAType + ID ID + AdvertisingRouter ID + SequenceNumber uint32 + Checksum uint16 + Length uint16 + Body Serializable +} + +const LSAHeaderLength = 20 + +func (x *LSA) SerializeHeader(buf *bytes.Buffer) { + buf.Write(convert.Uint16Byte(x.Age)) + x.Type.Serialize(buf) + x.ID.Serialize(buf) + x.AdvertisingRouter.Serialize(buf) + buf.Write(convert.Uint32Byte(x.SequenceNumber)) + buf.Write(convert.Uint16Byte(x.Checksum)) + buf.Write(convert.Uint16Byte(x.Length)) +} + +func (x *LSA) Serialize(buf *bytes.Buffer) { + x.SerializeHeader(buf) + x.Body.Serialize(buf) +} + +func DeserializeLSAHeader(buf *bytes.Buffer) (*LSA, int, error) { + pdu := &LSA{} + + var readBytes int + var err error + var fields []interface{} + + fields = []interface{}{ + &pdu.Age, + &pdu.Type, + &pdu.ID, + &pdu.AdvertisingRouter, + &pdu.SequenceNumber, + &pdu.Checksum, + &pdu.Length, + } + + err = decode.Decode(buf, fields) + if err != nil { + return nil, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + readBytes += 20 + + return pdu, readBytes, nil +} +func DeserializeLSA(buf *bytes.Buffer) (*LSA, int, error) { + pdu, readBytes, err := DeserializeLSAHeader(buf) + if err != nil { + return nil, 0, err + } + + n, err := pdu.ReadBody(buf) + if err != nil { + return nil, readBytes, errors.Wrap(err, "unable to decode LSA body") + } + readBytes += n + + return pdu, readBytes, nil +} + +func (x *LSA) ReadBody(buf *bytes.Buffer) (int, error) { + bodyLength := x.Length - LSAHeaderLength + var body Serializable + var readBytes int + var err error + + switch x.Type { + case LSATypeRouter: + body, readBytes, err = DeserializeRouterLSA(buf, bodyLength) + case LSATypeNetwork: + body, readBytes, err = DeserializeNetworkLSA(buf, bodyLength) + case LSATypeInterAreaPrefix: + body, readBytes, err = DeserializeInterAreaPrefixLSA(buf) + case LSATypeInterAreaRouter: + body, readBytes, err = DeserializeInterAreaRouterLSA(buf) + case LSATypeASExternal: + body, readBytes, err = DeserializeASExternalLSA(buf) + case LSATypeNSSA: // NSSA-LSA special case + body, readBytes, err = DeserializeASExternalLSA(buf) + case LSATypeLink: + body, readBytes, err = DeserializeLinkLSA(buf) + case LSATypeIntraAreaPrefix: + body, readBytes, err = DeserializeIntraAreaPrefixLSA(buf) + default: + raw := make(UnknownLSA, bodyLength) + readBytes, err = buf.Read(raw) + body = raw + } + + if err != nil { + return readBytes, err + } + + x.Body = body + return readBytes, nil +} + +type UnknownLSA []byte + +func (u UnknownLSA) Serialize(buf *bytes.Buffer) { + buf.Write(u) +} + +// helper for deserializing 24-bit metric values +type interfaceMetric struct { + High uint8 + Low uint16 +} + +// Value returns the numeric value of this metric field +func (m interfaceMetric) Value() uint32 { + return uint32(m.High)<<16 + uint32(m.Low) +} + +func serializeMetric(buf *bytes.Buffer, val uint32) { + metricBytes := convert.Uint32Byte(val) + buf.Write(metricBytes[1:4]) +} + +type AreaLinkDescriptionType uint8 + +const ( + _ AreaLinkDescriptionType = iota + ALDTypePTP + ALDTypeTransit + ALDTypeReserved + ALDTypeVirtualLink +) + +type AreaLinkDescription struct { + Type AreaLinkDescriptionType + Metric uint32 // max: 24 bit + InterfaceID ID + NeighborInterfaceID ID + NeighborRouterID ID +} + +func (x *AreaLinkDescription) Serialize(buf *bytes.Buffer) { + buf.WriteByte(uint8(x.Type)) + serializeMetric(buf, x.Metric) + x.InterfaceID.Serialize(buf) + x.NeighborInterfaceID.Serialize(buf) + x.NeighborRouterID.Serialize(buf) +} + +func DeserializeAreaLinkDescription(buf *bytes.Buffer) (AreaLinkDescription, int, error) { + pdu := AreaLinkDescription{} + + var readBytes int + var err error + var fields []interface{} + var metric interfaceMetric + + fields = []interface{}{ + &pdu.Type, + &metric, + &pdu.InterfaceID, + &pdu.NeighborInterfaceID, + &pdu.NeighborRouterID, + } + + err = decode.Decode(buf, fields) + if err != nil { + return pdu, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + readBytes += 16 + + pdu.Metric = metric.Value() + + return pdu, readBytes, nil +} + +type RouterLSAFlags uint8 + +const ( + RouterLSAFlagBorder RouterLSAFlags = 1 << iota + RouterLSAFlagExternal + RouterLSAFlagVirtualLink + _ + RouterLSAFlagNSSATranslation +) + +func RouterLSAFlagsFrom(flags ...RouterLSAFlags) RouterLSAFlags { + var val RouterLSAFlags + for _, flag := range flags { + val = val | flag + } + return val +} + +func (f RouterLSAFlags) HasFlag(flag uint8) bool { + return uint8(f)&flag != 0 +} + +func (f RouterLSAFlags) SetFlag(flag uint8) uint8 { + return uint8(f) | flag +} + +type RouterLSA struct { + Flags RouterLSAFlags + Options RouterOptions + LinkDescriptions []AreaLinkDescription +} + +func (x *RouterLSA) Serialize(buf *bytes.Buffer) { + buf.WriteByte(byte(x.Flags)) + x.Options.Serialize(buf) + for i := range x.LinkDescriptions { + x.LinkDescriptions[i].Serialize(buf) + } +} + +func DeserializeRouterLSA(buf *bytes.Buffer, bodyLength uint16) (*RouterLSA, int, error) { + pdu := &RouterLSA{} + + var readBytes int + var err error + var fields []interface{} + + fields = []interface{}{ + &pdu.Flags, + &pdu.Options, + } + + err = decode.Decode(buf, fields) + if err != nil { + return nil, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + readBytes += 4 + + for i := readBytes; i < int(bodyLength); { + tlv, n, err := DeserializeAreaLinkDescription(buf) + if err != nil { + return nil, readBytes, errors.Wrap(err, "unable to decode LinkDescription") + } + pdu.LinkDescriptions = append(pdu.LinkDescriptions, tlv) + i += n + readBytes += n + } + + return pdu, readBytes, nil +} + +type NetworkLSA struct { + Options RouterOptions + AttachedRouter []ID +} + +func (x *NetworkLSA) Serialize(buf *bytes.Buffer) { + buf.WriteByte(0) // 1 byte reserved + x.Options.Serialize(buf) + for i := range x.AttachedRouter { + x.AttachedRouter[i].Serialize(buf) + } +} + +func DeserializeNetworkLSA(buf *bytes.Buffer, bodyLength uint16) (*NetworkLSA, int, error) { + pdu := &NetworkLSA{} + + var readBytes int + var err error + var fields []interface{} + + fields = []interface{}{ + new(uint8), // 1 byte reserved + &pdu.Options, + } + + err = decode.Decode(buf, fields) + if err != nil { + return nil, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + readBytes += 4 + + for i := readBytes; i < int(bodyLength); { + tlv, n, err := DeserializeID(buf) + if err != nil { + return nil, 0, errors.Wrap(err, "Unable to decode AttachedRouterID") + } + pdu.AttachedRouter = append(pdu.AttachedRouter, tlv) + i += n + readBytes += n + } + + return pdu, readBytes, nil +} + +type InterAreaPrefixLSA struct { + Metric uint32 // max: 24 bit + Prefix LSAPrefix +} + +func (x *InterAreaPrefixLSA) Serialize(buf *bytes.Buffer) { + buf.WriteByte(0) // Reserved + serializeMetric(buf, x.Metric) + x.Prefix.Serialize(buf) +} + +func DeserializeInterAreaPrefixLSA(buf *bytes.Buffer) (*InterAreaPrefixLSA, int, error) { + pdu := &InterAreaPrefixLSA{} + var readBytes int + + // decode metric + _, _ = buf.ReadByte() // skip reserved byte + var metric interfaceMetric + if err := binary.Read(buf, binary.BigEndian, &metric); err != nil { + return nil, readBytes, errors.Wrap(err, "failed to read metric") + } + readBytes += 3 + pdu.Metric = metric.Value() + + pfx, n, err := DeserializeLSAPrefix(buf) + readBytes += n + if err != nil { + return nil, readBytes, errors.Wrap(err, "unable to decode prefix") + } + pdu.Prefix = pfx + + return pdu, readBytes, nil +} + +type InterAreaRouterLSA struct { + Options RouterOptions + Metric uint32 // max: 24 bit + DestinationRouterID ID +} + +func (x *InterAreaRouterLSA) Serialize(buf *bytes.Buffer) { + buf.WriteByte(0) // 1 byte reserved + x.Options.Serialize(buf) + buf.WriteByte(0) // 1 byte reserved + serializeMetric(buf, x.Metric) + x.DestinationRouterID.Serialize(buf) +} + +func DeserializeInterAreaRouterLSA(buf *bytes.Buffer) (*InterAreaRouterLSA, int, error) { + pdu := &InterAreaRouterLSA{} + + var readBytes int + var err error + var metric interfaceMetric + var fields []interface{} + + fields = []interface{}{ + new(uint8), // 1 byte reserved + &pdu.Options, + new(uint8), // 1 byte reserved + &metric, + &pdu.DestinationRouterID, + } + + err = decode.Decode(buf, fields) + if err != nil { + return nil, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + readBytes += 12 + + pdu.Metric = metric.Value() + + return pdu, readBytes, nil +} + +// Bitmasks for flags used in ASExternalLSA +const ( + ASExtLSAFlagT uint8 = 1 << iota + ASExtLSAFlagF + ASExtLSAFlagE +) + +type ASExternalLSA struct { + Flags uint8 + Metric uint32 // max: 24 bit + Prefix LSAPrefix + + ForwardingAddress net.IP // optional + ExternalRouteTag uint32 // optional + ReferencedLinkStateID ID // optional +} + +func (a *ASExternalLSA) FlagE() bool { + return (a.Flags & ASExtLSAFlagE) != 0 +} + +func (a *ASExternalLSA) FlagF() bool { + return (a.Flags & ASExtLSAFlagF) != 0 +} + +func (a *ASExternalLSA) FlagT() bool { + return (a.Flags & ASExtLSAFlagT) != 0 +} + +func (x *ASExternalLSA) Serialize(buf *bytes.Buffer) { + buf.WriteByte(x.Flags) + serializeMetric(buf, x.Metric) + x.Prefix.Serialize(buf) + if x.FlagF() { + serializeIPv6(x.ForwardingAddress, buf) + } + if x.FlagT() { + buf.Write(convert.Uint32Byte(x.ExternalRouteTag)) + } + if x.Prefix.Special != 0 { + x.ReferencedLinkStateID.Serialize(buf) + } +} + +func DeserializeASExternalLSA(buf *bytes.Buffer) (*ASExternalLSA, int, error) { + pdu := &ASExternalLSA{} + + var readBytes int + var err error + var fields []interface{} + var metric interfaceMetric + + fields = []interface{}{ + &pdu.Flags, + &metric, + } + + err = decode.Decode(buf, fields) + if err != nil { + return nil, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + readBytes += 4 + + pdu.Metric = metric.Value() + + pfx, n, err := DeserializeLSAPrefix(buf) + if err != nil { + return nil, readBytes, errors.Wrap(err, "unable to decode prefix") + } + pdu.Prefix = pfx + readBytes += n + + if pdu.FlagF() { + ip := deserializableIP{} + err := binary.Read(buf, binary.BigEndian, &ip) + if err != nil { + return nil, readBytes, errors.Wrap(err, "unable to decode ForwardingAddress") + } + pdu.ForwardingAddress = ip.ToNetIP() + readBytes += 16 + } + if pdu.FlagT() { + err := binary.Read(buf, binary.BigEndian, &pdu.ExternalRouteTag) + if err != nil { + return nil, readBytes, errors.Wrap(err, "unable to decode ExternalRouteTag") + } + readBytes += 4 + } + if pdu.Prefix.Special != 0 { + id, n, err := DeserializeID(buf) + if err != nil { + return nil, readBytes, errors.Wrap(err, "unable to decode ReferencedLinkStateID") + } + pdu.ReferencedLinkStateID = id + readBytes += n + } + + return pdu, readBytes, nil +} + +type LinkLSA struct { + RouterPriority uint8 + Options RouterOptions + LinkLocalInterfaceAddress net.IP + PrefixNum uint32 + Prefixes []LSAPrefix +} + +func (x *LinkLSA) Serialize(buf *bytes.Buffer) { + buf.WriteByte(x.RouterPriority) + x.Options.Serialize(buf) + serializeIPv6(x.LinkLocalInterfaceAddress, buf) + buf.Write(convert.Uint32Byte(x.PrefixNum)) + for i := range x.Prefixes { + x.Prefixes[i].Serialize(buf) + } +} + +func DeserializeLinkLSA(buf *bytes.Buffer) (*LinkLSA, int, error) { + pdu := &LinkLSA{} + + var readBytes int + var err error + var fields []interface{} + + llintfAddr := deserializableIP{} + fields = []interface{}{ + &pdu.RouterPriority, + &pdu.Options, + &llintfAddr, + &pdu.PrefixNum, + } + + err = decode.Decode(buf, fields) + if err != nil { + return nil, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + pdu.LinkLocalInterfaceAddress = llintfAddr.ToNetIP() + readBytes += 24 + + for i := 0; i < int(pdu.PrefixNum); i++ { + tlv, n, err := DeserializeLSAPrefix(buf) + if err != nil { + return nil, 0, errors.Wrap(err, "Unable to decode") + } + pdu.Prefixes = append(pdu.Prefixes, tlv) + readBytes += n + } + + return pdu, readBytes, nil +} + +type IntraAreaPrefixLSA struct { + ReferencedLSType LSAType + ReferencedLinkStateID ID + ReferencedAdvertisingRouter ID + Prefixes []LSAPrefix +} + +func (x *IntraAreaPrefixLSA) Serialize(buf *bytes.Buffer) { + buf.Write(convert.Uint16Byte(uint16(len(x.Prefixes)))) + x.ReferencedLSType.Serialize(buf) + x.ReferencedLinkStateID.Serialize(buf) + x.ReferencedAdvertisingRouter.Serialize(buf) + for i := range x.Prefixes { + x.Prefixes[i].Serialize(buf) + } +} + +func DeserializeIntraAreaPrefixLSA(buf *bytes.Buffer) (*IntraAreaPrefixLSA, int, error) { + pdu := &IntraAreaPrefixLSA{} + var prefixNum uint16 + + var readBytes int + var err error + var fields []interface{} + + fields = []interface{}{ + &prefixNum, + &pdu.ReferencedLSType, + &pdu.ReferencedLinkStateID, + &pdu.ReferencedAdvertisingRouter, + } + + err = decode.Decode(buf, fields) + if err != nil { + return nil, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + readBytes += 12 + + for i := 0; i < int(prefixNum); i++ { + tlv, n, err := DeserializeLSAPrefix(buf) + if err != nil { + return nil, 0, errors.Wrap(err, "Unable to decode") + } + pdu.Prefixes = append(pdu.Prefixes, tlv) + readBytes += n + } + + return pdu, readBytes, nil +} diff --git a/protocols/ospf/packetv3/lsa_prefix.go b/protocols/ospf/packetv3/lsa_prefix.go new file mode 100644 index 0000000000000000000000000000000000000000..a574ad8317b88e9367f78bb42f9001156187b251 --- /dev/null +++ b/protocols/ospf/packetv3/lsa_prefix.go @@ -0,0 +1,109 @@ +package packetv3 + +import ( + "bytes" + "fmt" + + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/util/decode" + "github.com/bio-routing/tflow2/convert" + "github.com/pkg/errors" +) + +// Prefix Option Bits +const ( + NUBIT = 1 + LABIT = 2 + PBIT = 8 + DNBIT = 16 +) + +type PrefixOptions struct { + NoUnicast bool // NU-bit + LocalAddress bool // LA-bit + Propagate bool // P-bit + DN bool // DN-bit +} + +func (o PrefixOptions) Serialize(buf *bytes.Buffer) { + var rawOptions uint8 + if o.NoUnicast { + rawOptions = rawOptions | NUBIT + } + if o.LocalAddress { + rawOptions = rawOptions | LABIT + } + if o.Propagate { + rawOptions = rawOptions | PBIT + } + if o.DN { + rawOptions = rawOptions | DNBIT + } + buf.WriteByte(rawOptions) +} + +type LSAPrefix struct { + PrefixLength uint8 + Options PrefixOptions + + // this may represent different things + // used for metric or referenced LSType + Special uint16 + + Address net.IP +} + +func (x *LSAPrefix) ToNetPrefix() net.Prefix { + return net.NewPfx(x.Address, x.PrefixLength) +} + +func DeserializeLSAPrefix(buf *bytes.Buffer) (LSAPrefix, int, error) { + pdu := LSAPrefix{} + + var readBytes int + var err error + + var rawOptions uint8 + + fields := []interface{}{ + &pdu.PrefixLength, + &rawOptions, + &pdu.Special, + } + + err = decode.Decode(buf, fields) + if err != nil { + return pdu, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + readBytes += 4 + + // read Options + pdu.Options.NoUnicast = (rawOptions & NUBIT) != 0 + pdu.Options.LocalAddress = (rawOptions & LABIT) != 0 + pdu.Options.Propagate = (rawOptions & PBIT) != 0 + pdu.Options.DN = (rawOptions & DNBIT) != 0 + + // read AddressPrefix + numBytes := int((pdu.PrefixLength+31)/32) * 4 + pfxBytes := buf.Next(numBytes) + ipBytes := make([]byte, 16) + copy(ipBytes[:len(pfxBytes)], pfxBytes) + addr, err := net.IPFromBytes(ipBytes) + if err != nil { + return pdu, readBytes, errors.Wrap(err, "unable to decode AddressPrefix") + } + pdu.Address = addr + readBytes += len(pfxBytes) + + return pdu, readBytes, nil +} + +func (x *LSAPrefix) Serialize(buf *bytes.Buffer) { + buf.WriteByte(x.PrefixLength) + x.Options.Serialize(buf) + buf.Write(convert.Uint16Byte(x.Special)) + + // serialize AddressPrefix + numBytes := int((x.PrefixLength+31)/32) * 4 + buf.Write(x.Address.Bytes()[:numBytes]) +} diff --git a/protocols/ospf/packetv3/lsa_test.go b/protocols/ospf/packetv3/lsa_test.go new file mode 100644 index 0000000000000000000000000000000000000000..7ecda2a06fdee901ed9824e7a670bd549ec5be87 --- /dev/null +++ b/protocols/ospf/packetv3/lsa_test.go @@ -0,0 +1,74 @@ +package packetv3_test + +import ( + "testing" + + ospf "code.fbi.h-da.de/danet/bio-rd/protocols/ospf/packetv3" + "github.com/stretchr/testify/assert" +) + +func TestLSATypeFlooding(t *testing.T) { + tests := []struct { + input ospf.LSAType + expectUnknownFlood bool + expectedFlooding ospf.FloodingScope + }{ + { + input: ospf.LSATypeRouter, + expectedFlooding: ospf.FloodArea, + }, + { + input: ospf.LSATypeNetwork, + expectedFlooding: ospf.FloodArea, + }, + { + input: ospf.LSATypeInterAreaPrefix, + expectedFlooding: ospf.FloodArea, + }, + { + input: ospf.LSATypeInterAreaRouter, + expectedFlooding: ospf.FloodArea, + }, + { + input: ospf.LSATypeASExternal, + expectedFlooding: ospf.FloodAS, + }, + { + input: ospf.LSATypeDeprecated, + expectedFlooding: ospf.FloodArea, + }, + { + input: ospf.LSATypeNSSA, + expectedFlooding: ospf.FloodArea, + }, + { + input: ospf.LSATypeLink, + expectedFlooding: ospf.FloodLinkLocal, + }, + { + input: ospf.LSATypeIntraAreaPrefix, + expectedFlooding: ospf.FloodArea, + }, + { + // Unknown with local scope + input: 0x0022, + expectUnknownFlood: false, + }, + { + // Unknown with flooding scope + input: 0xa022, + expectUnknownFlood: true, + expectedFlooding: ospf.FloodArea, + }, + { + // Unknown with reserved flooding scope + input: 0x6022, + expectedFlooding: ospf.FloodReserved, + }, + } + + for _, test := range tests { + assert.Equal(t, test.expectedFlooding, test.input.FloodingScope()) + assert.Equal(t, test.expectUnknownFlood, test.input.FloodIfUnknown()) + } +} diff --git a/protocols/ospf/packetv3/packet.go b/protocols/ospf/packetv3/packet.go new file mode 100644 index 0000000000000000000000000000000000000000..a7acb0cd6d212531781a811125c32aac0a4df092 --- /dev/null +++ b/protocols/ospf/packetv3/packet.go @@ -0,0 +1,389 @@ +package packetv3 + +import ( + "bytes" + "encoding/binary" + "fmt" + + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/util/checksum" + "code.fbi.h-da.de/danet/bio-rd/util/decode" + "github.com/bio-routing/tflow2/convert" + "github.com/pkg/errors" +) + +const OSPFProtocolNumber = 89 +const expectedVersion = 3 + +type OSPFMessageType uint8 + +// OSPF message types +const ( + MsgTypeUnknown OSPFMessageType = iota + MsgTypeHello + MsgTypeDatabaseDescription + MsgTypeLinkStateRequest + MsgTypeLinkStateUpdate + MsgTypeLinkStateAcknowledgment +) + +type OSPFv3Message struct { + Version uint8 + Type OSPFMessageType + PacketLength uint16 + RouterID ID + AreaID ID + Checksum uint16 + InstanceID uint8 + Body Serializable +} + +const OSPFv3MessageHeaderLength = 16 +const OSPFv3MessagePacketLengthAtByte = 2 +const OSPFv3MessageChecksumAtByte = 12 + +func (x *OSPFv3Message) Serialize(out *bytes.Buffer, src, dst net.IP) { + buf := bytes.NewBuffer(nil) + + buf.WriteByte(x.Version) + buf.WriteByte(uint8(x.Type)) + buf.Write(convert.Uint16Byte(x.PacketLength)) + x.RouterID.Serialize(buf) + x.AreaID.Serialize(buf) + buf.Write(convert.Uint16Byte(x.Checksum)) + buf.WriteByte(x.InstanceID) + buf.WriteByte(0) // 1 byte reserved + x.Body.Serialize(buf) + + data := buf.Bytes() + + length := uint16(len(data)) + putUint16(data, OSPFv3MessagePacketLengthAtByte, length) + + checksum := OSPFv3Checksum(data, src, dst) + putUint16(data, OSPFv3MessageChecksumAtByte, checksum) + + out.Write(data) +} + +func putUint16(b []byte, p int, v uint16) { + binary.BigEndian.PutUint16(b[p:p+2], v) +} + +func DeserializeOSPFv3Message(buf *bytes.Buffer, src, dst net.IP) (*OSPFv3Message, int, error) { + pdu := &OSPFv3Message{} + data := buf.Bytes() + + var readBytes int + var err error + var fields []interface{} + + fields = []interface{}{ + &pdu.Version, + &pdu.Type, + &pdu.PacketLength, + &pdu.RouterID, + &pdu.AreaID, + &pdu.Checksum, + &pdu.InstanceID, + new(uint8), // 1 byte reserved + } + + err = decode.Decode(buf, fields) + if err != nil { + return nil, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + readBytes += 16 + + if pdu.Version != expectedVersion { + return nil, readBytes, fmt.Errorf("Invalid OSPF version: %d", pdu.Version) + } + + expectedChecksum := OSPFv3Checksum(data, src, dst) + if pdu.Checksum != expectedChecksum { + return nil, readBytes, fmt.Errorf("Checksum mismatch. Expected %#04x, got %#04x", expectedChecksum, pdu.Checksum) + } + + n, err := pdu.ReadBody(buf) + if err != nil { + return nil, readBytes, errors.Wrap(err, "unable to decode message body") + } + readBytes += n + + return pdu, readBytes, nil +} + +func OSPFv3Checksum(data []byte, src, dst net.IP) uint16 { + data[12] = 0 + data[13] = 0 + return checksum.IPv6UpperLayerChecksum(src, dst, OSPFProtocolNumber, data) +} + +func (m *OSPFv3Message) ReadBody(buf *bytes.Buffer) (int, error) { + bodyLength := m.PacketLength - OSPFv3MessageHeaderLength + var body Serializable + var readBytes int + var err error + + switch m.Type { + case MsgTypeHello: + body, readBytes, err = DeserializeHello(buf, bodyLength) + case MsgTypeDatabaseDescription: + body, readBytes, err = DeserializeDatabaseDescription(buf, bodyLength) + case MsgTypeLinkStateRequest: + body, readBytes, err = DeserializeLinkStateRequestMsg(buf, bodyLength) + case MsgTypeLinkStateUpdate: + body, readBytes, err = DeserializeLinkStateUpdate(buf) + case MsgTypeLinkStateAcknowledgment: + body, readBytes, err = DeserializeLinkStateAcknowledgement(buf, bodyLength) + default: + return 0, fmt.Errorf("unknown message type: %d", m.Type) + } + + if err != nil { + return 0, err + } + + m.Body = body + return readBytes, nil +} + +type Hello struct { + InterfaceID ID + RouterPriority uint8 + Options RouterOptions + HelloInterval uint16 + RouterDeadInterval uint16 + DesignatedRouterID ID + BackupDesignatedRouterID ID + Neighbors []ID +} + +func (x *Hello) Serialize(buf *bytes.Buffer) { + x.InterfaceID.Serialize(buf) + buf.WriteByte(x.RouterPriority) + x.Options.Serialize(buf) + buf.Write(convert.Uint16Byte(x.HelloInterval)) + buf.Write(convert.Uint16Byte(x.RouterDeadInterval)) + x.DesignatedRouterID.Serialize(buf) + x.BackupDesignatedRouterID.Serialize(buf) + for i := range x.Neighbors { + x.Neighbors[i].Serialize(buf) + } +} + +func DeserializeHello(buf *bytes.Buffer, bodyLength uint16) (*Hello, int, error) { + pdu := &Hello{} + + var readBytes int + var err error + var fields []interface{} + + fields = []interface{}{ + &pdu.InterfaceID, + &pdu.RouterPriority, + &pdu.Options, + &pdu.HelloInterval, + &pdu.RouterDeadInterval, + &pdu.DesignatedRouterID, + &pdu.BackupDesignatedRouterID, + } + + err = decode.Decode(buf, fields) + if err != nil { + return nil, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + readBytes += 20 + + for i := readBytes; i < int(bodyLength); { + id, n, err := DeserializeID(buf) + if err != nil { + return nil, readBytes, errors.Wrap(err, "unable to decode neighbor id") + } + pdu.Neighbors = append(pdu.Neighbors, id) + i += n + readBytes += n + } + + return pdu, readBytes, nil +} + +type DBFlags uint8 + +// database description flags +const ( + DBFlagInit DBFlags = 1 << iota + DBFlagMore + DBFlagMS +) + +type DatabaseDescription struct { + Options RouterOptions + InterfaceMTU uint16 + DBFlags DBFlags + DDSequenceNumber uint32 + LSAHeaders []*LSA +} + +func (x *DatabaseDescription) Serialize(buf *bytes.Buffer) { + buf.WriteByte(0) // 1 byte reserved + x.Options.Serialize(buf) + buf.Write(convert.Uint16Byte(x.InterfaceMTU)) + buf.WriteByte(0) // 1 byte reserved + buf.WriteByte(uint8(x.DBFlags)) + buf.Write(convert.Uint32Byte(x.DDSequenceNumber)) + for i := range x.LSAHeaders { + x.LSAHeaders[i].SerializeHeader(buf) + } +} + +func DeserializeDatabaseDescription(buf *bytes.Buffer, bodyLength uint16) (*DatabaseDescription, int, error) { + pdu := &DatabaseDescription{} + + var readBytes int + var err error + var fields []interface{} + + fields = []interface{}{ + new(uint8), + &pdu.Options, + &pdu.InterfaceMTU, + new(uint8), + &pdu.DBFlags, + &pdu.DDSequenceNumber, + } + + err = decode.Decode(buf, fields) + if err != nil { + return nil, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + readBytes += 12 + + for i := readBytes; i < int(bodyLength); { + tlv, n, err := DeserializeLSAHeader(buf) + if err != nil { + return nil, 0, errors.Wrap(err, "Unable to decode") + } + pdu.LSAHeaders = append(pdu.LSAHeaders, tlv) + i += n + readBytes += n + } + + return pdu, readBytes, nil +} + +type LinkStateRequestMsg []LinkStateRequest + +func (x LinkStateRequestMsg) Serialize(buf *bytes.Buffer) { + for i := range x { + x[i].Serialize(buf) + } +} + +func DeserializeLinkStateRequestMsg(buf *bytes.Buffer, bodyLength uint16) (LinkStateRequestMsg, int, error) { + reqs := make(LinkStateRequestMsg, 0) + + var readBytes int + for readBytes < int(bodyLength) { + req, n, err := DeserializeLinkStateRequest(buf) + if err != nil { + return nil, readBytes, errors.Wrap(err, "unable to decode LinkStateRequest") + } + reqs = append(reqs, req) + readBytes += n + } + + return reqs, readBytes, nil +} + +type LinkStateRequest struct { + LSType LSAType + LinkStateID ID + AdvertisingRouter ID +} + +func (x *LinkStateRequest) Serialize(buf *bytes.Buffer) { + buf.Write([]byte{0, 0}) // 2 bytes reserved + x.LSType.Serialize(buf) + x.LinkStateID.Serialize(buf) + x.AdvertisingRouter.Serialize(buf) +} + +func DeserializeLinkStateRequest(buf *bytes.Buffer) (LinkStateRequest, int, error) { + pdu := LinkStateRequest{} + + var readBytes int + var err error + var fields []interface{} + + fields = []interface{}{ + new(uint16), // 2 bytes reserved + &pdu.LSType, + &pdu.LinkStateID, + &pdu.AdvertisingRouter, + } + + err = decode.Decode(buf, fields) + if err != nil { + return pdu, readBytes, fmt.Errorf("Unable to decode fields: %v", err) + } + readBytes += 12 + + return pdu, readBytes, nil +} + +type LinkStateUpdate []*LSA + +func (x LinkStateUpdate) Serialize(buf *bytes.Buffer) { + buf.Write(convert.Uint32Byte(uint32(len(x)))) + for i := range x { + x[i].Serialize(buf) + } +} + +func DeserializeLinkStateUpdate(buf *bytes.Buffer) (LinkStateUpdate, int, error) { + lsas := make(LinkStateUpdate, 0) + + var lsaCount uint32 + if err := binary.Read(buf, binary.BigEndian, &lsaCount); err != nil { + return nil, 0, errors.Wrap(err, "unable to decode LSA count") + } + readBytes := 4 + + for i := 0; i < int(lsaCount); i++ { + tlv, n, err := DeserializeLSA(buf) + if err != nil { + return nil, 0, errors.Wrap(err, "unable to decode LSA") + } + lsas = append(lsas, tlv) + readBytes += n + } + + return lsas, readBytes, nil +} + +type LinkStateAcknowledgement []*LSA + +func (x LinkStateAcknowledgement) Serialize(buf *bytes.Buffer) { + for i := range x { + x[i].SerializeHeader(buf) + } +} + +func DeserializeLinkStateAcknowledgement(buf *bytes.Buffer, bodyLength uint16) (LinkStateAcknowledgement, int, error) { + lsas := make(LinkStateAcknowledgement, 0) + + var readBytes int + + for i := 0; i < int(bodyLength); { + tlv, n, err := DeserializeLSAHeader(buf) + if err != nil { + return nil, 0, errors.Wrap(err, "Unable to decode") + } + lsas = append(lsas, tlv) + i += n + readBytes += n + } + + return lsas, readBytes, nil +} diff --git a/protocols/ospf/packetv3/smoke_test.go b/protocols/ospf/packetv3/smoke_test.go new file mode 100644 index 0000000000000000000000000000000000000000..9d9db9abdd98622ff9c20da5b277fae53072457d --- /dev/null +++ b/protocols/ospf/packetv3/smoke_test.go @@ -0,0 +1,68 @@ +package packetv3_test + +import ( + "bytes" + "fmt" + "io" + "os" + "testing" + + ospf "code.fbi.h-da.de/danet/bio-rd/protocols/ospf/packetv3" + "code.fbi.h-da.de/danet/bio-rd/protocols/ospf/packetv3/fixtures" +) + +var files = []string{ + "OSPFv3_multipoint_adjacencies.cap", + "OSPFv3_broadcast_adjacency.cap", + "OSPFv3_NBMA_adjacencies.cap", +} + +var dir string + +func init() { + cwd, err := os.Getwd() + if err != nil { + panic(err) + } + dir = cwd + "/fixtures/" +} + +func TestDecodeDumps(t *testing.T) { + for _, path := range files { + t.Run(path, func(t *testing.T) { + testDecodeFile(t, dir+path) + }) + } +} + +func testDecodeFile(t *testing.T, path string) { + fmt.Printf("Testing on file: %s\n", path) + r, f := fixtures.PacketReader(t, path) + defer f.Close() + + var packetCount int + for { + data, _, err := r.ReadPacketData() + if err == io.EOF { + break + } + if err != nil { + t.Error(err) + return + } + + t.Run(fmt.Sprintf("Packet_%03d", packetCount+1), func(t *testing.T) { + payload, src, dst, err := fixtures.Payload(data) + if err != nil { + t.Error(err) + return + } + + buf := bytes.NewBuffer(payload) + if _, _, err := ospf.DeserializeOSPFv3Message(buf, src, dst); err != nil { + t.Error(err) + } + }) + packetCount++ + } +} diff --git a/regenerate_proto.sh b/regenerate_proto.sh index 451c45e40c013ed13885a0b4358616aad41bc638..1d7906ceb641814751147aeb6fe918d25e902bed 100755 --- a/regenerate_proto.sh +++ b/regenerate_proto.sh @@ -3,9 +3,9 @@ dir=$(pwd) echo "Switching to GOPATH" cd "$GOPATH/src" echo "Generating protobuf code" -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 -protoc --go_out=plugins=grpc:. github.com/bio-routing/bio-rd/cmd/ris/api/*.proto +protoc --go_out=plugins=grpc:. code.fbi.h-da.de/danet/bio-rd/net/api/*.proto +protoc --go_out=plugins=grpc:. code.fbi.h-da.de/danet/bio-rd/route/api/*.proto +protoc --go_out=plugins=grpc:. code.fbi.h-da.de/danet/bio-rd/protocols/bgp/api/*.proto +protoc --go_out=plugins=grpc:. code.fbi.h-da.de/danet/bio-rd/cmd/ris/api/*.proto echo "Switching back to working directory" cd $dir diff --git a/risclient/risclient.go b/risclient/risclient.go index 14ae89f41996448d18b2d4c634f920a31f7a917b..7845dd8b46304f7e0e87570a097fa1ffcd074381 100644 --- a/risclient/risclient.go +++ b/risclient/risclient.go @@ -5,8 +5,8 @@ import ( "io" "sync" - risapi "github.com/bio-routing/bio-rd/cmd/ris/api" - routeapi "github.com/bio-routing/bio-rd/route/api" + risapi "code.fbi.h-da.de/danet/bio-rd/cmd/ris/api" + routeapi "code.fbi.h-da.de/danet/bio-rd/route/api" "google.golang.org/grpc" log "github.com/sirupsen/logrus" diff --git a/route/api/route.pb.go b/route/api/route.pb.go index 6d49bf74efdbfd5eee4d3b766a4d26bab5f4a2c2..a80b03c8105cb8c2c2c69f84ec9a817e21050fae 100644 --- a/route/api/route.pb.go +++ b/route/api/route.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/bio-routing/bio-rd/route/api/route.proto +// source: code.fbi.h-da.de/danet/bio-rd/route/api/route.proto package api import ( fmt "fmt" - api "github.com/bio-routing/bio-rd/net/api" + api "code.fbi.h-da.de/danet/bio-rd/net/api" proto "github.com/golang/protobuf/proto" math "math" ) @@ -515,7 +515,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/bio-routing/bio-rd/route/api/route.proto", fileDescriptor_00363871266b6b0e) + proto.RegisterFile("code.fbi.h-da.de/danet/bio-rd/route/api/route.proto", fileDescriptor_00363871266b6b0e) } var fileDescriptor_00363871266b6b0e = []byte{ diff --git a/route/api/route.proto b/route/api/route.proto index e856f22ece1fc56ed8ab080b3189143849718af7..d18ea495bc7d81ff345713f8fb2c69469da9754e 100644 --- a/route/api/route.proto +++ b/route/api/route.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package bio.route; -import "github.com/bio-routing/bio-rd/net/api/net.proto"; -option go_package = "github.com/bio-routing/bio-rd/route/api"; +import "code.fbi.h-da.de/danet/bio-rd/net/api/net.proto"; +option go_package = "code.fbi.h-da.de/danet/bio-rd/route/api"; message Route { bio.net.Prefix pfx = 1; diff --git a/route/bgp_path.go b/route/bgp_path.go index 378abebcb89c24ac3eaef2e267fe65470b4413f0..10e59333524888619c2e1592f685bde397e85b2b 100644 --- a/route/bgp_path.go +++ b/route/bgp_path.go @@ -7,9 +7,9 @@ import ( "github.com/bio-routing/tflow2/convert" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route/api" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route/api" ) // BGPPath represents a set of BGP path attributes diff --git a/route/bgp_path_test.go b/route/bgp_path_test.go index ad96a80becad0eac2073ae69b2a3f3dba3d332ff..48f7d5edb9e8fa873e99e7f1c37ebb71f6944758 100644 --- a/route/bgp_path_test.go +++ b/route/bgp_path_test.go @@ -3,10 +3,10 @@ package route import ( "testing" - "github.com/bio-routing/bio-rd/net" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route/api" + "code.fbi.h-da.de/danet/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route/api" "github.com/stretchr/testify/assert" ) diff --git a/route/fib_path.go b/route/fib_path.go index ce1d81f1ac54442b7a709acbb28afef7883b9b49..5c8bce1d72e46ee537c485cb282d28d08d516a81 100644 --- a/route/fib_path.go +++ b/route/fib_path.go @@ -3,7 +3,7 @@ package route import ( "fmt" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) const ( diff --git a/route/path.go b/route/path.go index 3a7d5165a234d392666bee792d2b18291af3d4b3..fda2456eed0d90055752499aea8fd0b974ba9975 100644 --- a/route/path.go +++ b/route/path.go @@ -3,8 +3,8 @@ package route import ( "fmt" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route/api" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route/api" ) // Path represents a network path diff --git a/route/path_test.go b/route/path_test.go index 3ec287e2e6f72b931a9c459edbf2d67348e056cd..c48eda2e8281d8ec37bc9daff799ba2759b32690 100644 --- a/route/path_test.go +++ b/route/path_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/bio-routing/bio-rd/net" - bnet "github.com/bio-routing/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" "github.com/stretchr/testify/assert" ) diff --git a/route/route.go b/route/route.go index 8b3966f230220d0bffce8d90fe69757c2c41b82e..0bdeaa68dae2adb1687d795ed370cf4fb8a4738f 100644 --- a/route/route.go +++ b/route/route.go @@ -5,8 +5,8 @@ import ( "sort" "sync" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route/api" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route/api" ) const ( diff --git a/route/route_test.go b/route/route_test.go index 059835b19c75f14c7e86762f64d8ea5da862f105..afd484cff517bbb6a73328959593d3795441ac86 100644 --- a/route/route_test.go +++ b/route/route_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/bio-routing/bio-rd/net" - bnet "github.com/bio-routing/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) func TestNewRoute(t *testing.T) { diff --git a/route/static.go b/route/static.go index b056fd34e9d096102e2c0512ca755525f3381ad6..7c754a8b74e673d1de9afec825d4131bd450c98a 100644 --- a/route/static.go +++ b/route/static.go @@ -1,8 +1,8 @@ package route import ( - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route/api" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route/api" ) // StaticPath represents a static path of a route diff --git a/routingtable/adjRIBIn/adj_rib_in.go b/routingtable/adjRIBIn/adj_rib_in.go index c972dcfef7c45883648d69701c328e90764d029b..53750d7405cb7146193e0117258b953ac5cdea58 100644 --- a/routingtable/adjRIBIn/adj_rib_in.go +++ b/routingtable/adjRIBIn/adj_rib_in.go @@ -3,10 +3,10 @@ package adjRIBIn import ( "sync" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" log "github.com/sirupsen/logrus" ) diff --git a/routingtable/adjRIBIn/adj_rib_in_test.go b/routingtable/adjRIBIn/adj_rib_in_test.go index e82b671ea512eaf23eb8eae963401fa510915dbd..704149d9af5af4dba350e0abb8ea185e429c2ce6 100644 --- a/routingtable/adjRIBIn/adj_rib_in_test.go +++ b/routingtable/adjRIBIn/adj_rib_in_test.go @@ -3,11 +3,11 @@ package adjRIBIn import ( "testing" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/adjRIBOut/adj_rib_out.go b/routingtable/adjRIBOut/adj_rib_out.go index 6387e8a8a8efef2411f4e95b0a8c2bf295c33d6e..55ce1b632e23e2cf1b4ad8be15575d904a4283fa 100644 --- a/routingtable/adjRIBOut/adj_rib_out.go +++ b/routingtable/adjRIBOut/adj_rib_out.go @@ -4,13 +4,13 @@ import ( "fmt" "sync" - "github.com/bio-routing/bio-rd/net" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/filter" - "github.com/bio-routing/bio-rd/routingtable/locRIB" + "code.fbi.h-da.de/danet/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/routingtable/locRIB" "github.com/pkg/errors" log "github.com/sirupsen/logrus" ) diff --git a/routingtable/adjRIBOut/adj_rib_out_test.go b/routingtable/adjRIBOut/adj_rib_out_test.go index e11d7e6a1545c9f9c8637061271feb1f5fe6c485..eebc04361a68ad3630abccc3ec0e6f7acc89f09f 100644 --- a/routingtable/adjRIBOut/adj_rib_out_test.go +++ b/routingtable/adjRIBOut/adj_rib_out_test.go @@ -6,12 +6,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" ) func TestBestPathOnlyEBGP(t *testing.T) { diff --git a/routingtable/adjRIBOut/path_id_manager.go b/routingtable/adjRIBOut/path_id_manager.go index 78054e3ec0294a7ba472e6de3928e2705c5ed536..d84d3da690eaac5d666eac96519f4fbd15519687 100644 --- a/routingtable/adjRIBOut/path_id_manager.go +++ b/routingtable/adjRIBOut/path_id_manager.go @@ -3,7 +3,7 @@ package adjRIBOut import ( "fmt" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/route" ) var maxUint32 = ^uint32(0) diff --git a/routingtable/adjRIBOut/path_id_manager_test.go b/routingtable/adjRIBOut/path_id_manager_test.go index 25816d7e04402a94c5fbed641aca20e94a8a91aa..f7d97794484ef2b44a5b01c9f45a03ce40906e9c 100644 --- a/routingtable/adjRIBOut/path_id_manager_test.go +++ b/routingtable/adjRIBOut/path_id_manager_test.go @@ -3,8 +3,8 @@ package adjRIBOut import ( "testing" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/client_interface.go b/routingtable/client_interface.go index a97a3b5ad7352d7bf73ca9ab4d7be5e018aabe03..6825e76d610c3cf2f9e08275ea9e0a202ce9f528 100644 --- a/routingtable/client_interface.go +++ b/routingtable/client_interface.go @@ -1,9 +1,9 @@ package routingtable import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" ) // RouteTableClient is the interface that every route table client must implement diff --git a/routingtable/client_manager_test.go b/routingtable/client_manager_test.go index 17bef2f4951f9f272d203f83931a0b1f01a42ff6..17001c603e22e5fc459ec03a97e4db702a2eb7c3 100644 --- a/routingtable/client_manager_test.go +++ b/routingtable/client_manager_test.go @@ -3,9 +3,9 @@ package routingtable import ( "testing" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/filter/actions/accept_action.go b/routingtable/filter/actions/accept_action.go index ff12e95afa4a7b9bca6a033a788c30329acde36b..a70370cb80be874964881991fc51ac0bb56db430 100644 --- a/routingtable/filter/actions/accept_action.go +++ b/routingtable/filter/actions/accept_action.go @@ -1,8 +1,8 @@ package actions import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) // AcceptAction accepts a path and terminates processing of filters diff --git a/routingtable/filter/actions/action.go b/routingtable/filter/actions/action.go index c339cd54f27ccbf2742ce88672032485cd73be1e..dd6ab9e62650380e90b9b83b49bb0916f23e9bd5 100644 --- a/routingtable/filter/actions/action.go +++ b/routingtable/filter/actions/action.go @@ -1,8 +1,8 @@ package actions import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) // Action performs actions on a `route.Path` diff --git a/routingtable/filter/actions/add_community_action.go b/routingtable/filter/actions/add_community_action.go index cc0492489e62a591fad5039a881f035c408ff777..2d17fd23ce5d3a5aab7d52eb25b1e6b6945d6188 100644 --- a/routingtable/filter/actions/add_community_action.go +++ b/routingtable/filter/actions/add_community_action.go @@ -1,9 +1,9 @@ package actions import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" ) type AddCommunityAction struct { diff --git a/routingtable/filter/actions/add_community_action_test.go b/routingtable/filter/actions/add_community_action_test.go index 16e3723b5ce772e44859376c758512c9c8ff6c39..3ac710858ef8fe7ac223add050d37bf846856eb1 100644 --- a/routingtable/filter/actions/add_community_action_test.go +++ b/routingtable/filter/actions/add_community_action_test.go @@ -3,9 +3,9 @@ package actions import ( "testing" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/filter/actions/add_large_community_action.go b/routingtable/filter/actions/add_large_community_action.go index 4bda495f18974a37feb342b1c825279a501cdaf1..e030f0d947e167ef9aa0d8a72f111d873de1c281 100644 --- a/routingtable/filter/actions/add_large_community_action.go +++ b/routingtable/filter/actions/add_large_community_action.go @@ -1,9 +1,9 @@ package actions import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" ) type AddLargeCommunityAction struct { diff --git a/routingtable/filter/actions/add_large_community_action_test.go b/routingtable/filter/actions/add_large_community_action_test.go index 4ded0c1fb1e4143b349e87750d82ddab350d7f78..68b4a3e89443f9a74ec898aeba6bb978cb346871 100644 --- a/routingtable/filter/actions/add_large_community_action_test.go +++ b/routingtable/filter/actions/add_large_community_action_test.go @@ -3,9 +3,9 @@ package actions import ( "testing" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/filter/actions/as_path_prepend_action.go b/routingtable/filter/actions/as_path_prepend_action.go index 3616250d2d838015e47b4c798e3736edafca9ccd..80e5a97b617e519885e91ef44048dc5c4f60250e 100644 --- a/routingtable/filter/actions/as_path_prepend_action.go +++ b/routingtable/filter/actions/as_path_prepend_action.go @@ -1,8 +1,8 @@ package actions import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) type ASPathPrependAction struct { diff --git a/routingtable/filter/actions/as_path_prepend_action_test.go b/routingtable/filter/actions/as_path_prepend_action_test.go index 93f600af0b3053fb3f6da07c0c7a3b34906b5249..eee125468e9fe6cb8a88df6425d92b74628843dd 100644 --- a/routingtable/filter/actions/as_path_prepend_action_test.go +++ b/routingtable/filter/actions/as_path_prepend_action_test.go @@ -3,10 +3,10 @@ package actions import ( "testing" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/route" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/filter/actions/reject_action.go b/routingtable/filter/actions/reject_action.go index fd1cf462e5c9cbed4942f0b04c709510fb62fb7f..47df81f7ebba1c93acbacfcc041a79e310523dcd 100644 --- a/routingtable/filter/actions/reject_action.go +++ b/routingtable/filter/actions/reject_action.go @@ -1,8 +1,8 @@ package actions import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) // RejectAction rejects a prefix and terminates filter processing diff --git a/routingtable/filter/actions/set_local_pref_action.go b/routingtable/filter/actions/set_local_pref_action.go index a56bb08891daec8f2ce822a76840ce7eae8978f4..45f96d594cac64511234075d052f14edcadc0536 100644 --- a/routingtable/filter/actions/set_local_pref_action.go +++ b/routingtable/filter/actions/set_local_pref_action.go @@ -1,8 +1,8 @@ package actions import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) type SetLocalPrefAction struct { diff --git a/routingtable/filter/actions/set_local_pref_action_test.go b/routingtable/filter/actions/set_local_pref_action_test.go index c653724948f281ba0a14ce61fb0c48b21161f4c2..a8e7e2d15c7af2b065c9d62893617bef1bd7411a 100644 --- a/routingtable/filter/actions/set_local_pref_action_test.go +++ b/routingtable/filter/actions/set_local_pref_action_test.go @@ -3,8 +3,8 @@ package actions import ( "testing" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/filter/actions/set_med_action.go b/routingtable/filter/actions/set_med_action.go index 190eb1e227e62037483a7d1dc72a86f939d4cf7c..0987e4ca3f4136a503e9f16e3741ab7d85cbe6ad 100644 --- a/routingtable/filter/actions/set_med_action.go +++ b/routingtable/filter/actions/set_med_action.go @@ -1,8 +1,8 @@ package actions import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) // SetMEDAction sets the BGP MED diff --git a/routingtable/filter/actions/set_nexthop_action.go b/routingtable/filter/actions/set_nexthop_action.go index 8f98d6b961164afbc6933f65b17ac04c305c8de1..01186ff43517bf774a2e2d9a9aea9bb08603761c 100644 --- a/routingtable/filter/actions/set_nexthop_action.go +++ b/routingtable/filter/actions/set_nexthop_action.go @@ -1,9 +1,9 @@ package actions import ( - "github.com/bio-routing/bio-rd/net" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) type SetNextHopAction struct { diff --git a/routingtable/filter/actions/set_nexthop_action_test.go b/routingtable/filter/actions/set_nexthop_action_test.go index a1409541cb72d82b6be7300e5363fcb94c513916..8a4724cd968188b9cf53ab151fcdd4b5e82e9e48 100644 --- a/routingtable/filter/actions/set_nexthop_action_test.go +++ b/routingtable/filter/actions/set_nexthop_action_test.go @@ -3,11 +3,11 @@ package actions import ( "testing" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" "github.com/stretchr/testify/assert" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) func TestSetNextHopTest(t *testing.T) { diff --git a/routingtable/filter/chain.go b/routingtable/filter/chain.go index acf3c6a1dc2723acafaf1884a0e0401c9addb4d3..d91826ff95412682e8efd954f68bb0fd11ea6267 100644 --- a/routingtable/filter/chain.go +++ b/routingtable/filter/chain.go @@ -1,8 +1,8 @@ package filter import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) type Chain []*Filter diff --git a/routingtable/filter/community_filter.go b/routingtable/filter/community_filter.go index a9ea10c239763cde51741644034073509cb9d0cb..f88b033d17ccf0508536736c48b3df8868dafa38 100644 --- a/routingtable/filter/community_filter.go +++ b/routingtable/filter/community_filter.go @@ -1,6 +1,6 @@ package filter -import "github.com/bio-routing/bio-rd/protocols/bgp/types" +import "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" type CommunityFilter struct { community uint32 diff --git a/routingtable/filter/filter.go b/routingtable/filter/filter.go index 8fac734b42cfcd1e4e5d50515c090f5f032a19e4..dc66811f976198c97f8d92f25376294edda96bb9 100644 --- a/routingtable/filter/filter.go +++ b/routingtable/filter/filter.go @@ -1,8 +1,8 @@ package filter import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) type FilterResult struct { diff --git a/routingtable/filter/filter_test.go b/routingtable/filter/filter_test.go index 08595c56916913c714322913a04b35a14876b584..0a13e93d3c4d9e3de652f3c75a37af863816623c 100644 --- a/routingtable/filter/filter_test.go +++ b/routingtable/filter/filter_test.go @@ -3,9 +3,9 @@ package filter import ( "testing" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable/filter/actions" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter/actions" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/filter/helper.go b/routingtable/filter/helper.go index 7fb6e9a421597599606b6faedc901b1e45b2403c..9614fb92c884bcbf3d9a5d1ac61f05d92935b838 100644 --- a/routingtable/filter/helper.go +++ b/routingtable/filter/helper.go @@ -1,7 +1,7 @@ package filter import ( - "github.com/bio-routing/bio-rd/routingtable/filter/actions" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter/actions" ) // NewAcceptAllFilter returns a filter accepting any paths/prefixes diff --git a/routingtable/filter/helper_test.go b/routingtable/filter/helper_test.go index ee2a70c88794b998114ee245f21d809e2f2cb505..c455086cf53148fc1aa1a808ed0be79066507c12 100644 --- a/routingtable/filter/helper_test.go +++ b/routingtable/filter/helper_test.go @@ -3,8 +3,8 @@ package filter import ( "testing" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/filter/large_community_filter.go b/routingtable/filter/large_community_filter.go index c7fd84325da81dd1e3667687698e30b31de5ccab..797389ff4282bfdea3eab0930ece6539974e05f0 100644 --- a/routingtable/filter/large_community_filter.go +++ b/routingtable/filter/large_community_filter.go @@ -1,7 +1,7 @@ package filter import ( - "github.com/bio-routing/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" ) // LargeCommunityFilter represents a filter for large communities diff --git a/routingtable/filter/prefix_list.go b/routingtable/filter/prefix_list.go index 7d81ca7bdc9680991c3dca482417cc00c88f2587..27b81de01ae34052de9aa01205fe98988072e7d1 100644 --- a/routingtable/filter/prefix_list.go +++ b/routingtable/filter/prefix_list.go @@ -1,6 +1,6 @@ package filter -import "github.com/bio-routing/bio-rd/net" +import "code.fbi.h-da.de/danet/bio-rd/net" type PrefixList struct { allowed []*net.Prefix diff --git a/routingtable/filter/prefix_matcher.go b/routingtable/filter/prefix_matcher.go index 3d466ed6b1fd1f5e4854c2f42cea6376d92999bd..061046fcae7f200fdd0321d1bd3b0ea6e73fd737 100644 --- a/routingtable/filter/prefix_matcher.go +++ b/routingtable/filter/prefix_matcher.go @@ -1,6 +1,6 @@ package filter -import "github.com/bio-routing/bio-rd/net" +import "code.fbi.h-da.de/danet/bio-rd/net" type PrefixMatcher interface { Match(pattern, prefix *net.Prefix) bool diff --git a/routingtable/filter/route_filter.go b/routingtable/filter/route_filter.go index fa0265e679761acadc9dd303438165bf26da59e8..d2095b7294e970ae49ec001b384fa68e65736e3c 100644 --- a/routingtable/filter/route_filter.go +++ b/routingtable/filter/route_filter.go @@ -1,7 +1,7 @@ package filter import ( - "github.com/bio-routing/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/net" ) type RouteFilter struct { diff --git a/routingtable/filter/route_filter_test.go b/routingtable/filter/route_filter_test.go index eba58771c0614ed7f3ec7d426f38a70998c0dacc..9de54d5553a47bf41ee35e8b2193b11bcf3cc46e 100644 --- a/routingtable/filter/route_filter_test.go +++ b/routingtable/filter/route_filter_test.go @@ -3,7 +3,7 @@ package filter import ( "testing" - "github.com/bio-routing/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/net" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/filter/term.go b/routingtable/filter/term.go index 885cd367f7d9c1ce9ae2dda044ea45137853ea84..1dac48a4bd621b9a5b65b0b9d0dbd1da77e4c741 100644 --- a/routingtable/filter/term.go +++ b/routingtable/filter/term.go @@ -1,9 +1,9 @@ package filter import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable/filter/actions" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter/actions" ) // Term matches a path against a list of conditions and performs actions if it matches diff --git a/routingtable/filter/term_condition.go b/routingtable/filter/term_condition.go index d36119f6e848b256785d310b217dfedc08ea3695..5390f4315daebdfaea47cfe8809b4606f3366c9c 100644 --- a/routingtable/filter/term_condition.go +++ b/routingtable/filter/term_condition.go @@ -1,8 +1,8 @@ package filter import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) type TermCondition struct { diff --git a/routingtable/filter/term_condition_test.go b/routingtable/filter/term_condition_test.go index 989fd3791a1896adaf875b702d849c07c1f66ed6..48317f06deffc3cad3e52f79ecac6c68d571af58 100644 --- a/routingtable/filter/term_condition_test.go +++ b/routingtable/filter/term_condition_test.go @@ -3,9 +3,9 @@ package filter import ( "testing" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/filter/term_test.go b/routingtable/filter/term_test.go index 3c8661fc629fda976a93b349836fe4562a892498..7967fdc418112d4dd1fa97ae0ac092d2f07896c3 100644 --- a/routingtable/filter/term_test.go +++ b/routingtable/filter/term_test.go @@ -3,9 +3,9 @@ package filter import ( "testing" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable/filter/actions" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter/actions" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/locRIB/loc_rib.go b/routingtable/locRIB/loc_rib.go index 057841e61f105ee876ce3b73a83dd24da0056b5c..786e51f02e171b4e65e932e1bc7889b35a710c84 100644 --- a/routingtable/locRIB/loc_rib.go +++ b/routingtable/locRIB/loc_rib.go @@ -4,11 +4,11 @@ import ( "fmt" "sync" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable" - "github.com/bio-routing/bio-rd/routingtable/filter" - "github.com/bio-routing/bio-rd/util/math" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/util/math" log "github.com/sirupsen/logrus" ) diff --git a/routingtable/locRIB/loc_rib_test.go b/routingtable/locRIB/loc_rib_test.go index 9fc68d3e7977ac3695ef78113e613a96563bd420..9930d772d94f16f4587bfbbc7f202f8ddf3c4299 100644 --- a/routingtable/locRIB/loc_rib_test.go +++ b/routingtable/locRIB/loc_rib_test.go @@ -3,8 +3,8 @@ package locRIB import ( "testing" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/mergedlocrib/mergedlocrib.go b/routingtable/mergedlocrib/mergedlocrib.go index ab97c0fe0cb54d7560d2472d4de217628bc3352c..6925097b0b9dff84adfa803d4db8722942922f5d 100644 --- a/routingtable/mergedlocrib/mergedlocrib.go +++ b/routingtable/mergedlocrib/mergedlocrib.go @@ -4,10 +4,10 @@ import ( "crypto/sha1" "sync" - "github.com/bio-routing/bio-rd/route" - routeapi "github.com/bio-routing/bio-rd/route/api" - "github.com/bio-routing/bio-rd/routingtable/locRIB" - "github.com/bio-routing/bio-rd/routingtable/mergedlocrib/metrics" + "code.fbi.h-da.de/danet/bio-rd/route" + routeapi "code.fbi.h-da.de/danet/bio-rd/route/api" + "code.fbi.h-da.de/danet/bio-rd/routingtable/locRIB" + "code.fbi.h-da.de/danet/bio-rd/routingtable/mergedlocrib/metrics" "github.com/golang/protobuf/proto" "github.com/pkg/errors" ) diff --git a/routingtable/mergedlocrib/mergedlocrib_test.go b/routingtable/mergedlocrib/mergedlocrib_test.go index c0e3adc3983669011c5dfab7a77fe6e3fcb903a4..c192f2788ee801073432c523c7e212da93b98ca8 100644 --- a/routingtable/mergedlocrib/mergedlocrib_test.go +++ b/routingtable/mergedlocrib/mergedlocrib_test.go @@ -3,12 +3,12 @@ package mergedlocrib import ( "testing" - "github.com/bio-routing/bio-rd/route" - routeapi "github.com/bio-routing/bio-rd/route/api" - "github.com/bio-routing/bio-rd/routingtable/locRIB" + "code.fbi.h-da.de/danet/bio-rd/route" + routeapi "code.fbi.h-da.de/danet/bio-rd/route/api" + "code.fbi.h-da.de/danet/bio-rd/routingtable/locRIB" "github.com/stretchr/testify/assert" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) type srcRouteTuple struct { diff --git a/routingtable/mergedlocrib/routecontainer.go b/routingtable/mergedlocrib/routecontainer.go index 51b42ac20c2b2530645ec21a39ad5f007ae3a88e..7e297cef92d42be4d14b03bec3b68c1c60f2c453 100644 --- a/routingtable/mergedlocrib/routecontainer.go +++ b/routingtable/mergedlocrib/routecontainer.go @@ -1,7 +1,7 @@ package mergedlocrib import ( - routeapi "github.com/bio-routing/bio-rd/route/api" + routeapi "code.fbi.h-da.de/danet/bio-rd/route/api" ) // routeContainer groups a route with one ore multiple source the route was received from diff --git a/routingtable/mock_client.go b/routingtable/mock_client.go index bac4bd9709998497e94aca80d66ef3dd2e8f35f8..73ab292463d7505ab589f655794caf54df9cc942 100644 --- a/routingtable/mock_client.go +++ b/routingtable/mock_client.go @@ -3,9 +3,9 @@ package routingtable import ( "fmt" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable/filter" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable/filter" ) type RemovePathParams struct { diff --git a/routingtable/neighbor.go b/routingtable/neighbor.go index 90845a341d70ac2c69d1d90fffa0c12e34cab856..ecbe0a670a792e94d00c0bfddbf1e693a77c92e9 100644 --- a/routingtable/neighbor.go +++ b/routingtable/neighbor.go @@ -1,6 +1,6 @@ package routingtable -import bnet "github.com/bio-routing/bio-rd/net" +import bnet "code.fbi.h-da.de/danet/bio-rd/net" // Neighbor represents the attributes identifying a neighbor relationship type Neighbor struct { diff --git a/routingtable/rib_interface.go b/routingtable/rib_interface.go index 45afeb2605a13a3ca65bfb885950d0a3b2fc8692..feff514ab3671e2596c4223b9b85836d6e48b804 100644 --- a/routingtable/rib_interface.go +++ b/routingtable/rib_interface.go @@ -1,8 +1,8 @@ package routingtable import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) type RIB interface { diff --git a/routingtable/table.go b/routingtable/table.go index bcb489527f788d9fc7e3324523599fc385b20328..23ef59c045fb5a06888ad9d28f73df1ec4706e18 100644 --- a/routingtable/table.go +++ b/routingtable/table.go @@ -4,8 +4,8 @@ import ( "sync" "sync/atomic" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) // RoutingTable is a binary trie that stores prefixes and their paths diff --git a/routingtable/table_test.go b/routingtable/table_test.go index c2da0f665e9e17c360e4adb938322677120d9421..5b3da75ecbaf9ec8afec4e855faf6be1126a0295 100644 --- a/routingtable/table_test.go +++ b/routingtable/table_test.go @@ -3,8 +3,8 @@ package routingtable import ( "testing" - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/trie.go b/routingtable/trie.go index 8fdb3ab22522c47a59ce59cb59beb47c83c278d7..343c41ff512092c03f6b365a4d19a2fd9304d0ed 100644 --- a/routingtable/trie.go +++ b/routingtable/trie.go @@ -1,8 +1,8 @@ package routingtable import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/route" ) // node is a node in the compressed trie that is used to implement a routing table diff --git a/routingtable/update_helper.go b/routingtable/update_helper.go index a4b6ca5fd9b70c6db5fde9dc2aa8407a0acaf816..f3359585957537ab988f77c9a14d79bcb032b686 100644 --- a/routingtable/update_helper.go +++ b/routingtable/update_helper.go @@ -1,9 +1,9 @@ package routingtable import ( - "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" ) // ShouldPropagateUpdate performs some default checks and returns if an route update should be propagated to a neighbor diff --git a/routingtable/update_helper_test.go b/routingtable/update_helper_test.go index c545e35afbc7c4def154c73cf968ac37b4429527..7f1759429d9e2ed18a5f186bc2b882aa94cd6932 100644 --- a/routingtable/update_helper_test.go +++ b/routingtable/update_helper_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" - bnet "github.com/bio-routing/bio-rd/net" - "github.com/bio-routing/bio-rd/protocols/bgp/types" - "github.com/bio-routing/bio-rd/route" + bnet "code.fbi.h-da.de/danet/bio-rd/net" + "code.fbi.h-da.de/danet/bio-rd/protocols/bgp/types" + "code.fbi.h-da.de/danet/bio-rd/route" "github.com/stretchr/testify/assert" ) diff --git a/routingtable/vrf/metrics.go b/routingtable/vrf/metrics.go index f28cb379b19d91daca70dfc6f106780fd24f0906..7b813ed1c24c562088e20c04e484b1f35d5c4682 100644 --- a/routingtable/vrf/metrics.go +++ b/routingtable/vrf/metrics.go @@ -1,7 +1,7 @@ package vrf import ( - "github.com/bio-routing/bio-rd/routingtable/vrf/metrics" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf/metrics" ) // Metrics returns metrics for all VRFs diff --git a/routingtable/vrf/metrics_test.go b/routingtable/vrf/metrics_test.go index 2946f8185afc2c2f69bb498ff9869002be2baf5e..cce3a4c3f29f373518dba19b1597a954ea4db444 100644 --- a/routingtable/vrf/metrics_test.go +++ b/routingtable/vrf/metrics_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/bio-routing/bio-rd/route" - "github.com/bio-routing/bio-rd/routingtable/vrf/metrics" + "code.fbi.h-da.de/danet/bio-rd/route" + "code.fbi.h-da.de/danet/bio-rd/routingtable/vrf/metrics" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) func TestMetrics(t *testing.T) { diff --git a/routingtable/vrf/vrf.go b/routingtable/vrf/vrf.go index 9232f5c9b85f4b682563391bc23589d197d39c17..b63e2ac8ffe6e8dc5b6d2bbf2ee2415815b4aca6 100644 --- a/routingtable/vrf/vrf.go +++ b/routingtable/vrf/vrf.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "github.com/bio-routing/bio-rd/routingtable/locRIB" + "code.fbi.h-da.de/danet/bio-rd/routingtable/locRIB" "github.com/pkg/errors" ) diff --git a/util/checksum/ipv6_upperlayer.go b/util/checksum/ipv6_upperlayer.go new file mode 100644 index 0000000000000000000000000000000000000000..ede0339abbc29a141e9edd86685e911dc6131392 --- /dev/null +++ b/util/checksum/ipv6_upperlayer.go @@ -0,0 +1,72 @@ +// taken from https://go.googlesource.com/net/+/refs/changes/17/112817/2/ipv4/header.go#102 +// +// Copyright (c) 2009 The Go Authors. All rights reserved. +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +package checksum + +import ( + "encoding/binary" + + "code.fbi.h-da.de/danet/bio-rd/net" + "github.com/bio-routing/tflow2/convert" + "golang.org/x/net/icmp" +) + +func IPv6PseudoHeader(src, dst net.IP, lenght uint32, proto uint8) []byte { + header := icmp.IPv6PseudoHeader(src.ToNetIP(), dst.ToNetIP()) + + lenBytes := convert.Uint32Byte(uint32(lenght)) + copy(header[32:36], lenBytes) + + header[len(header)-1] = proto // next header + return header +} + +// IPv6UpperLayerChecksum calculates the checksum for +// an upper layer payload in IPv6 according to RFC 2460 Section 8.1 +// +// Specify the position of the checksum using sumAt. +// Use a value lower than 0 to not skip a checksum field. +func IPv6UpperLayerChecksum(src, dst net.IP, proto uint8, pl []byte) uint16 { + header := IPv6PseudoHeader(src, dst, uint32(len(pl)), proto) + b := append(header, pl...) + + // Algorithm taken from: https://en.wikipedia.org/wiki/IPv4_header_checksum. + // "First calculate the sum of each 16 bit value within the header, + // skipping only the checksum field itself." + var chk uint32 + for i := 0; i < len(b); i += 2 { + chk += uint32(binary.BigEndian.Uint16(b[i : i+2])) + } + + // "The first 4 bits are the carry and will be added to the rest of + // the value." + carry := uint16(chk >> 16) + sum := carry + uint16(chk&0x0ffff) + + // "Next, we flip every bit in that value, to obtain the checksum." + return uint16(^sum) +} diff --git a/util/grpc/clientmanager/clientmanager.go b/util/grpc/clientmanager/clientmanager.go index 6dcb0f8ff0ce230201d3fd6354c9521510199743..6ac5eafd57cd6a04f00ba9ce8c0d43885bcd2a60 100644 --- a/util/grpc/clientmanager/clientmanager.go +++ b/util/grpc/clientmanager/clientmanager.go @@ -3,7 +3,7 @@ package clientmanager import ( "sync" - "github.com/bio-routing/bio-rd/util/grpc/clientmanager/metrics" + "code.fbi.h-da.de/danet/bio-rd/util/grpc/clientmanager/metrics" "github.com/pkg/errors" "google.golang.org/grpc" ) diff --git a/util/net/net_addr.go b/util/net/net_addr.go index 4ec7ec56fb00bf41135bcd5def21e0d6a3f8f44c..c4fc4ae211d2955781d78f2dc5b55e0f2c1ead2a 100644 --- a/util/net/net_addr.go +++ b/util/net/net_addr.go @@ -3,7 +3,7 @@ package net import ( "net" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" ) // BIONetIPFromAddr retrives the IP from an net.Addr and returns the IP in BIO's internal IP type diff --git a/util/net/net_addr_test.go b/util/net/net_addr_test.go index bd479fcc28523a81ce38d9edcfb39ae68a6618e7..6a23ac3b56f7630cb925e06483c97116e25712e4 100644 --- a/util/net/net_addr_test.go +++ b/util/net/net_addr_test.go @@ -3,7 +3,7 @@ package net import ( "testing" - bnet "github.com/bio-routing/bio-rd/net" + bnet "code.fbi.h-da.de/danet/bio-rd/net" "github.com/stretchr/testify/assert" )