diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-03-14 23:17:21 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-03-14 23:17:21 +0800 |
| commit | b8f4a48ada7197a7c197a9dbbf143c47a9a93ae9 (patch) | |
| tree | 3a86356b80d1e0a3c8a75da8680ec8de3cff1d7b | |
| parent | 8a3ce5450a309866c4cb1acc1e783324f8597293 (diff) | |
| parent | 64c8e2f2ca01de506146027cccf2fafea03b7f09 (diff) | |
| download | go-tangerine-b8f4a48ada7197a7c197a9dbbf143c47a9a93ae9.tar go-tangerine-b8f4a48ada7197a7c197a9dbbf143c47a9a93ae9.tar.gz go-tangerine-b8f4a48ada7197a7c197a9dbbf143c47a9a93ae9.tar.bz2 go-tangerine-b8f4a48ada7197a7c197a9dbbf143c47a9a93ae9.tar.lz go-tangerine-b8f4a48ada7197a7c197a9dbbf143c47a9a93ae9.tar.xz go-tangerine-b8f4a48ada7197a7c197a9dbbf143c47a9a93ae9.tar.zst go-tangerine-b8f4a48ada7197a7c197a9dbbf143c47a9a93ae9.zip | |
Merge pull request #2337 from karalabe/upnp-error-hang
p2p/nat: fix #2291, NAT discovery did't abort on failure
| -rw-r--r-- | p2p/nat/natupnp.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/p2p/nat/natupnp.go b/p2p/nat/natupnp.go index 890a35043..804396e94 100644 --- a/p2p/nat/natupnp.go +++ b/p2p/nat/natupnp.go @@ -139,6 +139,7 @@ func discoverUPnP() Interface { func discover(out chan<- *upnp, target string, matcher func(*goupnp.RootDevice, goupnp.ServiceClient) *upnp) { devs, err := goupnp.DiscoverDevices(target) if err != nil { + out <- nil return } found := false |