Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XHTTP Client: Race Dialer #4320

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

XHTTP Client: Race Dialer #4320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
427101e
XHTTP Client: Race Dialer
rPDmYQ Feb 15, 2025
90a4155
Detect QUIC blackhole after handshake complete
rPDmYQ Feb 15, 2025
a29d082
Do race instead of fail when previous race succeed but no cached conn
rPDmYQ Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 50 additions & 10 deletions transport/internet/splithttp/dialer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"net/http"
"net/http/httptrace"
"net/url"
"slices"
"strconv"
"sync"
"sync/atomic"
Expand Down Expand Up @@ -93,6 +94,9 @@ func decideHTTPVersion(tlsConfig *tls.Config, realityConfig *reality.Config) str
return "1.1"
}
if len(tlsConfig.NextProtocol) != 1 {
if slices.Contains(tlsConfig.NextProtocol, "h3") && slices.Contains(tlsConfig.NextProtocol, "h2") {
return "3+2"
}
return "2"
}
if tlsConfig.NextProtocol[0] == "http/1.1" {
Expand All @@ -101,6 +105,7 @@ func decideHTTPVersion(tlsConfig *tls.Config, realityConfig *reality.Config) str
if tlsConfig.NextProtocol[0] == "h3" {
return "3"
}

return "2"
}

Expand All @@ -109,14 +114,27 @@ func createHTTPClient(dest net.Destination, streamSettings *internet.MemoryStrea
realityConfig := reality.ConfigFromStreamSettings(streamSettings)

httpVersion := decideHTTPVersion(tlsConfig, realityConfig)
if httpVersion == "3" {
dest.Network = net.Network_UDP // better to keep this line
}

var gotlsConfig *gotls.Config
var h3gotlsConfig *gotls.Config

if tlsConfig != nil {
gotlsConfig = tlsConfig.GetTLSConfig(tls.WithDestination(dest))
h3gotlsConfig = gotlsConfig

if httpVersion == "3+2" {
h3gotlsConfig = &gotls.Config{}
*h3gotlsConfig = *gotlsConfig

// Make QUIC ALPN only contains h3, and remove h3 from TCP TLS ALPN
h3gotlsConfig.NextProtos = []string{"h3"}
h3idx := slices.Index(h3gotlsConfig.NextProtos, "h3")
// Don't modify original tlsConfig.NextProtocol
nextProtos := gotlsConfig.NextProtos
gotlsConfig.NextProtos = make([]string, 0, len(nextProtos)-1)
gotlsConfig.NextProtos = append(gotlsConfig.NextProtos, nextProtos[:h3idx]...)
gotlsConfig.NextProtos = append(gotlsConfig.NextProtos, nextProtos[h3idx+1:]...)
}
}

transportConfig := streamSettings.ProtocolSettings.(*Config)
Expand Down Expand Up @@ -152,7 +170,7 @@ func createHTTPClient(dest net.Destination, streamSettings *internet.MemoryStrea

var transport http.RoundTripper

if httpVersion == "3" {
makeH3Transport := func() *http3.Transport {
if keepAlivePeriod == 0 {
keepAlivePeriod = quicgoH3KeepAlivePeriod
}
Expand All @@ -168,9 +186,11 @@ func createHTTPClient(dest net.Destination, streamSettings *internet.MemoryStrea
MaxIncomingStreams: -1,
KeepAlivePeriod: keepAlivePeriod,
}
transport = &http3.RoundTripper{
dest := dest
dest.Network = net.Network_UDP
return &http3.Transport{
QUICConfig: quicConfig,
TLSClientConfig: gotlsConfig,
TLSClientConfig: h3gotlsConfig,
Dial: func(ctx context.Context, addr string, tlsCfg *gotls.Config, cfg *quic.Config) (quic.EarlyConnection, error) {
conn, err := internet.DialSystem(ctx, dest, streamSettings.SocketSettings)
if err != nil {
Expand Down Expand Up @@ -208,26 +228,30 @@ func createHTTPClient(dest net.Destination, streamSettings *internet.MemoryStrea
return quic.DialEarly(ctx, udpConn, udpAddr, tlsCfg, cfg)
},
}
} else if httpVersion == "2" {
}

makeH2Transport := func() *http2.Transport {
if keepAlivePeriod == 0 {
keepAlivePeriod = chromeH2KeepAlivePeriod
}
if keepAlivePeriod < 0 {
keepAlivePeriod = 0
}
transport = &http2.Transport{
return &http2.Transport{
DialTLSContext: func(ctxInner context.Context, network string, addr string, cfg *gotls.Config) (net.Conn, error) {
return dialContext(ctxInner)
},
IdleConnTimeout: connIdleTimeout,
ReadIdleTimeout: keepAlivePeriod,
}
} else {
}

makeTransport := func() *http.Transport {
httpDialContext := func(ctxInner context.Context, network string, addr string) (net.Conn, error) {
return dialContext(ctxInner)
}

transport = &http.Transport{
return &http.Transport{
DialTLSContext: httpDialContext,
DialContext: httpDialContext,
IdleConnTimeout: connIdleTimeout,
Expand All @@ -237,6 +261,22 @@ func createHTTPClient(dest net.Destination, streamSettings *internet.MemoryStrea
}
}

switch httpVersion {
case "3":
transport = makeH3Transport()
case "2":
transport = makeH2Transport()
case "3+2":
raceTransport := &raceTransport{
h3: makeH3Transport(),
h2: makeH2Transport(),
dest: dest.NetAddr(),
}
transport = raceTransport.setup()
default:
transport = makeTransport()
}

client := &DefaultDialerClient{
transportConfig: transportConfig,
client: &http.Client{
Expand Down
Loading
Loading