diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-14 06:38:53 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-14 06:38:53 +0800 |
| commit | b7e1b686aa1fc2c44fd6827b08c546629607d1a2 (patch) | |
| tree | 6cf0951e6da696b879d1f82cbaafb14bff84271c /p2p/discover/udp.go | |
| parent | 07eebc38b207e435d2397cefd1412a7ec9c1e32e (diff) | |
| parent | 2ea98d9b74ac2d66dce6eeb92c371c0237245d79 (diff) | |
| download | dexon-b7e1b686aa1fc2c44fd6827b08c546629607d1a2.tar.gz dexon-b7e1b686aa1fc2c44fd6827b08c546629607d1a2.tar.zst dexon-b7e1b686aa1fc2c44fd6827b08c546629607d1a2.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'p2p/discover/udp.go')
| -rw-r--r-- | p2p/discover/udp.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index d37260e7d..61a0abed9 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -267,11 +267,12 @@ func (t *udp) loop() { defer timeout.Stop() rearmTimeout := func() { - if len(pending) == 0 || nextDeadline == pending[0].deadline { + now := time.Now() + if len(pending) == 0 || now.Before(nextDeadline) { return } nextDeadline = pending[0].deadline - timeout.Reset(nextDeadline.Sub(time.Now())) + timeout.Reset(nextDeadline.Sub(now)) } for { |