Fix: invalid count comparison in a68e746

psiphon/controller.go

@@ -696,9 +696,11 @@ func (controller *Controller) classifyImpairedProtocol(failedTunnel *Tunnel) {
 	//
 	// Note: with controller.config.TunnelProtocol set, this will always reset once
 	// that protocol has reached IMPAIRED_PROTOCOL_CLASSIFICATION_THRESHOLD.
-	if len(controller.getImpairedProtocols()) ==
-		CountSupportedProtocols(
-			controller.config.EgressRegion, controller.config.TunnelProtocol) {
+	if CountNonImpairedProtocols(
+		controller.config.EgressRegion,
+		controller.config.TunnelProtocol,
+		controller.getImpairedProtocols()) == 0 {
+
 		controller.impairedProtocolClassification = make(map[string]int)
 	}
 }

psiphon/dataStore.go

@@ -636,9 +636,13 @@ func CountServerEntries(region, tunnelProtocol string) int {
 	return count
 }
 
-// CountSupportedProtocols returns the number of distinct tunnel
-// protocols supported by stored server entries.
-func CountSupportedProtocols(region, tunnelProtocol string) int {
+// CountNonImpairedProtocols returns the number of distinct tunnel
+// protocols supported by stored server entries, excluding the
+// specified impaired protocols.
+func CountNonImpairedProtocols(
+	region, tunnelProtocol string,
+	impairedProtocols []string) int {
+
 	checkInitDataStore()
 
 	distinctProtocols := make(map[string]bool)
@@ -661,8 +665,12 @@ func CountSupportedProtocols(region, tunnelProtocol string) int {
 		}
 	})
 
+	for _, protocol := range impairedProtocols {
+		delete(distinctProtocols, protocol)
+	}
+
 	if err != nil {
-		NoticeAlert("CountSupportedProtocols failed: %s", err)
+		NoticeAlert("CountNonImpairedProtocols failed: %s", err)
 		return 0
 	}