Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
go-libp2p
Commits
b6aff366
Commit
b6aff366
authored
8 years ago
by
Jeromy Johnson
Committed by
GitHub
8 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #126 from libp2p/feat/use-stdlib-ctx
switch to using stdlib context package
parents
87b0e200
4dd30d82
master
2018-Q4-OKR
docs-improvements
feat/p2p-multiaddr
feat/pnet/working3
feat/protobuf
feat/relay-integrate
feat/udp
feature/standardize-readme
fix/473
fix/no-custom-field
fix/reset-ping-stream
fix/revert-correct-external-addr
gx/update-jccl6u
gx/update-nza0mn
jenkinsfile
kevina/fix-go-vet
multistream-ping
punching
revert-276-update-go-detect-race
v6.0.23
v6.0.22
v6.0.21
v6.0.20
v6.0.19
v6.0.18
v6.0.17
v6.0.16
v6.0.15
v6.0.14
v6.0.13
v6.0.12
v6.0.11
v6.0.10
v6.0.9
v6.0.8
v6.0.7
v6.0.6
v6.0.5
v6.0.4
v6.0.3
v6.0.2
v6.0.1
v6.0.0
v5.0.21
v5.0.20
v5.0.19
v5.0.18
v5.0.17
v5.0.16
v5.0.15
v5.0.14
v5.0.13
v5.0.12
v5.0.11
v5.0.10
v5.0.9
v5.0.8
v5.0.7
v5.0.6
v5.0.5
v5.0.4
v5.0.3
v5.0.2
v5.0.1
v5.0.0
v4.5.5
v4.5.4
v4.5.3
v4.5.2
v4.5.1
v4.5.0
v4.4.5
v4.4.4
v4.4.3
v4.4.2
v4.4.1
v4.4.0
v4.3.12
v4.3.11
v4.3.10
v4.3.9
v4.3.8
v4.3.7
v4.3.6
v4.3.5
v4.3.4
v4.3.3
v4.3.2
v4.3.1
v4.3.0
v4.2.0
v4.1.0
v4.0.4
v4.0.3
v4.0.2
v4.0.1
v4.0.0
v3.6.0
No related merge requests found
Changes
40
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
examples/hosts/main.go
+1
-1
examples/hosts/main.go
p2p/host/basic/basic_host.go
+1
-1
p2p/host/basic/basic_host.go
p2p/host/basic/basic_host_test.go
+1
-2
p2p/host/basic/basic_host_test.go
p2p/host/basic/natmgr.go
+1
-1
p2p/host/basic/natmgr.go
p2p/host/host.go
+2
-1
p2p/host/host.go
p2p/host/routed/routed.go
+1
-1
p2p/host/routed/routed.go
p2p/net/conn/conn.go
+1
-1
p2p/net/conn/conn.go
p2p/net/conn/conn_test.go
+1
-1
p2p/net/conn/conn_test.go
p2p/net/conn/dial.go
+1
-1
p2p/net/conn/dial.go
p2p/net/conn/dial_test.go
+1
-1
p2p/net/conn/dial_test.go
p2p/net/conn/listen.go
+1
-1
p2p/net/conn/listen.go
p2p/net/conn/secure_conn.go
+1
-1
p2p/net/conn/secure_conn.go
p2p/net/conn/secure_conn_test.go
+1
-2
p2p/net/conn/secure_conn_test.go
p2p/net/interface.go
+1
-1
p2p/net/interface.go
p2p/net/mock/mock.go
+2
-1
p2p/net/mock/mock.go
p2p/net/mock/mock_net.go
+1
-1
p2p/net/mock/mock_net.go
p2p/net/mock/mock_notif_test.go
+1
-1
p2p/net/mock/mock_notif_test.go
p2p/net/mock/mock_peernet.go
+1
-1
p2p/net/mock/mock_peernet.go
p2p/net/mock/mock_test.go
+1
-1
p2p/net/mock/mock_test.go
p2p/net/swarm/addr/addr.go
+1
-1
p2p/net/swarm/addr/addr.go
with
22 additions
and
22 deletions
+22
-22
examples/hosts/main.go
View file @
b6aff366
package
main
import
(
"context"
"flag"
"fmt"
"io/ioutil"
...
...
@@ -17,7 +18,6 @@ import (
testutil
"github.com/libp2p/go-libp2p/testutil"
ma
"github.com/jbenet/go-multiaddr"
context
"golang.org/x/net/context"
)
// create a 'Host' with a random peer to listen on the given address
...
...
This diff is collapsed.
Click to expand it.
p2p/host/basic/basic_host.go
View file @
b6aff366
package
basichost
import
(
"context"
"io"
"time"
...
...
@@ -15,7 +16,6 @@ import (
protocol
"github.com/libp2p/go-libp2p/p2p/protocol"
identify
"github.com/libp2p/go-libp2p/p2p/protocol/identify"
relay
"github.com/libp2p/go-libp2p/p2p/protocol/relay"
context
"golang.org/x/net/context"
msmux
"github.com/whyrusleeping/go-multistream"
)
...
...
This diff is collapsed.
Click to expand it.
p2p/host/basic/basic_host_test.go
View file @
b6aff366
...
...
@@ -2,6 +2,7 @@ package basichost_test
import
(
"bytes"
"context"
"io"
"testing"
"time"
...
...
@@ -10,8 +11,6 @@ import (
inet
"github.com/libp2p/go-libp2p/p2p/net"
protocol
"github.com/libp2p/go-libp2p/p2p/protocol"
testutil
"github.com/libp2p/go-libp2p/p2p/test/util"
context
"golang.org/x/net/context"
)
func
TestHostSimple
(
t
*
testing
.
T
)
{
...
...
This diff is collapsed.
Click to expand it.
p2p/host/basic/natmgr.go
View file @
b6aff366
package
basichost
import
(
"context"
"sync"
lgbl
"github.com/ipfs/go-libp2p-loggables"
...
...
@@ -8,7 +9,6 @@ import (
goprocess
"github.com/jbenet/goprocess"
inat
"github.com/libp2p/go-libp2p/p2p/nat"
inet
"github.com/libp2p/go-libp2p/p2p/net"
context
"golang.org/x/net/context"
)
// natManager takes care of adding + removing port mappings to the nat.
...
...
This diff is collapsed.
Click to expand it.
p2p/host/host.go
View file @
b6aff366
package
host
import
(
"context"
peer
"github.com/ipfs/go-libp2p-peer"
pstore
"github.com/ipfs/go-libp2p-peerstore"
logging
"github.com/ipfs/go-log"
...
...
@@ -9,7 +11,6 @@ import (
inet
"github.com/libp2p/go-libp2p/p2p/net"
protocol
"github.com/libp2p/go-libp2p/p2p/protocol"
msmux
"github.com/whyrusleeping/go-multistream"
context
"golang.org/x/net/context"
)
var
log
=
logging
.
Logger
(
"github.com/libp2p/go-libp2p/p2p/host"
)
...
...
This diff is collapsed.
Click to expand it.
p2p/host/routed/routed.go
View file @
b6aff366
package
routedhost
import
(
"context"
"fmt"
"time"
...
...
@@ -13,7 +14,6 @@ import (
metrics
"github.com/libp2p/go-libp2p/p2p/metrics"
inet
"github.com/libp2p/go-libp2p/p2p/net"
protocol
"github.com/libp2p/go-libp2p/p2p/protocol"
context
"golang.org/x/net/context"
msmux
"github.com/whyrusleeping/go-multistream"
)
...
...
This diff is collapsed.
Click to expand it.
p2p/net/conn/conn.go
View file @
b6aff366
package
conn
import
(
"context"
"fmt"
"io"
"net"
...
...
@@ -14,7 +15,6 @@ import (
mpool
"github.com/jbenet/go-msgio/mpool"
ma
"github.com/jbenet/go-multiaddr"
manet
"github.com/jbenet/go-multiaddr-net"
context
"golang.org/x/net/context"
)
var
log
=
logging
.
Logger
(
"conn"
)
...
...
This diff is collapsed.
Click to expand it.
p2p/net/conn/conn_test.go
View file @
b6aff366
...
...
@@ -8,9 +8,9 @@ import (
"testing"
"time"
"context"
msgio
"github.com/jbenet/go-msgio"
travis
"github.com/libp2p/go-libp2p/testutil/ci/travis"
context
"golang.org/x/net/context"
)
func
msgioWrap
(
c
Conn
)
msgio
.
ReadWriter
{
...
...
This diff is collapsed.
Click to expand it.
p2p/net/conn/dial.go
View file @
b6aff366
...
...
@@ -6,6 +6,7 @@ import (
"strings"
"time"
"context"
ci
"github.com/ipfs/go-libp2p-crypto"
lgbl
"github.com/ipfs/go-libp2p-loggables"
peer
"github.com/ipfs/go-libp2p-peer"
...
...
@@ -14,7 +15,6 @@ import (
transport
"github.com/libp2p/go-libp2p-transport"
addrutil
"github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
msmux
"github.com/whyrusleeping/go-multistream"
context
"golang.org/x/net/context"
)
type
WrapFunc
func
(
transport
.
Conn
)
transport
.
Conn
...
...
This diff is collapsed.
Click to expand it.
p2p/net/conn/dial_test.go
View file @
b6aff366
...
...
@@ -17,10 +17,10 @@ import (
tu
"github.com/libp2p/go-libp2p/testutil"
tcpt
"github.com/libp2p/go-tcp-transport"
"context"
ma
"github.com/jbenet/go-multiaddr"
msmux
"github.com/whyrusleeping/go-multistream"
grc
"github.com/whyrusleeping/gorocheck"
context
"golang.org/x/net/context"
)
func
goroFilter
(
r
*
grc
.
Goroutine
)
bool
{
...
...
This diff is collapsed.
Click to expand it.
p2p/net/conn/listen.go
View file @
b6aff366
package
conn
import
(
"context"
"fmt"
"io"
"net"
...
...
@@ -16,7 +17,6 @@ import (
transport
"github.com/libp2p/go-libp2p-transport"
filter
"github.com/libp2p/go-libp2p/p2p/net/filter"
msmux
"github.com/whyrusleeping/go-multistream"
context
"golang.org/x/net/context"
)
const
(
...
...
This diff is collapsed.
Click to expand it.
p2p/net/conn/secure_conn.go
View file @
b6aff366
package
conn
import
(
"context"
"errors"
"net"
"time"
...
...
@@ -9,7 +10,6 @@ import (
peer
"github.com/ipfs/go-libp2p-peer"
secio
"github.com/ipfs/go-libp2p-secio"
ma
"github.com/jbenet/go-multiaddr"
context
"golang.org/x/net/context"
)
// secureConn wraps another Conn object with an encrypted channel.
...
...
This diff is collapsed.
Click to expand it.
p2p/net/conn/secure_conn_test.go
View file @
b6aff366
...
...
@@ -2,6 +2,7 @@ package conn
import
(
"bytes"
"context"
"runtime"
"sync"
"testing"
...
...
@@ -9,8 +10,6 @@ import (
ic
"github.com/ipfs/go-libp2p-crypto"
travis
"github.com/libp2p/go-libp2p/testutil/ci/travis"
context
"golang.org/x/net/context"
)
func
upgradeToSecureConn
(
t
*
testing
.
T
,
ctx
context
.
Context
,
sk
ic
.
PrivKey
,
c
Conn
)
(
Conn
,
error
)
{
...
...
This diff is collapsed.
Click to expand it.
p2p/net/interface.go
View file @
b6aff366
package
net
import
(
"context"
"io"
peer
"github.com/ipfs/go-libp2p-peer"
...
...
@@ -9,7 +10,6 @@ import (
"github.com/jbenet/goprocess"
conn
"github.com/libp2p/go-libp2p/p2p/net/conn"
protocol
"github.com/libp2p/go-libp2p/p2p/protocol"
context
"golang.org/x/net/context"
)
// MessageSizeMax is a soft (recommended) maximum for network messages.
...
...
This diff is collapsed.
Click to expand it.
p2p/net/mock/mock.go
View file @
b6aff366
package
mocknet
import
(
"context"
logging
"github.com/ipfs/go-log"
context
"golang.org/x/net/context"
)
var
log
=
logging
.
Logger
(
"mocknet"
)
...
...
This diff is collapsed.
Click to expand it.
p2p/net/mock/mock_net.go
View file @
b6aff366
...
...
@@ -11,13 +11,13 @@ import (
p2putil
"github.com/libp2p/go-libp2p/p2p/test/util"
testutil
"github.com/libp2p/go-libp2p/testutil"
"context"
ic
"github.com/ipfs/go-libp2p-crypto"
peer
"github.com/ipfs/go-libp2p-peer"
pstore
"github.com/ipfs/go-libp2p-peerstore"
ma
"github.com/jbenet/go-multiaddr"
"github.com/jbenet/goprocess"
goprocessctx
"github.com/jbenet/goprocess/context"
context
"golang.org/x/net/context"
)
// mocknet implements mocknet.Mocknet
...
...
This diff is collapsed.
Click to expand it.
p2p/net/mock/mock_notif_test.go
View file @
b6aff366
package
mocknet
import
(
"context"
"testing"
"time"
peer
"github.com/ipfs/go-libp2p-peer"
ma
"github.com/jbenet/go-multiaddr"
inet
"github.com/libp2p/go-libp2p/p2p/net"
context
"golang.org/x/net/context"
)
func
TestNotifications
(
t
*
testing
.
T
)
{
...
...
This diff is collapsed.
Click to expand it.
p2p/net/mock/mock_peernet.go
View file @
b6aff366
...
...
@@ -7,12 +7,12 @@ import (
inet
"github.com/libp2p/go-libp2p/p2p/net"
"context"
peer
"github.com/ipfs/go-libp2p-peer"
pstore
"github.com/ipfs/go-libp2p-peerstore"
ma
"github.com/jbenet/go-multiaddr"
"github.com/jbenet/goprocess"
goprocessctx
"github.com/jbenet/goprocess/context"
context
"golang.org/x/net/context"
)
// peernet implements inet.Network
...
...
This diff is collapsed.
Click to expand it.
p2p/net/mock/mock_test.go
View file @
b6aff366
...
...
@@ -14,8 +14,8 @@ import (
protocol
"github.com/libp2p/go-libp2p/p2p/protocol"
testutil
"github.com/libp2p/go-libp2p/testutil"
"context"
detectrace
"github.com/jbenet/go-detect-race"
context
"golang.org/x/net/context"
)
func
randPeer
(
t
*
testing
.
T
)
peer
.
ID
{
...
...
This diff is collapsed.
Click to expand it.
p2p/net/swarm/addr/addr.go
View file @
b6aff366
...
...
@@ -3,10 +3,10 @@ package addrutil
import
(
"fmt"
"context"
logging
"github.com/ipfs/go-log"
ma
"github.com/jbenet/go-multiaddr"
manet
"github.com/jbenet/go-multiaddr-net"
context
"golang.org/x/net/context"
_
"github.com/whyrusleeping/ws-transport"
)
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help