From 7745ed34d3dd3acdb08852a48510f87e76bf7fa8 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Wed, 28 May 2014 07:03:47 +0200
Subject: [PATCH] Don't stop discovery on send errors (fixes #240)

---
 beacon/beacon.go     | 4 +---
 discover/discover.go | 8 +-------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/beacon/beacon.go b/beacon/beacon.go
index e8ab78bdd..e2ae90352 100644
--- a/beacon/beacon.go
+++ b/beacon/beacon.go
@@ -102,9 +102,7 @@ func (b *Beacon) writer() {
 				if debug {
 					l.Debugln(err)
 				}
-				return
-			}
-			if debug {
+			} else if debug {
 				l.Debugf("sent %d bytes to %s", len(bs), dst)
 			}
 		}
diff --git a/discover/discover.go b/discover/discover.go
index 1ded17cbd..f702b0425 100644
--- a/discover/discover.go
+++ b/discover/discover.go
@@ -187,9 +187,8 @@ func (d *Discoverer) sendExternalAnnouncements() {
 	} else {
 		buf = d.announcementPkt()
 	}
-	var errCounter = 0
 
-	for errCounter < maxErrors {
+	for {
 		var ok bool
 
 		if debug {
@@ -201,11 +200,8 @@ func (d *Discoverer) sendExternalAnnouncements() {
 			if debug {
 				l.Debugln("discover: warning:", err)
 			}
-			errCounter++
 			ok = false
 		} else {
-			errCounter = 0
-
 			// Verify that the announce server responds positively for our node ID
 
 			time.Sleep(1 * time.Second)
@@ -214,7 +210,6 @@ func (d *Discoverer) sendExternalAnnouncements() {
 				l.Debugln("discover: external lookup check:", res)
 			}
 			ok = len(res) > 0
-
 		}
 
 		d.extAnnounceOKmut.Lock()
@@ -227,7 +222,6 @@ func (d *Discoverer) sendExternalAnnouncements() {
 			time.Sleep(60 * time.Second)
 		}
 	}
-	l.Warnf("Global discovery: %v: stopping due to too many errors: %v", remote, err)
 }
 
 func (d *Discoverer) recvAnnouncements() {