Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
p2p
go-p2p-swarm
Commits
0f020c3c
Commit
0f020c3c
authored
Dec 06, 2015
by
Jeromy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP
parent
541f98e5
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
44 additions
and
44 deletions
+44
-44
addr/addr.go
addr/addr.go
+4
-4
addr/addr_test.go
addr/addr_test.go
+2
-2
dial_test.go
dial_test.go
+3
-3
peers_test.go
peers_test.go
+2
-2
simul_test.go
simul_test.go
+2
-2
swarm.go
swarm.go
+10
-10
swarm_addr.go
swarm_addr.go
+1
-1
swarm_addr_test.go
swarm_addr_test.go
+2
-2
swarm_conn.go
swarm_conn.go
+3
-3
swarm_dial.go
swarm_dial.go
+3
-3
swarm_listen.go
swarm_listen.go
+3
-3
swarm_net.go
swarm_net.go
+3
-3
swarm_net_test.go
swarm_net_test.go
+1
-1
swarm_notif_test.go
swarm_notif_test.go
+2
-2
swarm_stream.go
swarm_stream.go
+1
-1
swarm_test.go
swarm_test.go
+2
-2
No files found.
addr/addr.go
View file @
0f020c3c
...
@@ -3,11 +3,11 @@ package addrutil
...
@@ -3,11 +3,11 @@ package addrutil
import
(
import
(
"fmt"
"fmt"
logging
"g
x/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu
/go-log"
logging
"g
ithub.com/ipfs
/go-log"
ma
net
"gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2
/go-multiaddr
-net
"
ma
"github.com/jbenet
/go-multiaddr"
ma
"gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj
/go-multiaddr"
ma
net
"github.com/jbenet
/go-multiaddr
-net
"
context
"g
x/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUc
t/context"
context
"g
olang.org/x/ne
t/context"
)
)
var
log
=
logging
.
Logger
(
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
)
var
log
=
logging
.
Logger
(
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
)
...
...
addr/addr_test.go
View file @
0f020c3c
...
@@ -3,8 +3,8 @@ package addrutil
...
@@ -3,8 +3,8 @@ package addrutil
import
(
import
(
"testing"
"testing"
ma
net
"gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2
/go-multiaddr
-net
"
ma
"github.com/jbenet
/go-multiaddr"
ma
"gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj
/go-multiaddr"
ma
net
"github.com/jbenet
/go-multiaddr
-net
"
)
)
func
newMultiaddr
(
t
*
testing
.
T
,
s
string
)
ma
.
Multiaddr
{
func
newMultiaddr
(
t
*
testing
.
T
,
s
string
)
ma
.
Multiaddr
{
...
...
dial_test.go
View file @
0f020c3c
...
@@ -13,9 +13,9 @@ import (
...
@@ -13,9 +13,9 @@ import (
testutil
"github.com/ipfs/go-libp2p/testutil"
testutil
"github.com/ipfs/go-libp2p/testutil"
ci
"github.com/ipfs/go-libp2p/testutil/ci"
ci
"github.com/ipfs/go-libp2p/testutil/ci"
ma
net
"gx/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2
/go-multiaddr
-net
"
ma
"github.com/jbenet
/go-multiaddr"
ma
"gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj
/go-multiaddr"
ma
net
"github.com/jbenet
/go-multiaddr
-net
"
context
"g
x/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUc
t/context"
context
"g
olang.org/x/ne
t/context"
)
)
func
acceptAndHang
(
l
net
.
Listener
)
{
func
acceptAndHang
(
l
net
.
Listener
)
{
...
...
peers_test.go
View file @
0f020c3c
...
@@ -5,8 +5,8 @@ import (
...
@@ -5,8 +5,8 @@ import (
peer
"github.com/ipfs/go-libp2p/p2p/peer"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
ma
"g
x/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj
/go-multiaddr"
ma
"g
ithub.com/jbenet
/go-multiaddr"
context
"g
x/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUc
t/context"
context
"g
olang.org/x/ne
t/context"
)
)
func
TestPeers
(
t
*
testing
.
T
)
{
func
TestPeers
(
t
*
testing
.
T
)
{
...
...
simul_test.go
View file @
0f020c3c
...
@@ -9,8 +9,8 @@ import (
...
@@ -9,8 +9,8 @@ import (
peer
"github.com/ipfs/go-libp2p/p2p/peer"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
ci
"github.com/ipfs/go-libp2p/testutil/ci"
ci
"github.com/ipfs/go-libp2p/testutil/ci"
ma
"g
x/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj
/go-multiaddr"
ma
"g
ithub.com/jbenet
/go-multiaddr"
context
"g
x/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUc
t/context"
context
"g
olang.org/x/ne
t/context"
)
)
func
TestSimultOpen
(
t
*
testing
.
T
)
{
func
TestSimultOpen
(
t
*
testing
.
T
)
{
...
...
swarm.go
View file @
0f020c3c
...
@@ -16,16 +16,16 @@ import (
...
@@ -16,16 +16,16 @@ import (
transport
"github.com/ipfs/go-libp2p/p2p/net/transport"
transport
"github.com/ipfs/go-libp2p/p2p/net/transport"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
ps
"g
x/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream
"
ma
"g
ithub.com/jbenet/go-multiaddr
"
ps
t
"g
x/QmRmT6MSnfhRDW1PTUGSd3z4fqXK48GUequQAZzeT4c5iC/go-stream-muxer
"
ps
"g
ithub.com/jbenet/go-peerstream
"
ps
mss
"gx/QmRmT6MSnfhRDW1PTUGSd3z4fqXK48GUequQAZzeT4c5iC
/go-stream-muxer
/multistream
"
ps
t
"github.com/jbenet
/go-stream-muxer"
mafilter
"gx/QmVCmuhgDFer5MW5737Z8GtBEGpUyEkFnLUv4ASDWnLZdC/multiaddr-filter
"
psmss
"github.com/jbenet/go-stream-muxer/multistream
"
ma
"gx/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr
"
"github.com/jbenet/goprocess
"
context
"gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct
/context"
goprocessctx
"github.com/jbenet/goprocess
/context"
"gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess
"
mafilter
"github.com/whyrusleeping/multiaddr-filter
"
goprocessctx
"gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess
/context"
context
"golang.org/x/net
/context"
logging
"g
x/QmfZZB1aVXWA4kaR5R4e9NifERT366TTCSagkfhmAbYLsu
/go-log"
logging
"g
ithub.com/ipfs
/go-log"
)
)
var
log
=
logging
.
Logger
(
"swarm2"
)
var
log
=
logging
.
Logger
(
"swarm2"
)
...
...
swarm_addr.go
View file @
0f020c3c
...
@@ -4,7 +4,7 @@ import (
...
@@ -4,7 +4,7 @@ import (
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
addrutil
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
addrutil
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
ma
"g
x/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj
/go-multiaddr"
ma
"g
ithub.com/jbenet
/go-multiaddr"
)
)
// ListenAddresses returns a list of addresses at which this swarm listens.
// ListenAddresses returns a list of addresses at which this swarm listens.
...
...
swarm_addr_test.go
View file @
0f020c3c
...
@@ -8,8 +8,8 @@ import (
...
@@ -8,8 +8,8 @@ import (
peer
"github.com/ipfs/go-libp2p/p2p/peer"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
testutil
"github.com/ipfs/go-libp2p/testutil"
testutil
"github.com/ipfs/go-libp2p/testutil"
ma
"g
x/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj
/go-multiaddr"
ma
"g
ithub.com/jbenet
/go-multiaddr"
context
"g
x/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUc
t/context"
context
"g
olang.org/x/ne
t/context"
)
)
func
TestFilterAddrs
(
t
*
testing
.
T
)
{
func
TestFilterAddrs
(
t
*
testing
.
T
)
{
...
...
swarm_conn.go
View file @
0f020c3c
...
@@ -8,9 +8,9 @@ import (
...
@@ -8,9 +8,9 @@ import (
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
ps
"g
x/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream
"
ma
"g
ithub.com/jbenet/go-multiaddr
"
ma
"g
x/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr
"
ps
"g
ithub.com/jbenet/go-peerstream
"
context
"g
x/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUc
t/context"
context
"g
olang.org/x/ne
t/context"
)
)
// a Conn is a simple wrapper around a ps.Conn that also exposes
// a Conn is a simple wrapper around a ps.Conn that also exposes
...
...
swarm_dial.go
View file @
0f020c3c
...
@@ -12,10 +12,10 @@ import (
...
@@ -12,10 +12,10 @@ import (
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
addrutil
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
addrutil
"github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
"g
x/QmNT7d1e4Xcp3KcsvxyzUHVtqrR43uypoxLLzdKj6YZga2
/go-multiaddr-net"
"g
ithub.com/jbenet
/go-multiaddr-net"
ma
"g
x/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj
/go-multiaddr"
ma
"g
ithub.com/jbenet
/go-multiaddr"
context
"g
x/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUc
t/context"
context
"g
olang.org/x/ne
t/context"
)
)
// Diagram of dial sync:
// Diagram of dial sync:
...
...
swarm_listen.go
View file @
0f020c3c
...
@@ -9,9 +9,9 @@ import (
...
@@ -9,9 +9,9 @@ import (
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
conn
"github.com/ipfs/go-libp2p/p2p/net/conn"
transport
"github.com/ipfs/go-libp2p/p2p/net/transport"
transport
"github.com/ipfs/go-libp2p/p2p/net/transport"
ps
"g
x/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT/go-peerstream
"
ma
"g
ithub.com/jbenet/go-multiaddr
"
ma
"g
x/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj/go-multiaddr
"
ps
"g
ithub.com/jbenet/go-peerstream
"
context
"g
x/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUc
t/context"
context
"g
olang.org/x/ne
t/context"
)
)
// Open listeners and reuse-dialers for the given addresses
// Open listeners and reuse-dialers for the given addresses
...
...
swarm_net.go
View file @
0f020c3c
...
@@ -8,9 +8,9 @@ import (
...
@@ -8,9 +8,9 @@ import (
metrics
"github.com/ipfs/go-libp2p/p2p/metrics"
metrics
"github.com/ipfs/go-libp2p/p2p/metrics"
inet
"github.com/ipfs/go-libp2p/p2p/net"
inet
"github.com/ipfs/go-libp2p/p2p/net"
ma
"g
x/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj
/go-multiaddr"
ma
"g
ithub.com/jbenet
/go-multiaddr"
context
"gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context
"
"github.com/jbenet/goprocess
"
"gx/QmfDXyLfKNfja2XebomRZjZ2UZCa4BDyFoCymKtzNRVQ5b/goprocess
"
context
"golang.org/x/net/context
"
)
)
// Network implements the inet.Network interface.
// Network implements the inet.Network interface.
...
...
swarm_net_test.go
View file @
0f020c3c
...
@@ -5,9 +5,9 @@ import (
...
@@ -5,9 +5,9 @@ import (
"testing"
"testing"
"time"
"time"
context
"gx/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
inet
"github.com/ipfs/go-libp2p/p2p/net"
inet
"github.com/ipfs/go-libp2p/p2p/net"
testutil
"github.com/ipfs/go-libp2p/p2p/test/util"
testutil
"github.com/ipfs/go-libp2p/p2p/test/util"
context
"golang.org/x/net/context"
)
)
// TestConnectednessCorrect starts a few networks, connects a few
// TestConnectednessCorrect starts a few networks, connects a few
...
...
swarm_notif_test.go
View file @
0f020c3c
...
@@ -4,8 +4,8 @@ import (
...
@@ -4,8 +4,8 @@ import (
"testing"
"testing"
"time"
"time"
ma
"g
x/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj
/go-multiaddr"
ma
"g
ithub.com/jbenet
/go-multiaddr"
context
"g
x/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUc
t/context"
context
"g
olang.org/x/ne
t/context"
inet
"github.com/ipfs/go-libp2p/p2p/net"
inet
"github.com/ipfs/go-libp2p/p2p/net"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
...
...
swarm_stream.go
View file @
0f020c3c
...
@@ -3,7 +3,7 @@ package swarm
...
@@ -3,7 +3,7 @@ package swarm
import
(
import
(
inet
"github.com/ipfs/go-libp2p/p2p/net"
inet
"github.com/ipfs/go-libp2p/p2p/net"
ps
"g
x/QmQMkNFMuh1UJbdaggASZpLtCroTnAYcWNenYL5hrzLJrT
/go-peerstream"
ps
"g
ithub.com/jbenet
/go-peerstream"
)
)
// a Stream is a wrapper around a ps.Stream that exposes a way to get
// a Stream is a wrapper around a ps.Stream that exposes a way to get
...
...
swarm_test.go
View file @
0f020c3c
...
@@ -14,8 +14,8 @@ import (
...
@@ -14,8 +14,8 @@ import (
peer
"github.com/ipfs/go-libp2p/p2p/peer"
peer
"github.com/ipfs/go-libp2p/p2p/peer"
testutil
"github.com/ipfs/go-libp2p/testutil"
testutil
"github.com/ipfs/go-libp2p/testutil"
ma
"g
x/QmVUi2ncqnU48zsPgR1rQosDGwY3SSZ1Ndp33j33YjXdsj
/go-multiaddr"
ma
"g
ithub.com/jbenet
/go-multiaddr"
context
"g
x/QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUc
t/context"
context
"g
olang.org/x/ne
t/context"
)
)
func
EchoStreamHandler
(
stream
inet
.
Stream
)
{
func
EchoStreamHandler
(
stream
inet
.
Stream
)
{
...
...
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