curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-6938: Provide QUIC as first in protocol list

This commit is contained in:
Devin Carr 2023-02-06 20:05:48 -08:00
parent 0f95f8bae5
commit 8cf2d319ca
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
connection/protocol.go
View File

@ -25,8 +25,9 @@ const (
) )
var ( var (
// ProtocolList represents a list of supported protocols for communication with the edge. // ProtocolList represents a list of supported protocols for communication with the edge
ProtocolList = []Protocol{HTTP2, QUIC} // in order of precedence for remote percentage fetcher.
ProtocolList = []Protocol{QUIC, HTTP2}
) )
type Protocol int64 type Protocol int64
@ -171,7 +172,8 @@ func getProtocol(protocolPool []Protocol, fetchFunc edgediscovery.PercentageFetc
} }
} }
return protocolPool[len(protocolPool)-1], nil // Default to first index in protocolPool list
return protocolPool[0], nil
} }
// defaultProtocolSelector will allow for a protocol to have a fallback // defaultProtocolSelector will allow for a protocol to have a fallback
@ -223,6 +225,7 @@ func NewProtocolSelector(
threshold := switchThreshold(accountTag) threshold := switchThreshold(accountTag)
fetchedProtocol, err := getProtocol(ProtocolList, protocolFetcher, threshold) fetchedProtocol, err := getProtocol(ProtocolList, protocolFetcher, threshold)
log.Debug().Msgf("Fetched protocol: %s", fetchedProtocol)
if err != nil { if err != nil {
log.Warn().Msg("Unable to lookup protocol percentage.") log.Warn().Msg("Unable to lookup protocol percentage.")
// Falling through here since 'auto' is handled in the switch and failing // Falling through here since 'auto' is handled in the switch and failing