Merge pull request #713 from libp2p/chore/update-libp2p

chore: update deps

dht_filters_test.go

@@ -35,17 +35,17 @@ type mockConn struct {
 
 var _ network.Conn = (*mockConn)(nil)
 
-func (m *mockConn) ID() string                         { return "0" }
-func (m *mockConn) Close() error                       { return nil }
-func (m *mockConn) NewStream() (network.Stream, error) { return nil, nil }
-func (m *mockConn) GetStreams() []network.Stream       { return []network.Stream{} }
-func (m *mockConn) Stat() network.Stat                 { return network.Stat{Direction: network.DirOutbound} }
-func (m *mockConn) LocalMultiaddr() ma.Multiaddr       { return m.local.Addrs[0] }
-func (m *mockConn) RemoteMultiaddr() ma.Multiaddr      { return m.remote.Addrs[0] }
-func (m *mockConn) LocalPeer() peer.ID                 { return m.local.ID }
-func (m *mockConn) LocalPrivateKey() ic.PrivKey        { return nil }
-func (m *mockConn) RemotePeer() peer.ID                { return m.remote.ID }
-func (m *mockConn) RemotePublicKey() ic.PubKey         { return nil }
+func (m *mockConn) ID() string                                        { return "0" }
+func (m *mockConn) Close() error                                      { return nil }
+func (m *mockConn) NewStream(context.Context) (network.Stream, error) { return nil, nil }
+func (m *mockConn) GetStreams() []network.Stream                      { return []network.Stream{} }
+func (m *mockConn) Stat() network.Stat                                { return network.Stat{Direction: network.DirOutbound} }
+func (m *mockConn) LocalMultiaddr() ma.Multiaddr                      { return m.local.Addrs[0] }
+func (m *mockConn) RemoteMultiaddr() ma.Multiaddr                     { return m.remote.Addrs[0] }
+func (m *mockConn) LocalPeer() peer.ID                                { return m.local.ID }
+func (m *mockConn) LocalPrivateKey() ic.PrivKey                       { return nil }
+func (m *mockConn) RemotePeer() peer.ID                               { return m.remote.ID }
+func (m *mockConn) RemotePublicKey() ic.PubKey                        { return nil }
 
 func TestFilterCaching(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())

go.mod

@@ -3,33 +3,33 @@ module github.com/libp2p/go-libp2p-kad-dht
 go 1.14
 
 require (
-	github.com/gogo/protobuf v1.3.1
-	github.com/google/gopacket v1.1.18
-	github.com/google/uuid v1.1.2
-	github.com/hashicorp/go-multierror v1.1.0
+	github.com/gogo/protobuf v1.3.2
+	github.com/google/gopacket v1.1.19
+	github.com/google/uuid v1.2.0
+	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/ipfs/go-cid v0.0.7
 	github.com/ipfs/go-datastore v0.4.5
 	github.com/ipfs/go-detect-race v0.0.1
 	github.com/ipfs/go-ipfs-util v0.0.2
 	github.com/ipfs/go-ipns v0.0.2
-	github.com/ipfs/go-log v1.0.4
+	github.com/ipfs/go-log v1.0.5
 	github.com/jbenet/goprocess v0.1.4
 	github.com/libp2p/go-eventbus v0.2.1
-	github.com/libp2p/go-libp2p v0.12.0
-	github.com/libp2p/go-libp2p-core v0.7.0
+	github.com/libp2p/go-libp2p v0.13.0
+	github.com/libp2p/go-libp2p-core v0.8.0
 	github.com/libp2p/go-libp2p-kbucket v0.4.7
-	github.com/libp2p/go-libp2p-peerstore v0.2.6
+	github.com/libp2p/go-libp2p-peerstore v0.2.7
 	github.com/libp2p/go-libp2p-record v0.1.3
 	github.com/libp2p/go-libp2p-routing-helpers v0.2.3
-	github.com/libp2p/go-libp2p-swarm v0.3.1
-	github.com/libp2p/go-libp2p-testing v0.3.0
+	github.com/libp2p/go-libp2p-swarm v0.4.0
+	github.com/libp2p/go-libp2p-testing v0.4.0
 	github.com/libp2p/go-msgio v0.0.6
-	github.com/libp2p/go-netroute v0.1.3
+	github.com/libp2p/go-netroute v0.1.6
 	github.com/multiformats/go-base32 v0.0.3
 	github.com/multiformats/go-multiaddr v0.3.1
 	github.com/multiformats/go-multibase v0.0.3
-	github.com/multiformats/go-multihash v0.0.14
+	github.com/multiformats/go-multihash v0.0.15
 	github.com/multiformats/go-multistream v0.2.0
 	github.com/stretchr/testify v1.6.1
 	github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1

pb/dht.pb.go

@@ -721,10 +721,7 @@ func (m *Message) Unmarshal(dAtA []byte) error {
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthDht
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthDht
 			}
 			if (iNdEx + skippy) > l {
@@ -859,10 +856,7 @@ func (m *Message_Peer) Unmarshal(dAtA []byte) error {
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthDht
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthDht
 			}
 			if (iNdEx + skippy) > l {