diff --git a/go.mod b/go.mod index 1797fed..b87dce6 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,8 @@ go 1.16 require ( github.com/libp2p/go-libp2p v0.23.2 //github.com/libp2p/go-libp2p-connmgr v0.4.0 - github.com/libp2p/go-libp2p-core v0.20.0 github.com/libp2p/go-libp2p-kad-dht v0.18.0 - github.com/libp2p/go-libp2p-tls v0.5.0 github.com/libp2p/go-libp2p-yamux v0.10.0 - github.com/libp2p/go-tcp-transport v0.6.1 - github.com/libp2p/go-ws-transport v0.7.0 github.com/pion/udp v0.1.1 github.com/sparkymat/appdir v0.0.0-20190803090504-1c2ab64aee87 ) diff --git a/go.sum b/go.sum index 608c8ad..1c54fc6 100644 --- a/go.sum +++ b/go.sum @@ -509,8 +509,6 @@ github.com/libp2p/go-libp2p-testing v0.11.0/go.mod h1:qG4sF27dfKFoK9KlVzK2y52LQK github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA= github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg= github.com/libp2p/go-libp2p-tls v0.3.0/go.mod h1:fwF5X6PWGxm6IDRwF3V8AVCCj/hOd5oFlg+wo2FxJDY= -github.com/libp2p/go-libp2p-tls v0.5.0 h1:aRNTeOI8Ljm1r4L2uMGxkMsVnyZoPwaqQqMw23qAsQs= -github.com/libp2p/go-libp2p-tls v0.5.0/go.mod h1:1a4tq0xQSZ0kAkDkZVAppuP3SAIUHcnzi2djJ/2EN4I= github.com/libp2p/go-libp2p-transport-upgrader v0.7.0/go.mod h1:GIR2aTRp1J5yjVlkUoFqMkdobfob6RnAwYg/RZPhrzg= github.com/libp2p/go-libp2p-xor v0.1.0/go.mod h1:LSTM5yRnjGZbWNTA/hRwq2gGFrvRIbQJscoIL/u6InY= github.com/libp2p/go-libp2p-yamux v0.8.0/go.mod h1:yTkPgN2ib8FHyU1ZcVD7aelzyAqXXwEPbyx+aSKm9h8= @@ -544,10 +542,6 @@ github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2L github.com/libp2p/go-sockaddr v0.1.0/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k= github.com/libp2p/go-stream-muxer-multistream v0.4.0/go.mod h1:nb+dGViZleRP4XcyHuZSVrJCBl55nRBOMmiSL/dyziw= github.com/libp2p/go-tcp-transport v0.5.0/go.mod h1:UPPL0DIjQqiWRwVAb+CEQlaAG0rp/mCqJfIhFcLHc4Y= -github.com/libp2p/go-tcp-transport v0.6.1 h1:oLOEy8J9WuzaWpz9pi86lQz2E0A5DwuKASn4hXYIAkk= -github.com/libp2p/go-tcp-transport v0.6.1/go.mod h1:HjaB4sPkp5Qkd5l9f9cDJR8m0s2oJtY3tNHdAOioYeY= -github.com/libp2p/go-ws-transport v0.7.0 h1:TJYvBgWpPYAE5sN3V5y0cu7ivxGxzwvF/FhyYFnzkNs= -github.com/libp2p/go-ws-transport v0.7.0/go.mod h1:ZgC5TYCKUIUJTjgd5Mb17Tu3K0vFYB409nzRYGaJu0I= github.com/libp2p/go-yamux/v3 v3.0.1/go.mod h1:s2LsDhHbh+RfCsQoICSYt58U2f8ijtPANFD8BmE74Bo= github.com/libp2p/go-yamux/v3 v3.1.1/go.mod h1:jeLEQgLXqE2YqX1ilAClIfCMDY+0uXQUKmmb/qp0gT4= github.com/libp2p/go-yamux/v3 v3.1.2/go.mod h1:jeLEQgLXqE2YqX1ilAClIfCMDY+0uXQUKmmb/qp0gT4= diff --git a/p2pforwarder/forwarder.go b/p2pforwarder/forwarder.go index 48ad48d..14f323f 100644 --- a/p2pforwarder/forwarder.go +++ b/p2pforwarder/forwarder.go @@ -2,24 +2,25 @@ package p2pforwarder import ( "context" - "github.com/libp2p/go-libp2p-core/routing" - "github.com/libp2p/go-libp2p/p2p/net/connmgr" - "github.com/libp2p/go-libp2p/p2p/security/noise" + libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic" "io/ioutil" "os" "path/filepath" "sync" "time" + "github.com/libp2p/go-libp2p/core/routing" + "github.com/libp2p/go-libp2p/p2p/net/connmgr" + "github.com/libp2p/go-libp2p/p2p/security/noise" + "github.com/libp2p/go-libp2p" - "github.com/libp2p/go-libp2p-core/crypto" - "github.com/libp2p/go-libp2p-core/host" - "github.com/libp2p/go-libp2p-core/peer" dht "github.com/libp2p/go-libp2p-kad-dht" - libp2ptls "github.com/libp2p/go-libp2p-tls" yamux "github.com/libp2p/go-libp2p-yamux" - "github.com/libp2p/go-tcp-transport" - websocket "github.com/libp2p/go-ws-transport" + "github.com/libp2p/go-libp2p/core/crypto" + "github.com/libp2p/go-libp2p/core/host" + "github.com/libp2p/go-libp2p/core/peer" + libp2ptls "github.com/libp2p/go-libp2p/p2p/security/tls" + "github.com/libp2p/go-libp2p/p2p/transport/tcp" "github.com/sparkymat/appdir" ) @@ -173,9 +174,9 @@ func createLibp2pHost(ctx context.Context, priv crypto.PrivKey) (host.Host, erro "/ip6/::/tcp/0/ws", ), - //libp2p.Transport(libp2pquic.NewTransport), + libp2p.Transport(libp2pquic.NewTransport), libp2p.Transport(tcp.NewTCPTransport), - libp2p.Transport(websocket.New), + //libp2p.Transport(websocket.New), libp2p.Security(noise.ID, noise.New), libp2p.Security(libp2ptls.ID, libp2ptls.New), @@ -188,7 +189,6 @@ func createLibp2pHost(ctx context.Context, priv crypto.PrivKey) (host.Host, erro libp2p.ConnectionManager(connmgr), libp2p.EnableAutoRelay(), - libp2p.EnableRelay(), libp2p.DefaultPeerstore, libp2p.Routing(func(h host.Host) (routing.PeerRouting, error) { diff --git a/p2pforwarder/methods.go b/p2pforwarder/methods.go index 8cb987e..8c23808 100644 --- a/p2pforwarder/methods.go +++ b/p2pforwarder/methods.go @@ -6,7 +6,7 @@ import ( "strconv" "sync" - "github.com/libp2p/go-libp2p-core/peer" + "github.com/libp2p/go-libp2p/core/peer" ) var ( diff --git a/p2pforwarder/protdial.go b/p2pforwarder/protdial.go index e12e36e..37a9d64 100644 --- a/p2pforwarder/protdial.go +++ b/p2pforwarder/protdial.go @@ -10,9 +10,9 @@ import ( "strconv" "sync" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/protocol" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/protocol" "github.com/pion/udp" ) diff --git a/p2pforwarder/protportssub.go b/p2pforwarder/protportssub.go index f49a380..d5f3855 100644 --- a/p2pforwarder/protportssub.go +++ b/p2pforwarder/protportssub.go @@ -7,9 +7,9 @@ import ( "fmt" "io" - "github.com/libp2p/go-libp2p-core/network" - "github.com/libp2p/go-libp2p-core/peer" - "github.com/libp2p/go-libp2p-core/protocol" + "github.com/libp2p/go-libp2p/core/network" + "github.com/libp2p/go-libp2p/core/peer" + "github.com/libp2p/go-libp2p/core/protocol" ) const portssubProtID protocol.ID = "/p2pforwarder/portssub/1.0.0"