From 4dbd657a264657ec1a9fba8a26052af245662dce Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Fri, 3 Jul 2015 20:32:27 +0100 Subject: [PATCH 1/2] import gopacket from github instaead of google code The latter redirects to the former, which breaks `go get`. Closes #1071. --- prog/weaver/main.go | 2 +- router/ethernet_decoder.go | 4 ++-- router/forwarder.go | 4 ++-- router/pcap.go | 2 +- router/router.go | 2 +- router/udp_sender.go | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/prog/weaver/main.go b/prog/weaver/main.go index c17a7d46..03f2412c 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -11,8 +11,8 @@ import ( "runtime" "strings" - "code.google.com/p/gopacket/layers" "github.com/davecheney/profile" + "github.com/google/gopacket/layers" "github.com/gorilla/mux" . "github.com/weaveworks/weave/common" "github.com/weaveworks/weave/common/docker" diff --git a/router/ethernet_decoder.go b/router/ethernet_decoder.go index 6588c0ad..4fe0481a 100644 --- a/router/ethernet_decoder.go +++ b/router/ethernet_decoder.go @@ -2,8 +2,8 @@ package router import ( "bytes" - "code.google.com/p/gopacket" - "code.google.com/p/gopacket/layers" + "github.com/google/gopacket" + "github.com/google/gopacket/layers" "log" "net" ) diff --git a/router/forwarder.go b/router/forwarder.go index a4cec472..e3386936 100644 --- a/router/forwarder.go +++ b/router/forwarder.go @@ -1,8 +1,8 @@ package router import ( - "code.google.com/p/gopacket" - "code.google.com/p/gopacket/layers" + "github.com/google/gopacket" + "github.com/google/gopacket/layers" "syscall" "time" ) diff --git a/router/pcap.go b/router/pcap.go index 761d4e1d..2b2c3b5d 100644 --- a/router/pcap.go +++ b/router/pcap.go @@ -1,8 +1,8 @@ package router import ( - "code.google.com/p/gopacket/pcap" "fmt" + "github.com/google/gopacket/pcap" ) type PcapIO struct { diff --git a/router/router.go b/router/router.go index ab671a0d..141dfc38 100644 --- a/router/router.go +++ b/router/router.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "code.google.com/p/gopacket/layers" + "github.com/google/gopacket/layers" . "github.com/weaveworks/weave/common" ) diff --git a/router/udp_sender.go b/router/udp_sender.go index 9e91ee0b..e591c9dc 100644 --- a/router/udp_sender.go +++ b/router/udp_sender.go @@ -1,8 +1,8 @@ package router import ( - "code.google.com/p/gopacket" - "code.google.com/p/gopacket/layers" + "github.com/google/gopacket" + "github.com/google/gopacket/layers" "log" "net" "syscall" From bf73029d152537ec5dd4a50d99c9f61e82f6007c Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Fri, 3 Jul 2015 20:41:35 +0100 Subject: [PATCH 2/2] cosmetic: goimports -w . --- ipam/allocate.go | 1 + ipam/paxos/paxos.go | 1 + ipam/paxos/paxos_test.go | 3 ++- router/crypto.go | 7 ++++--- router/ethernet_decoder.go | 5 +++-- router/forwarder.go | 5 +++-- router/handshake_test.go | 3 ++- router/mocks_test.go | 3 ++- router/pcap.go | 1 + router/peers_test.go | 3 ++- router/udp_sender.go | 5 +++-- 11 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ipam/allocate.go b/ipam/allocate.go index f2da3c74..0e4a9e4b 100644 --- a/ipam/allocate.go +++ b/ipam/allocate.go @@ -2,6 +2,7 @@ package ipam import ( "fmt" + "github.com/weaveworks/weave/ipam/address" ) diff --git a/ipam/paxos/paxos.go b/ipam/paxos/paxos.go index a69b91da..61fda181 100644 --- a/ipam/paxos/paxos.go +++ b/ipam/paxos/paxos.go @@ -2,6 +2,7 @@ package paxos import ( "fmt" + "github.com/weaveworks/weave/router" ) diff --git a/ipam/paxos/paxos_test.go b/ipam/paxos/paxos_test.go index cd704c5c..c1d5bfe0 100644 --- a/ipam/paxos/paxos_test.go +++ b/ipam/paxos/paxos_test.go @@ -2,10 +2,11 @@ package paxos import ( "fmt" - "github.com/weaveworks/weave/router" "math/rand" "testing" "time" + + "github.com/weaveworks/weave/router" ) type TestNode struct { diff --git a/router/crypto.go b/router/crypto.go index 19b0bcfa..291603d1 100644 --- a/router/crypto.go +++ b/router/crypto.go @@ -1,15 +1,16 @@ package router import ( - "code.google.com/p/go-bit/bit" - "code.google.com/p/go.crypto/nacl/box" - "code.google.com/p/go.crypto/nacl/secretbox" "crypto/rand" "crypto/sha256" "encoding/binary" "encoding/gob" "fmt" "sync" + + "code.google.com/p/go-bit/bit" + "code.google.com/p/go.crypto/nacl/box" + "code.google.com/p/go.crypto/nacl/secretbox" ) func GenerateKeyPair() (publicKey, privateKey *[32]byte, err error) { diff --git a/router/ethernet_decoder.go b/router/ethernet_decoder.go index 4fe0481a..f04c53e4 100644 --- a/router/ethernet_decoder.go +++ b/router/ethernet_decoder.go @@ -2,10 +2,11 @@ package router import ( "bytes" - "github.com/google/gopacket" - "github.com/google/gopacket/layers" "log" "net" + + "github.com/google/gopacket" + "github.com/google/gopacket/layers" ) type EthernetDecoder struct { diff --git a/router/forwarder.go b/router/forwarder.go index e3386936..6c55c368 100644 --- a/router/forwarder.go +++ b/router/forwarder.go @@ -1,10 +1,11 @@ package router import ( - "github.com/google/gopacket" - "github.com/google/gopacket/layers" "syscall" "time" + + "github.com/google/gopacket" + "github.com/google/gopacket/layers" ) type ForwardedFrame struct { diff --git a/router/handshake_test.go b/router/handshake_test.go index a72bf17c..1630d343 100644 --- a/router/handshake_test.go +++ b/router/handshake_test.go @@ -1,8 +1,9 @@ package router import ( - wt "github.com/weaveworks/weave/testing" "testing" + + wt "github.com/weaveworks/weave/testing" ) func TestFieldValidator(t *testing.T) { diff --git a/router/mocks_test.go b/router/mocks_test.go index 674eaa3a..dc0ec6c3 100644 --- a/router/mocks_test.go +++ b/router/mocks_test.go @@ -6,8 +6,9 @@ package router import ( - wt "github.com/weaveworks/weave/testing" "testing" + + wt "github.com/weaveworks/weave/testing" ) // Add to peers a connection from peers.ourself to p diff --git a/router/pcap.go b/router/pcap.go index 2b2c3b5d..36962f20 100644 --- a/router/pcap.go +++ b/router/pcap.go @@ -2,6 +2,7 @@ package router import ( "fmt" + "github.com/google/gopacket/pcap" ) diff --git a/router/peers_test.go b/router/peers_test.go index daf1e944..bf221642 100644 --- a/router/peers_test.go +++ b/router/peers_test.go @@ -2,9 +2,10 @@ package router import ( "fmt" - wt "github.com/weaveworks/weave/testing" "math/rand" "testing" + + wt "github.com/weaveworks/weave/testing" ) // TODO we should also test: diff --git a/router/udp_sender.go b/router/udp_sender.go index e591c9dc..28ef917a 100644 --- a/router/udp_sender.go +++ b/router/udp_sender.go @@ -1,11 +1,12 @@ package router import ( - "github.com/google/gopacket" - "github.com/google/gopacket/layers" "log" "net" "syscall" + + "github.com/google/gopacket" + "github.com/google/gopacket/layers" ) type UDPSender interface {