fix: checking if ready chan is nil

getlantern · Nov 19, 2024 · 43dd35d · 43dd35d
1 parent d35e60c
commit 43dd35d
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/bandit/bandit.go b/bandit/bandit.go
@@ -202,21 +202,24 @@ func (o *BanditDialer) chooseDialerForDomain(network, addr string) (Dialer, int)
 	chosenArm := o.bandit.SelectArm(rand.Float64())
 	var dialer Dialer
 	notAllFailing := hasNotFailing(o.dialers)
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
 	for i := 0; i < (len(o.dialers) * 2); i++ {
 		dialer = o.dialers[chosenArm]
-		select {
-		case err := <-dialer.Ready():
-			if err != nil {
-				log.Errorf("dialer %q initialization failed: %w", dialer.Name(), err)
+		readyChan := dialer.Ready()
+		if readyChan != nil {
+			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+			defer cancel()
+			select {
+			case err := <-readyChan:
+				if err != nil {
+					log.Errorf("dialer %q initialization failed: %w", dialer.Name(), err)
+					chosenArm = differentArm(chosenArm, len(o.dialers))
+					continue
+				}
+			case <-ctx.Done():
+				log.Errorf("dialer %q initialization timed out", dialer.Name())
 				chosenArm = differentArm(chosenArm, len(o.dialers))
 				continue
 			}
-		case <-ctx.Done():
-			log.Errorf("dialer %q initialization timed out", dialer.Name())
-			chosenArm = differentArm(chosenArm, len(o.dialers))
-			continue
 		}
 
 		if (dialer.ConsecFailures() > 0 && notAllFailing) || !dialer.SupportsAddr(network, addr) {