diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-20 03:55:40 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-20 03:55:40 +0800 |
| commit | 61a6911eebfac5c70959227a8fe0a4e9c2ef5c61 (patch) | |
| tree | d64cc534c627b2250e395df588982e61190a7573 /p2p/discover/udp.go | |
| parent | 382d35bf403ab5dd9b0d2fe3a87c3960902d6e57 (diff) | |
| parent | dd54fef89888372ab5961c1b5a6ac917fc47d49c (diff) | |
| download | dexon-61a6911eebfac5c70959227a8fe0a4e9c2ef5c61.tar dexon-61a6911eebfac5c70959227a8fe0a4e9c2ef5c61.tar.gz dexon-61a6911eebfac5c70959227a8fe0a4e9c2ef5c61.tar.bz2 dexon-61a6911eebfac5c70959227a8fe0a4e9c2ef5c61.tar.lz dexon-61a6911eebfac5c70959227a8fe0a4e9c2ef5c61.tar.xz dexon-61a6911eebfac5c70959227a8fe0a4e9c2ef5c61.tar.zst dexon-61a6911eebfac5c70959227a8fe0a4e9c2ef5c61.zip | |
Merge pull request #1689 from fjl/discover-ignore-temp-errors
p2p, p2p/discover: small fixes
Diffstat (limited to 'p2p/discover/udp.go')
| -rw-r--r-- | p2p/discover/udp.go | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index 008e63937..6aefb68f7 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -458,6 +458,10 @@ func encodePacket(priv *ecdsa.PrivateKey, ptype byte, req interface{}) ([]byte, return packet, nil } +type tempError interface { + Temporary() bool +} + // readLoop runs in its own goroutine. it handles incoming UDP packets. func (t *udp) readLoop() { defer t.conn.Close() @@ -467,7 +471,13 @@ func (t *udp) readLoop() { buf := make([]byte, 1280) for { nbytes, from, err := t.conn.ReadFromUDP(buf) - if err != nil { + if tempErr, ok := err.(tempError); ok && tempErr.Temporary() { + // Ignore temporary read errors. + glog.V(logger.Debug).Infof("Temporary read error: %v", err) + continue + } else if err != nil { + // Shut down the loop for permament errors. + glog.V(logger.Debug).Infof("Read error: %v", err) return } t.handlePacket(from, buf[:nbytes]) |