diff --git a/config/server.go b/config/server.go
index 162118956e11af33fb77e4d1240238e2163d33ff..c4059b10403fe98078ab9e2752fddb9cc72dd3fa 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 b63cf9dc098fa15baa442901cfde9aa7d9c4c951..ef129af356ca82c3dc7489c13b381b63d2e13bbf 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 e675bef157375bd3be09a3ff29806676d49dbdfa..88b6d8345831bdca8862e8b722b00af6724af1ad 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 f002d31fda13e57506a03003b3f1124632806d27..d8efc0948781fcd84acb4be2231d29243ec1440b 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 db29eb84a0c7d1995b21044cf9407196ed8828b2..2bc6109f304d2efbc22b521f04fc1029ce54f2f1 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 27bd3397e40109b02237fff903d020551136e09d..5dae1299af5a79eb6aed2875dd4cd7b6e6cec278 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 5728748292e7d78524216766be0cedb9751e32de..99426c140e37075c276c1035f61f2bfaa40e03ce 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 350c090935649906a2db66d5d5a692c5d21a22b3..41c1e26cdc31b2568b4b3dfd413bc2578a03905e 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 ed2c863d1af21b201695dc11b9eebef08c91ed9f..14d72283a4614c1dbffa648886fa39b39439d854 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 babb026d144ab97ad89d6894f8d23eaecb91c83b..6baf473d8bea719bd8131c6f374fe1f918d34962 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 2f99f773af6e2659beb1c4585cb7c2b27ed5ff01..42fb0c6cc9b94a2f3c90e3e7e96b91a2be2fabcb 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 6c312fdd5465eaf3b0a62211b94a17a8bf4353de..4336099f391f9c7b527f7d0bbbdd980c2156d216 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 8d142fdfc08a43480ed7a3789678f99da4a14f4d..f6c18c981db55ba92441fe5e0b5588886ae8b0c5 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 ff01369b1092c3370c1138863bf3d52df3eea2a5..bb66c7fa0259743f41b46196edb45c2f4d15ead2 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 30916c3cb685b935a3f2132893898320c59ce61a..d8e86caef689080c034549bd56cbf4dcdc5e9ed6 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 5b268355fb07c67ddb619fc5c1f04702bb338035..b5b59f063d7c0902be87bf2000265ff12ca3a573 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 f7c60ed97f98068cf2bb573b348407584ef2d3e4..7723d826f7a81b17f716d31a1b3bbdc3889bf3d1 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 50cccf15a88c7ea4f91d1872507c2ca39dde0f90..cfe77fd0611b8cae962031e885edcf55fe6eaff4 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 ae6eaf73c2bb962c3ef581de818d2d574ca473a8..d43071a26a13c584664eb64e08995547548d3cd2 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 e6170f9bbf8cdaaa953cb27293142e0134106767..1c95449488568c8e38016bba8f169643ac2da6f6 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 39104ed7815b8a9c8add738eec26696a30377953..aa52f52fa5ec504289ff7a2d4ec3037ce189c95d 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 d9bc599da8a429155aa5f9cb7455a249a751f5c8..9f05cba71ea156719de980cdf61b08250b70b474 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 82ade8286572ffdf035b3c75f0cf315ade56fe78..ece7b445759569bc2009e777e93148a8dc733341 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 05a55f647fc4c2e208e280ac9aac9b54289dc411..398e64973ee32c109226ece287ce8076e8ce6905 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 d34e0051488d9c0d8c7710eb0c015b1f3013cff1..b1a2bad2ce054a741736ae5105be12480954cecf 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 ec47038ab8be32b9fa640ae11a6265f6dca2916d..b43771ae5756725cc40baefc2c72bea293cf8a5f 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 195a1da0a766775a0502c136d7911aea6cc16bf8..9ceb882c91f74e6ed4b66680473485a02b9d2720 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"