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
94417543
Commit
94417543
authored
8 years ago
by
Jeromy
Browse files
Options
Download
Email Patches
Plain Diff
swarm: add deadline for connection setup
parent
4ae3510f
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
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
p2p/host/basic/basic_host.go
+14
-4
p2p/host/basic/basic_host.go
p2p/net/swarm/swarm_dial.go
+16
-0
p2p/net/swarm/swarm_dial.go
with
30 additions
and
4 deletions
+30
-4
p2p/host/basic/basic_host.go
View file @
94417543
...
...
@@ -2,6 +2,7 @@ package basichost
import
(
"io"
"time"
peer
"github.com/ipfs/go-libp2p-peer"
pstore
"github.com/ipfs/go-libp2p-peerstore"
...
...
@@ -102,20 +103,29 @@ func (h *BasicHost) newConnHandler(c inet.Conn) {
// newStreamHandler is the remote-opened stream handler for inet.Network
// TODO: this feels a bit wonky
func
(
h
*
BasicHost
)
newStreamHandler
(
s
inet
.
Stream
)
{
before
:=
time
.
Now
()
protoID
,
handle
,
err
:=
h
.
Mux
()
.
Negotiate
(
s
)
took
:=
time
.
Now
()
.
Sub
(
before
)
if
err
!=
nil
{
if
err
==
io
.
EOF
{
log
.
Debugf
(
"protocol EOF: %s"
,
s
.
Conn
()
.
RemotePeer
())
logf
:=
log
.
Debugf
if
took
>
time
.
Second
*
10
{
logf
=
log
.
Warningf
}
logf
(
"protocol EOF: %s (took %s)"
,
s
.
Conn
()
.
RemotePeer
(),
took
)
}
else
{
log
.
Warning
(
"protocol mux failed: %s
"
,
err
)
log
.
Warning
(
"protocol mux failed: %s
(took %s)"
,
err
,
took
)
}
return
}
s
.
SetProtocol
(
protocol
.
ID
(
protoID
))
logStream
:=
mstream
.
WrapStream
(
s
,
h
.
bwc
)
if
h
.
bwc
!=
nil
{
s
=
mstream
.
WrapStream
(
s
,
h
.
bwc
)
}
log
.
Debugf
(
"protocol negotiation took %s"
,
took
)
go
handle
(
protoID
,
logStream
)
go
handle
(
protoID
,
s
)
}
// ID returns the (local) peer.ID associated with this Host
...
...
This diff is collapsed.
Click to expand it.
p2p/net/swarm/swarm_dial.go
View file @
94417543
...
...
@@ -372,10 +372,21 @@ func (s *Swarm) dialAddr(ctx context.Context, p peer.ID, addr ma.Multiaddr) (con
return
connC
,
nil
}
var
ConnSetupTimeout
=
time
.
Minute
*
5
// dialConnSetup is the setup logic for a connection from the dial side. it
// needs to add the Conn to the StreamSwarm, then run newConnSetup
func
dialConnSetup
(
ctx
context
.
Context
,
s
*
Swarm
,
connC
conn
.
Conn
)
(
*
Conn
,
error
)
{
deadline
,
ok
:=
ctx
.
Deadline
()
if
!
ok
{
deadline
=
time
.
Now
()
.
Add
(
ConnSetupTimeout
)
}
if
err
:=
connC
.
SetDeadline
(
deadline
);
err
!=
nil
{
return
nil
,
err
}
psC
,
err
:=
s
.
swarm
.
AddConn
(
connC
)
if
err
!=
nil
{
// connC is closed by caller if we fail.
...
...
@@ -389,5 +400,10 @@ func dialConnSetup(ctx context.Context, s *Swarm, connC conn.Conn) (*Conn, error
return
nil
,
err
}
if
err
:=
connC
.
SetDeadline
(
time
.
Time
{});
err
!=
nil
{
log
.
Error
(
"failed to reset connection deadline after setup: "
,
err
)
return
nil
,
err
}
return
swarmC
,
err
}
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