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
978b186d
Commit
978b186d
authored
8 years ago
by
Jeromy
Browse files
Options
Download
Email Patches
Plain Diff
swarm: refactor to make modular construction easier
parent
40a5c58c
master
2018-Q4-OKR
docs-improvements
feat/p2p-multiaddr
feat/pnet/working3
feat/protobuf
feat/relay-integrate
feat/udp
feat/update/go-reuseport
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
v3.5.4
v3.5.3
v3.5.2
v3.5.1
v3.5.0
v3.4.3
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
p2p/net/conn/dial.go
+1
-1
p2p/net/conn/dial.go
p2p/net/conn/dial_test.go
+2
-4
p2p/net/conn/dial_test.go
p2p/net/conn/listen.go
+1
-1
p2p/net/conn/listen.go
p2p/net/swarm/swarm.go
+33
-6
p2p/net/swarm/swarm.go
p2p/net/swarm/swarm_listen.go
+31
-25
p2p/net/swarm/swarm_listen.go
with
68 additions
and
37 deletions
+68
-37
p2p/net/conn/dial.go
View file @
978b186d
...
...
@@ -65,7 +65,7 @@ func (d *Dialer) Dial(ctx context.Context, raddr ma.Multiaddr, remote peer.ID) (
}
cryptoProtoChoice
:=
SecioTag
if
!
EncryptConnections
{
if
!
EncryptConnections
||
d
.
PrivateKey
==
nil
{
cryptoProtoChoice
=
NoEncryptionTag
}
...
...
This diff is collapsed.
Click to expand it.
p2p/net/conn/dial_test.go
View file @
978b186d
...
...
@@ -259,8 +259,8 @@ func testDialerCloseEarly(t *testing.T, secure bool) {
// lol nesting
d2
:=
&
Dialer
{
LocalPeer
:
p2
.
ID
,
//
PrivateKey:
k
ey
2
, -- dont give it key. we'll just close the conn.
LocalPeer
:
p2
.
ID
,
PrivateKey
:
p2
.
PrivK
ey
,
//
-- dont give it key. we'll just close the conn.
}
d2
.
AddDialer
(
dialer
(
t
,
p2
.
Addr
))
...
...
@@ -527,7 +527,6 @@ func TestConcurrentAccept(t *testing.T) {
err
=
grc
.
CheckForLeaks
(
goroFilter
)
if
err
!=
nil
{
panic
(
err
)
t
.
Fatal
(
err
)
}
}
...
...
@@ -644,7 +643,6 @@ func TestConnectionTimeouts(t *testing.T) {
err
=
grc
.
CheckForLeaks
(
goroFilter
)
if
err
!=
nil
{
panic
(
err
)
t
.
Fatal
(
err
)
}
}
This diff is collapsed.
Click to expand it.
p2p/net/conn/listen.go
View file @
978b186d
...
...
@@ -211,7 +211,7 @@ func WrapTransportListener(ctx context.Context, ml transport.Listener, local pee
return
false
}
if
EncryptConnections
{
if
EncryptConnections
&&
sk
!=
nil
{
l
.
mux
.
AddHandler
(
SecioTag
,
nil
)
}
else
{
l
.
mux
.
AddHandler
(
NoEncryptionTag
,
nil
)
...
...
This diff is collapsed.
Click to expand it.
p2p/net/swarm/swarm.go
View file @
978b186d
...
...
@@ -10,6 +10,14 @@ import (
"sync"
"time"
metrics
"github.com/libp2p/go-libp2p/p2p/metrics"
mconn
"github.com/libp2p/go-libp2p/p2p/metrics/conn"
inet
"github.com/libp2p/go-libp2p/p2p/net"
conn
"github.com/libp2p/go-libp2p/p2p/net/conn"
filter
"github.com/libp2p/go-libp2p/p2p/net/filter"
addrutil
"github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
ci
"github.com/ipfs/go-libp2p-crypto"
peer
"github.com/ipfs/go-libp2p-peer"
pstore
"github.com/ipfs/go-libp2p-peerstore"
transport
"github.com/ipfs/go-libp2p-transport"
...
...
@@ -19,12 +27,6 @@ import (
pst
"github.com/jbenet/go-stream-muxer"
"github.com/jbenet/goprocess"
goprocessctx
"github.com/jbenet/goprocess/context"
metrics
"github.com/libp2p/go-libp2p/p2p/metrics"
mconn
"github.com/libp2p/go-libp2p/p2p/metrics/conn"
inet
"github.com/libp2p/go-libp2p/p2p/net"
conn
"github.com/libp2p/go-libp2p/p2p/net/conn"
filter
"github.com/libp2p/go-libp2p/p2p/net/filter"
addrutil
"github.com/libp2p/go-libp2p/p2p/net/swarm/addr"
psmss
"github.com/whyrusleeping/go-smux-multistream"
spdy
"github.com/whyrusleeping/go-smux-spdystream"
yamux
"github.com/whyrusleeping/go-smux-yamux"
...
...
@@ -143,6 +145,31 @@ func NewSwarm(ctx context.Context, listenAddrs []ma.Multiaddr,
return
s
,
nil
}
func
NewBlankSwarm
(
ctx
context
.
Context
,
id
peer
.
ID
,
privkey
ci
.
PrivKey
)
*
Swarm
{
s
:=
&
Swarm
{
swarm
:
ps
.
NewSwarm
(
PSTransport
),
local
:
id
,
peers
:
pstore
.
NewPeerstore
(),
ctx
:
ctx
,
dialT
:
DialTimeout
,
notifs
:
make
(
map
[
inet
.
Notifiee
]
ps
.
Notifiee
),
fdRateLimit
:
make
(
chan
struct
{},
concurrentFdDials
),
Filters
:
filter
.
NewFilters
(),
dialer
:
conn
.
NewDialer
(
id
,
privkey
,
nil
),
}
// configure Swarm
s
.
limiter
=
newDialLimiter
(
s
.
dialAddr
)
s
.
proc
=
goprocessctx
.
WithContextAndTeardown
(
ctx
,
s
.
teardown
)
s
.
SetConnHandler
(
nil
)
// make sure to setup our own conn handler.
return
s
}
func
(
s
*
Swarm
)
AddTransport
(
t
transport
.
Transport
)
{
s
.
transports
=
append
(
s
.
transports
,
t
)
}
func
(
s
*
Swarm
)
teardown
()
error
{
return
s
.
swarm
.
Close
()
}
...
...
This diff is collapsed.
Click to expand it.
p2p/net/swarm/swarm_listen.go
View file @
978b186d
...
...
@@ -13,37 +13,42 @@ import (
context
"golang.org/x/net/context"
)
func
(
s
*
Swarm
)
AddListenAddr
(
a
ma
.
Multiaddr
)
error
{
tpt
:=
s
.
transportForAddr
(
a
)
if
tpt
==
nil
{
return
fmt
.
Errorf
(
"no transport for address: %s"
,
a
)
}
d
,
err
:=
tpt
.
Dialer
(
a
,
transport
.
TimeoutOpt
(
DialTimeout
),
transport
.
ReusePorts
)
if
err
!=
nil
{
return
err
}
s
.
dialer
.
AddDialer
(
d
)
list
,
err
:=
tpt
.
Listen
(
a
)
if
err
!=
nil
{
return
err
}
err
=
s
.
addListener
(
list
)
if
err
!=
nil
{
return
err
}
return
nil
}
// Open listeners and reuse-dialers for the given addresses
func
(
s
*
Swarm
)
setupInterfaces
(
addrs
[]
ma
.
Multiaddr
)
error
{
errs
:=
make
([]
error
,
len
(
addrs
))
var
succeeded
int
for
i
,
a
:=
range
addrs
{
tpt
:=
s
.
transportForAddr
(
a
)
if
tpt
==
nil
{
errs
[
i
]
=
fmt
.
Errorf
(
"no transport for address: %s"
,
a
)
continue
}
d
,
err
:=
tpt
.
Dialer
(
a
,
transport
.
TimeoutOpt
(
DialTimeout
),
transport
.
ReusePorts
)
if
err
!=
nil
{
errs
[
i
]
=
err
continue
}
s
.
dialer
.
AddDialer
(
d
)
list
,
err
:=
tpt
.
Listen
(
a
)
if
err
!=
nil
{
if
err
:=
s
.
AddListenAddr
(
a
);
err
!=
nil
{
errs
[
i
]
=
err
continue
}
else
{
succeeded
++
}
err
=
s
.
addListener
(
list
)
if
err
!=
nil
{
errs
[
i
]
=
err
continue
}
succeeded
++
}
for
i
,
e
:=
range
errs
{
...
...
@@ -51,6 +56,7 @@ func (s *Swarm) setupInterfaces(addrs []ma.Multiaddr) error {
log
.
Warning
(
"listen on %s failed: %s"
,
addrs
[
i
],
errs
[
i
])
}
}
if
succeeded
==
0
&&
len
(
addrs
)
>
0
{
return
fmt
.
Errorf
(
"failed to listen on any addresses: %s"
,
errs
)
}
...
...
@@ -83,7 +89,7 @@ func (s *Swarm) addListener(tptlist transport.Listener) error {
list
.
SetAddrFilters
(
s
.
Filters
)
if
cw
,
ok
:=
list
.
(
conn
.
ListenerConnWrapper
);
ok
{
if
cw
,
ok
:=
list
.
(
conn
.
ListenerConnWrapper
);
ok
&&
s
.
bwc
!=
nil
{
cw
.
SetConnWrapper
(
func
(
c
transport
.
Conn
)
transport
.
Conn
{
return
mconn
.
WrapConn
(
s
.
bwc
,
c
)
})
...
...
This diff is collapsed.
Click to expand it.
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