From 7c846c065c9d3fcd3719dcebcda2c1e334708c68 Mon Sep 17 00:00:00 2001
From: Julian Kornberger <jk+github@digineo.de>
Date: Wed, 2 Jan 2019 07:10:23 +0100
Subject: [PATCH] Apply gofmt
---
config/server.go | 2 +-
protocols/bgp/packet/decoder.go | 2 +-
protocols/bgp/packet/decoder_test.go | 2 +-
protocols/bgp/packet/encoder_test.go | 2 +-
protocols/bgp/packet/mp_reach_nlri.go | 2 +-
protocols/bgp/packet/nlri.go | 2 +-
protocols/bgp/packet/path_attributes.go | 2 +-
protocols/bgp/server/bmp_router.go | 2 +-
protocols/bgp/server/bmp_server.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 +-
18 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/config/server.go b/config/server.go
index c4059b10..88b7027f 100644
--- a/config/server.go
+++ b/config/server.go
@@ -6,8 +6,8 @@ import (
"net"
"strings"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
type Global struct {
diff --git a/protocols/bgp/packet/decoder.go b/protocols/bgp/packet/decoder.go
index d8efc094..9d62716e 100644
--- a/protocols/bgp/packet/decoder.go
+++ b/protocols/bgp/packet/decoder.go
@@ -6,8 +6,8 @@ import (
"net"
"github.com/bio-routing/bio-rd/util/decode"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
// Decode decodes a BGP message
diff --git a/protocols/bgp/packet/decoder_test.go b/protocols/bgp/packet/decoder_test.go
index 2bc6109f..09b114c7 100644
--- a/protocols/bgp/packet/decoder_test.go
+++ b/protocols/bgp/packet/decoder_test.go
@@ -8,8 +8,8 @@ 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/bio-routing/tflow2/convert"
+ "github.com/stretchr/testify/assert"
)
type test struct {
diff --git a/protocols/bgp/packet/encoder_test.go b/protocols/bgp/packet/encoder_test.go
index 99426c14..6358d01b 100644
--- a/protocols/bgp/packet/encoder_test.go
+++ b/protocols/bgp/packet/encoder_test.go
@@ -4,8 +4,8 @@ import (
"bytes"
"testing"
- "github.com/stretchr/testify/assert"
"github.com/bio-routing/tflow2/convert"
+ "github.com/stretchr/testify/assert"
)
func TestSerializeKeepaliveMsg(t *testing.T) {
diff --git a/protocols/bgp/packet/mp_reach_nlri.go b/protocols/bgp/packet/mp_reach_nlri.go
index 41c1e26c..beeeaf9f 100644
--- a/protocols/bgp/packet/mp_reach_nlri.go
+++ b/protocols/bgp/packet/mp_reach_nlri.go
@@ -6,8 +6,8 @@ import (
bnet "github.com/bio-routing/bio-rd/net"
"github.com/bio-routing/bio-rd/util/decode"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
// MultiProtocolReachNLRI represents network layer reachability information for an IP address family (rfc4760)
diff --git a/protocols/bgp/packet/nlri.go b/protocols/bgp/packet/nlri.go
index 6baf473d..58f76d03 100644
--- a/protocols/bgp/packet/nlri.go
+++ b/protocols/bgp/packet/nlri.go
@@ -7,8 +7,8 @@ import (
bnet "github.com/bio-routing/bio-rd/net"
"github.com/bio-routing/bio-rd/util/decode"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
const (
diff --git a/protocols/bgp/packet/path_attributes.go b/protocols/bgp/packet/path_attributes.go
index 4336099f..2d91c9cb 100644
--- a/protocols/bgp/packet/path_attributes.go
+++ b/protocols/bgp/packet/path_attributes.go
@@ -9,8 +9,8 @@ import (
"github.com/bio-routing/bio-rd/protocols/bgp/types"
"github.com/bio-routing/bio-rd/route"
"github.com/bio-routing/bio-rd/util/decode"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
func decodePathAttrs(buf *bytes.Buffer, tpal uint16, opt *DecodeOptions) (*PathAttribute, error) {
diff --git a/protocols/bgp/server/bmp_router.go b/protocols/bgp/server/bmp_router.go
index bb66c7fa..748b6a7a 100644
--- a/protocols/bgp/server/bmp_router.go
+++ b/protocols/bgp/server/bmp_router.go
@@ -13,9 +13,9 @@ import (
"github.com/bio-routing/bio-rd/routingtable"
"github.com/bio-routing/bio-rd/routingtable/filter"
"github.com/bio-routing/bio-rd/routingtable/locRIB"
+ "github.com/bio-routing/tflow2/convert"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
- "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 d8e86cae..6aa751bf 100644
--- a/protocols/bgp/server/bmp_server.go
+++ b/protocols/bgp/server/bmp_server.go
@@ -10,9 +10,9 @@ import (
bmppkt "github.com/bio-routing/bio-rd/protocols/bmp/packet"
"github.com/bio-routing/bio-rd/routingtable"
"github.com/bio-routing/bio-rd/routingtable/locRIB"
+ "github.com/bio-routing/tflow2/convert"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
- "github.com/bio-routing/tflow2/convert"
)
const (
diff --git a/protocols/bmp/server/server.go b/protocols/bmp/server/server.go
index cfe77fd0..0a7a5bf9 100644
--- a/protocols/bmp/server/server.go
+++ b/protocols/bmp/server/server.go
@@ -9,9 +9,9 @@ import (
"github.com/bio-routing/bio-rd/protocols/bgp/packet"
"github.com/bio-routing/bio-rd/routingtable/locRIB"
+ "github.com/bio-routing/tflow2/convert"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
- "github.com/bio-routing/tflow2/convert"
)
const (
diff --git a/protocols/isis/packet/csnp.go b/protocols/isis/packet/csnp.go
index d43071a2..133a196d 100644
--- a/protocols/isis/packet/csnp.go
+++ b/protocols/isis/packet/csnp.go
@@ -8,8 +8,8 @@ import (
"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"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
const (
diff --git a/protocols/isis/packet/hello.go b/protocols/isis/packet/hello.go
index 1c954494..db3c2a27 100644
--- a/protocols/isis/packet/hello.go
+++ b/protocols/isis/packet/hello.go
@@ -5,8 +5,8 @@ import (
"github.com/bio-routing/bio-rd/protocols/isis/types"
"github.com/bio-routing/bio-rd/util/decode"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
// L2Hello represents a broadcast L2 hello
diff --git a/protocols/isis/packet/lsp.go b/protocols/isis/packet/lsp.go
index aa52f52f..6416c29a 100644
--- a/protocols/isis/packet/lsp.go
+++ b/protocols/isis/packet/lsp.go
@@ -6,8 +6,8 @@ import (
"github.com/FMNSSun/libhash/fletcher"
"github.com/bio-routing/bio-rd/protocols/isis/types"
"github.com/bio-routing/bio-rd/util/decode"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
const (
diff --git a/protocols/isis/packet/lsp_entry.go b/protocols/isis/packet/lsp_entry.go
index 9f05cba7..707fa918 100644
--- a/protocols/isis/packet/lsp_entry.go
+++ b/protocols/isis/packet/lsp_entry.go
@@ -4,8 +4,8 @@ import (
"bytes"
"github.com/bio-routing/bio-rd/util/decode"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
const (
diff --git a/protocols/isis/packet/psnp.go b/protocols/isis/packet/psnp.go
index ece7b445..3b4ac99e 100644
--- a/protocols/isis/packet/psnp.go
+++ b/protocols/isis/packet/psnp.go
@@ -7,8 +7,8 @@ import (
"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"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
const (
diff --git a/protocols/isis/packet/tlv_checksum.go b/protocols/isis/packet/tlv_checksum.go
index 398e6497..00174f57 100644
--- a/protocols/isis/packet/tlv_checksum.go
+++ b/protocols/isis/packet/tlv_checksum.go
@@ -4,8 +4,8 @@ import (
"bytes"
"github.com/bio-routing/bio-rd/util/decode"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
// 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 b1a2bad2..85a24f01 100644
--- a/protocols/isis/packet/tlv_ip_interface_address.go
+++ b/protocols/isis/packet/tlv_ip_interface_address.go
@@ -4,8 +4,8 @@ import (
"bytes"
"github.com/bio-routing/bio-rd/util/decode"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
// 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 b43771ae..696b0282 100644
--- a/protocols/isis/packet/tlv_p2p_adj_state.go
+++ b/protocols/isis/packet/tlv_p2p_adj_state.go
@@ -5,8 +5,8 @@ import (
"github.com/bio-routing/bio-rd/protocols/isis/types"
"github.com/bio-routing/bio-rd/util/decode"
- "github.com/pkg/errors"
"github.com/bio-routing/tflow2/convert"
+ "github.com/pkg/errors"
)
const (
--
GitLab