other_mirrors/ Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-05 04:29:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add ConnRF to make HTTPUpgrade 0-RTT 

https://github.com/XTLS/Xray-core/issues/3128#issuecomment-1991809113
This commit is contained in:
RPRX 2024-03-13 22:39:24 +00:00 committed by GitHub
parent d3a218f896
commit 5c41292836
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
transport/internet/httpupgrade/dialer.go
View File

@ -15,6 +15,29 @@ import (
"github.com/xtls/xray-core/transport/internet/tls"
)
type ConnRF struct {
net.Conn
Req *http.Request
First bool
}
func (c *ConnRF) Read(b []byte) (int, error) {
if c.First {
c.First = false
// TODO The bufio usage here is unreliable
resp, err := http.ReadResponse(bufio.NewReader(c.Conn), c.Req) // nolint:bodyclose
if err != nil {
return 0, err
}
if resp.Status != "101 Switching Protocols" ||
strings.ToLower(resp.Header.Get("Upgrade")) != "websocket" ||
strings.ToLower(resp.Header.Get("Connection")) != "upgrade" {
return 0, newError("unrecognized reply")
}
}
return c.Conn.Read(b)
}
func dialhttpUpgrade(ctx context.Context, dest net.Destination, streamSettings *internet.MemoryStreamConfig) (net.Conn, error) {
transportConfiguration := streamSettings.ProtocolSettings.(*Config)
@ -58,18 +81,7 @@ func dialhttpUpgrade(ctx context.Context, dest net.Destination, streamSettings *
return nil, err
}
// TODO The bufio usage here is unreliable
resp, err := http.ReadResponse(bufio.NewReader(conn), req) // nolint:bodyclose
if err != nil {
return nil, err
}
if resp.Status == "101 Switching Protocols" &&
strings.ToLower(resp.Header.Get("Upgrade")) == "websocket" &&
strings.ToLower(resp.Header.Get("Connection")) == "upgrade" {
return conn, nil
}
return nil, newError("unrecognized reply")
return &ConnRF{Conn: conn, Req: req, First: true}, nil
}
func dial(ctx context.Context, dest net.Destination, streamSettings *internet.MemoryStreamConfig) (stat.Connection, error) {