pkg client: do not panic when resolved

rkonfj · Jun 1, 2023 · be70f2b · be70f2b
1 parent a5e742e
commit be70f2b
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/client/client.go b/client/client.go
@@ -62,25 +62,22 @@ func NewTohClient(options Options) (*TohClient, error) {
 			if err != nil {
 				return
 			}
-			ipv4Fail := make(chan bool)
-			ipv6Fail := make(chan bool)
+			ipv4Done := make(chan bool)
+			ipv6Done := make(chan bool)
 			ipv4Ok := make(chan bool)
 			ipv6Ok := make(chan bool)
-			defer close(ipv4Fail)
-			defer close(ipv6Fail)
 			defer close(ipv4Ok)
-			defer close(ipv6Ok)
 			go func() {
-				<-ipv6Fail
-				<-ipv4Fail
-				ipv6Ok <- true
+				<-ipv6Done
+				<-ipv4Done
+				close(ipv6Ok)
 			}()
 
 			go func() {
+				defer close(ipv6Done)
 				c.serverIPv6s, err = D.LookupIP6(host)
 				if err != nil {
 					logrus.Debugf("lookup6 for %s: %s", host, err)
-					ipv6Fail <- true
 					return
 				}
 				if len(c.serverIPv6s) > 0 {
@@ -89,10 +86,10 @@ func NewTohClient(options Options) (*TohClient, error) {
 			}()
 
 			go func() {
+				defer close(ipv4Done)
 				c.serverIPv4s, err = D.LookupIP4(host)
 				if err != nil {
 					logrus.Debugf("lookup4 for %s: %s", host, err)
-					ipv4Fail <- true
 					return
 				}
 				if len(c.serverIPv4s) > 0 {