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
e9edd9bd
Commit
e9edd9bd
authored
8 years ago
by
Jeromy Johnson
Browse files
Options
Download
Plain Diff
Merge pull request #49 from ipfs/fix/id-hang
close wait channel in all cases, not just success
parents
ea5428f9
6dc5e19c
master
2018-Q4-OKR
docs-improvements
feat/backoff-listing
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
wip/js-interop
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
v3.4.2
v3.4.1
v3.4.0
v3.3.7
v3.3.6
v3.3.4
v3.3.3
v3.3.2
v3.3.1
v3.3.0
v3.2.3
v3.2.2
v3.2.1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
p2p/protocol/identify/id.go
+5
-4
p2p/protocol/identify/id.go
with
5 additions
and
4 deletions
+5
-4
p2p/protocol/identify/id.go
View file @
e9edd9bd
...
...
@@ -72,9 +72,12 @@ func (ids *IDService) IdentifyConn(c inet.Conn) {
<-
wait
// already identifying it. wait for it.
return
}
ids
.
currid
[
c
]
=
make
(
chan
struct
{})
ch
:=
make
(
chan
struct
{})
ids
.
currid
[
c
]
=
ch
ids
.
currmu
.
Unlock
()
defer
close
(
ch
)
s
,
err
:=
c
.
NewStream
()
if
err
!=
nil
{
log
.
Debugf
(
"error opening initial stream for %s: %s"
,
ID
,
err
)
...
...
@@ -97,7 +100,7 @@ func (ids *IDService) IdentifyConn(c inet.Conn) {
ids
.
ResponseHandler
(
s
)
ids
.
currmu
.
Lock
()
ch
,
found
:=
ids
.
currid
[
c
]
_
,
found
:=
ids
.
currid
[
c
]
delete
(
ids
.
currid
,
c
)
ids
.
currmu
.
Unlock
()
...
...
@@ -105,8 +108,6 @@ func (ids *IDService) IdentifyConn(c inet.Conn) {
log
.
Debugf
(
"IdentifyConn failed to find channel (programmer error) for %s"
,
c
)
return
}
close
(
ch
)
// release everyone waiting.
}
func
(
ids
*
IDService
)
RequestHandler
(
s
inet
.
Stream
)
{
...
...
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