status-im
/
go-libp2p
mirror of https://github.com/status-im/go-libp2p.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #380 from libp2p/fix/reset-ping-stream 

always reset ping streams when done
This commit is contained in:
Steven Allen 2018-08-21 05:22:22 +00:00 committed by GitHub
parent 6f0dcfa108 72df25af76
commit 7d6f9521c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
p2p/protocol/ping/ping.go
View File

@ -44,19 +44,14 @@ func (p *PingService) PingHandler(s inet.Stream) {
select { select {
case <-timer.C: case <-timer.C:
log.Debug("ping timeout") log.Debug("ping timeout")
s.Reset()
case err, ok := <-errCh: case err, ok := <-errCh:
if ok { if ok {
log.Debug(err) log.Debug(err)
if err == io.EOF {
s.Close()
} else {
s.Reset()
}
} else { } else {
log.Error("ping loop failed without error") log.Error("ping loop failed without error")
} }
} }
s.Reset()
}() }()
for { for {
@ -85,7 +80,7 @@ func (ps *PingService) Ping(ctx context.Context, p peer.ID) (<-chan time.Duratio
out := make(chan time.Duration) out := make(chan time.Duration)
go func() { go func() {
defer close(out) defer close(out)
defer s.Close() defer s.Reset()
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():
@ -93,7 +88,6 @@ func (ps *PingService) Ping(ctx context.Context, p peer.ID) (<-chan time.Duratio
default: default:
t, err := ping(s) t, err := ping(s)
if err != nil { if err != nil {
s.Reset()
log.Debugf("ping error: %s", err) log.Debugf("ping error: %s", err)
return return
} }