Skip to content
GitLab
Menu
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
b45c8979
Commit
b45c8979
authored
Sep 06, 2016
by
Jeromy Johnson
Committed by
GitHub
Sep 06, 2016
Browse files
Merge pull request #104 from libp2p/fix/secio-hs-errs
swarm: externalize secio handshake errors
parents
06db4004
5758d3e6
Changes
1
Hide whitespace changes
Inline
Side-by-side
p2p/net/swarm/swarm_dial.go
View file @
b45c8979
...
@@ -450,7 +450,8 @@ func (s *Swarm) dialAddr(ctx context.Context, p peer.ID, addr ma.Multiaddr) (con
...
@@ -450,7 +450,8 @@ func (s *Swarm) dialAddr(ctx context.Context, p peer.ID, addr ma.Multiaddr) (con
remotep
:=
connC
.
RemotePeer
()
remotep
:=
connC
.
RemotePeer
()
if
remotep
!=
p
{
if
remotep
!=
p
{
connC
.
Close
()
connC
.
Close
()
return
nil
,
fmt
.
Errorf
(
"misdial to %s through %s (got %s)"
,
p
,
addr
,
remotep
)
_
,
err
:=
connC
.
Read
(
nil
)
// should return any potential errors (ex: from secio)
return
nil
,
fmt
.
Errorf
(
"misdial to %s through %s (got %s): %s"
,
p
,
addr
,
remotep
,
err
)
}
}
// if the connection is to ourselves...
// if the connection is to ourselves...
...
...
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