Merge pull request #2337 from karalabe/upnp-error-hang

p2p/nat: fix #2291, NAT discovery did't abort on failure
2016-03-14 17:17:21 +02:00 · 2016-03-14 17:17:21 +02:00 · b8f4a48ada
commit b8f4a48ada
parent 8a3ce5450a 64c8e2f2ca
1 changed files with 1 additions and 0 deletions
--- 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