From 95be2fcb976e93d7e990a13c86608e267518a565 Mon Sep 17 00:00:00 2001
From: Julian Kornberger <jk+github@digineo.de>
Date: Wed, 2 Jan 2019 07:01:51 +0100
Subject: [PATCH] Replace taktv6 by bio-routing
---
config/server.go | 2 +-
go.mod | 2 +-
go.sum | 4 ++--
protocols/bgp/packet/decoder.go | 2 +-
protocols/bgp/packet/decoder_test.go | 2 +-
protocols/bgp/packet/encoder.go | 2 +-
protocols/bgp/packet/encoder_test.go | 2 +-
protocols/bgp/packet/mp_reach_nlri.go | 2 +-
protocols/bgp/packet/mp_unreach_nlri.go | 2 +-
protocols/bgp/packet/nlri.go | 2 +-
protocols/bgp/packet/parameters.go | 2 +-
protocols/bgp/packet/path_attributes.go | 2 +-
protocols/bgp/packet/update.go | 2 +-
protocols/bgp/server/bmp_router.go | 2 +-
protocols/bgp/server/bmp_server.go | 2 +-
protocols/bmp/packet/common_header.go | 2 +-
protocols/bmp/packet/per_peer_header.go | 2 +-
protocols/bmp/server/server.go | 2 +-
protocols/isis/packet/csnp.go | 2 +-
protocols/isis/packet/hello.go | 2 +-
protocols/isis/packet/lsp.go | 2 +-
protocols/isis/packet/lsp_entry.go | 2 +-
protocols/isis/packet/psnp.go | 2 +-
protocols/isis/packet/tlv_checksum.go | 2 +-
protocols/isis/packet/tlv_ip_interface_address.go | 2 +-
protocols/isis/packet/tlv_p2p_adj_state.go | 2 +-
route/bgp_path.go | 2 +-
27 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/config/server.go b/config/server.go
index 16211895..c4059b10 100644
--- a/config/server.go
+++ b/config/server.go
@@ -7,7 +7,7 @@ import (
"strings"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
type Global struct {
diff --git a/go.mod b/go.mod
index b63cf9dc..ef129af3 100644
--- a/go.mod
+++ b/go.mod
@@ -2,11 +2,11 @@ module github.com/bio-routing/bio-rd
require (
github.com/FMNSSun/libhash v0.0.0-20180614155432-dabbc4426b6d
+ github.com/bio-routing/tflow2 v0.0.0-20181230153523-2e308a4a3c3a
github.com/golang/protobuf v1.2.1-0.20181128192352-1d3f30b51784
github.com/pkg/errors v0.8.0
github.com/sirupsen/logrus v1.2.0
github.com/stretchr/testify v1.2.2
- github.com/taktv6/tflow2 v0.0.0-20181230153523-2e308a4a3c3a
github.com/vishvananda/netlink v1.0.0
github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect
diff --git a/go.sum b/go.sum
index e675bef1..88b6d834 100644
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,8 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/FMNSSun/libhash v0.0.0-20180614155432-dabbc4426b6d h1:kLgFLWVyqlIMBCyE1f5e8pfLOoJ/RbFOlVbX27np+h4=
github.com/FMNSSun/libhash v0.0.0-20180614155432-dabbc4426b6d/go.mod h1:o6y2qav+ovGETjay+RIj2kGI/o/LmjnuT/qyvmVPhCc=
+github.com/bio-routing/tflow2 v0.0.0-20181230153523-2e308a4a3c3a h1:CsHtkAummoG7yhc9+6NRBkoPcTzSSmTfiyzWx5NwFPw=
+github.com/bio-routing/tflow2 v0.0.0-20181230153523-2e308a4a3c3a/go.mod h1:tjzJ5IykdbWNs1FjmiJWsH6SRBl+aWgxO5I44DAegIw=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
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=
@@ -24,8 +26,6 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
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/taktv6/tflow2 v0.0.0-20181230153523-2e308a4a3c3a h1:9vEkudcCUYSZKregpMKs7KI8hYvd6H67oWe3cN0smuU=
-github.com/taktv6/tflow2 v0.0.0-20181230153523-2e308a4a3c3a/go.mod h1:aEBKn9TWPzLEVcJ8I/UmrCfyyaHsjh8/dueHi/ASbsM=
github.com/vishvananda/netlink v1.0.0 h1:bqNY2lgheFIu1meHUFSH3d7vG93AFyqg3oGbJCOJgSM=
github.com/vishvananda/netlink v1.0.0/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4=
diff --git a/protocols/bgp/packet/decoder.go b/protocols/bgp/packet/decoder.go
index f002d31f..d8efc094 100644
--- a/protocols/bgp/packet/decoder.go
+++ b/protocols/bgp/packet/decoder.go
@@ -7,7 +7,7 @@ import (
"github.com/bio-routing/bio-rd/util/decode"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
// Decode decodes a BGP message
diff --git a/protocols/bgp/packet/decoder_test.go b/protocols/bgp/packet/decoder_test.go
index db29eb84..2bc6109f 100644
--- a/protocols/bgp/packet/decoder_test.go
+++ b/protocols/bgp/packet/decoder_test.go
@@ -9,7 +9,7 @@ import (
bnet "github.com/bio-routing/bio-rd/net"
"github.com/bio-routing/bio-rd/protocols/bgp/types"
"github.com/stretchr/testify/assert"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
type test struct {
diff --git a/protocols/bgp/packet/encoder.go b/protocols/bgp/packet/encoder.go
index 27bd3397..5dae1299 100644
--- a/protocols/bgp/packet/encoder.go
+++ b/protocols/bgp/packet/encoder.go
@@ -3,7 +3,7 @@ package packet
import (
"bytes"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
func SerializeKeepaliveMsg() []byte {
diff --git a/protocols/bgp/packet/encoder_test.go b/protocols/bgp/packet/encoder_test.go
index 57287482..99426c14 100644
--- a/protocols/bgp/packet/encoder_test.go
+++ b/protocols/bgp/packet/encoder_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
func TestSerializeKeepaliveMsg(t *testing.T) {
diff --git a/protocols/bgp/packet/mp_reach_nlri.go b/protocols/bgp/packet/mp_reach_nlri.go
index 350c0909..41c1e26c 100644
--- a/protocols/bgp/packet/mp_reach_nlri.go
+++ b/protocols/bgp/packet/mp_reach_nlri.go
@@ -7,7 +7,7 @@ import (
bnet "github.com/bio-routing/bio-rd/net"
"github.com/bio-routing/bio-rd/util/decode"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
// MultiProtocolReachNLRI represents network layer reachability information for an IP address family (rfc4760)
diff --git a/protocols/bgp/packet/mp_unreach_nlri.go b/protocols/bgp/packet/mp_unreach_nlri.go
index ed2c863d..14d72283 100644
--- a/protocols/bgp/packet/mp_unreach_nlri.go
+++ b/protocols/bgp/packet/mp_unreach_nlri.go
@@ -5,7 +5,7 @@ import (
"fmt"
"github.com/bio-routing/bio-rd/util/decode"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
// MultiProtocolUnreachNLRI represents network layer withdraw information for one prefix of an IP address family (rfc4760)
diff --git a/protocols/bgp/packet/nlri.go b/protocols/bgp/packet/nlri.go
index babb026d..6baf473d 100644
--- a/protocols/bgp/packet/nlri.go
+++ b/protocols/bgp/packet/nlri.go
@@ -8,7 +8,7 @@ import (
bnet "github.com/bio-routing/bio-rd/net"
"github.com/bio-routing/bio-rd/util/decode"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
const (
diff --git a/protocols/bgp/packet/parameters.go b/protocols/bgp/packet/parameters.go
index 2f99f773..42fb0c6c 100644
--- a/protocols/bgp/packet/parameters.go
+++ b/protocols/bgp/packet/parameters.go
@@ -3,7 +3,7 @@ package packet
import (
"bytes"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
type Serializable interface {
diff --git a/protocols/bgp/packet/path_attributes.go b/protocols/bgp/packet/path_attributes.go
index 6c312fdd..4336099f 100644
--- a/protocols/bgp/packet/path_attributes.go
+++ b/protocols/bgp/packet/path_attributes.go
@@ -10,7 +10,7 @@ import (
"github.com/bio-routing/bio-rd/route"
"github.com/bio-routing/bio-rd/util/decode"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
func decodePathAttrs(buf *bytes.Buffer, tpal uint16, opt *DecodeOptions) (*PathAttribute, error) {
diff --git a/protocols/bgp/packet/update.go b/protocols/bgp/packet/update.go
index 8d142fdf..f6c18c98 100644
--- a/protocols/bgp/packet/update.go
+++ b/protocols/bgp/packet/update.go
@@ -4,7 +4,7 @@ import (
"bytes"
"fmt"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
type BGPUpdate struct {
diff --git a/protocols/bgp/server/bmp_router.go b/protocols/bgp/server/bmp_router.go
index ff01369b..bb66c7fa 100644
--- a/protocols/bgp/server/bmp_router.go
+++ b/protocols/bgp/server/bmp_router.go
@@ -15,7 +15,7 @@ import (
"github.com/bio-routing/bio-rd/routingtable/locRIB"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
type router struct {
diff --git a/protocols/bgp/server/bmp_server.go b/protocols/bgp/server/bmp_server.go
index 30916c3c..d8e86cae 100644
--- a/protocols/bgp/server/bmp_server.go
+++ b/protocols/bgp/server/bmp_server.go
@@ -12,7 +12,7 @@ import (
"github.com/bio-routing/bio-rd/routingtable/locRIB"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
const (
diff --git a/protocols/bmp/packet/common_header.go b/protocols/bmp/packet/common_header.go
index 5b268355..b5b59f06 100644
--- a/protocols/bmp/packet/common_header.go
+++ b/protocols/bmp/packet/common_header.go
@@ -4,7 +4,7 @@ import (
"bytes"
"github.com/bio-routing/bio-rd/util/decoder"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
const (
diff --git a/protocols/bmp/packet/per_peer_header.go b/protocols/bmp/packet/per_peer_header.go
index f7c60ed9..7723d826 100644
--- a/protocols/bmp/packet/per_peer_header.go
+++ b/protocols/bmp/packet/per_peer_header.go
@@ -4,7 +4,7 @@ import (
"bytes"
"github.com/bio-routing/bio-rd/util/decoder"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
const (
diff --git a/protocols/bmp/server/server.go b/protocols/bmp/server/server.go
index 50cccf15..cfe77fd0 100644
--- a/protocols/bmp/server/server.go
+++ b/protocols/bmp/server/server.go
@@ -11,7 +11,7 @@ import (
"github.com/bio-routing/bio-rd/routingtable/locRIB"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
const (
diff --git a/protocols/isis/packet/csnp.go b/protocols/isis/packet/csnp.go
index ae6eaf73..d43071a2 100644
--- a/protocols/isis/packet/csnp.go
+++ b/protocols/isis/packet/csnp.go
@@ -9,7 +9,7 @@ import (
"github.com/bio-routing/bio-rd/util/decode"
umath "github.com/bio-routing/bio-rd/util/math"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
const (
diff --git a/protocols/isis/packet/hello.go b/protocols/isis/packet/hello.go
index e6170f9b..1c954494 100644
--- a/protocols/isis/packet/hello.go
+++ b/protocols/isis/packet/hello.go
@@ -6,7 +6,7 @@ import (
"github.com/bio-routing/bio-rd/protocols/isis/types"
"github.com/bio-routing/bio-rd/util/decode"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
// L2Hello represents a broadcast L2 hello
diff --git a/protocols/isis/packet/lsp.go b/protocols/isis/packet/lsp.go
index 39104ed7..aa52f52f 100644
--- a/protocols/isis/packet/lsp.go
+++ b/protocols/isis/packet/lsp.go
@@ -7,7 +7,7 @@ import (
"github.com/bio-routing/bio-rd/protocols/isis/types"
"github.com/bio-routing/bio-rd/util/decode"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
const (
diff --git a/protocols/isis/packet/lsp_entry.go b/protocols/isis/packet/lsp_entry.go
index d9bc599d..9f05cba7 100644
--- a/protocols/isis/packet/lsp_entry.go
+++ b/protocols/isis/packet/lsp_entry.go
@@ -5,7 +5,7 @@ import (
"github.com/bio-routing/bio-rd/util/decode"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
const (
diff --git a/protocols/isis/packet/psnp.go b/protocols/isis/packet/psnp.go
index 82ade828..ece7b445 100644
--- a/protocols/isis/packet/psnp.go
+++ b/protocols/isis/packet/psnp.go
@@ -8,7 +8,7 @@ import (
"github.com/bio-routing/bio-rd/util/decode"
umath "github.com/bio-routing/bio-rd/util/math"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
const (
diff --git a/protocols/isis/packet/tlv_checksum.go b/protocols/isis/packet/tlv_checksum.go
index 05a55f64..398e6497 100644
--- a/protocols/isis/packet/tlv_checksum.go
+++ b/protocols/isis/packet/tlv_checksum.go
@@ -5,7 +5,7 @@ import (
"github.com/bio-routing/bio-rd/util/decode"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
// ChecksumTLVType is the type value of a checksum TLV
diff --git a/protocols/isis/packet/tlv_ip_interface_address.go b/protocols/isis/packet/tlv_ip_interface_address.go
index d34e0051..b1a2bad2 100644
--- a/protocols/isis/packet/tlv_ip_interface_address.go
+++ b/protocols/isis/packet/tlv_ip_interface_address.go
@@ -5,7 +5,7 @@ import (
"github.com/bio-routing/bio-rd/util/decode"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
// IPInterfaceAddressTLVType is the type value of an IP interface address TLV
diff --git a/protocols/isis/packet/tlv_p2p_adj_state.go b/protocols/isis/packet/tlv_p2p_adj_state.go
index ec47038a..b43771ae 100644
--- a/protocols/isis/packet/tlv_p2p_adj_state.go
+++ b/protocols/isis/packet/tlv_p2p_adj_state.go
@@ -6,7 +6,7 @@ import (
"github.com/bio-routing/bio-rd/protocols/isis/types"
"github.com/bio-routing/bio-rd/util/decode"
"github.com/pkg/errors"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
)
const (
diff --git a/route/bgp_path.go b/route/bgp_path.go
index 195a1da0..9ceb882c 100644
--- a/route/bgp_path.go
+++ b/route/bgp_path.go
@@ -5,7 +5,7 @@ import (
"fmt"
"strings"
- "github.com/taktv6/tflow2/convert"
+ "github.com/bio-routing/tflow2/convert"
bnet "github.com/bio-routing/bio-rd/net"
"github.com/bio-routing/bio-rd/protocols/bgp/types"
--
GitLab