Revert "TUN-6617: Dont fallback to http2 if QUIC conn was successful."

This reverts commit 679a89c7df.

tunnelstate/conntracker.go

@@ -10,26 +10,20 @@ import (
 
 type ConnTracker struct {
 	sync.RWMutex
-	// int is the connection Index
-	connectionInfo map[uint8]ConnectionInfo
-	log            *zerolog.Logger
-}
-
-type ConnectionInfo struct {
-	IsConnected bool
-	Protocol    connection.Protocol
+	isConnected map[int]bool
+	log         *zerolog.Logger
 }
 
 func NewConnTracker(log *zerolog.Logger) *ConnTracker {
 	return &ConnTracker{
-		connectionInfo: make(map[uint8]ConnectionInfo, 0),
-		log:            log,
+		isConnected: make(map[int]bool, 0),
+		log:         log,
 	}
 }
 
-func MockedConnTracker(mocked map[uint8]ConnectionInfo) *ConnTracker {
+func MockedConnTracker(mocked map[int]bool) *ConnTracker {
 	return &ConnTracker{
-		connectionInfo: mocked,
+		isConnected: mocked,
 	}
 }
 
@@ -37,17 +31,11 @@ func (ct *ConnTracker) OnTunnelEvent(c connection.Event) {
 	switch c.EventType {
 	case connection.Connected:
 		ct.Lock()
-		ci := ConnectionInfo{
-			IsConnected: true,
-			Protocol:    c.Protocol,
-		}
-		ct.connectionInfo[c.Index] = ci
+		ct.isConnected[int(c.Index)] = true
 		ct.Unlock()
 	case connection.Disconnected, connection.Reconnecting, connection.RegisteringTunnel, connection.Unregistering:
 		ct.Lock()
-		ci := ct.connectionInfo[c.Index]
-		ci.IsConnected = false
-		ct.connectionInfo[c.Index] = ci
+		ct.isConnected[int(c.Index)] = false
 		ct.Unlock()
 	default:
 		ct.log.Error().Msgf("Unknown connection event case %v", c)
@@ -58,23 +46,10 @@ func (ct *ConnTracker) CountActiveConns() uint {
 	ct.RLock()
 	defer ct.RUnlock()
 	active := uint(0)
-	for _, ci := range ct.connectionInfo {
-		if ci.IsConnected {
+	for _, connected := range ct.isConnected {
+		if connected {
 			active++
 		}
 	}
 	return active
 }
-
-// HasConnectedWith checks if we've ever had a successful connection to the edge
-// with said protocol.
-func (ct *ConnTracker) HasConnectedWith(protocol connection.Protocol) bool {
-	ct.RLock()
-	defer ct.RUnlock()
-	for _, ci := range ct.connectionInfo {
-		if ci.Protocol == protocol {
-			return true
-		}
-	}
-	return false
-}