black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-25 18:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make v2ray http2 conn public

Browse source
This commit is contained in:
世界 2023-04-21 17:49:43 +08:00
parent df0eef770e
commit 438de36749
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
transport/v2rayhttp/client.go
View file

@ -139,16 +139,16 @@ func (c *Client) dialHTTP2(ctx context.Context) (net.Conn, error) {
default: default:
request.Host = c.host[rand.Intn(hostLen)] request.Host = c.host[rand.Intn(hostLen)]
} }
conn := newLateHTTPConn(pipeInWriter) conn := NewLateHTTPConn(pipeInWriter)
go func() { go func() {
response, err := c.transport.RoundTrip(request) response, err := c.transport.RoundTrip(request)
if err != nil { if err != nil {
conn.setup(nil, err) conn.Setup(nil, err)
} else if response.StatusCode != 200 { } else if response.StatusCode != 200 {
response.Body.Close() response.Body.Close()
conn.setup(nil, E.New("unexpected status: ", response.StatusCode, " ", response.Status)) conn.Setup(nil, E.New("unexpected status: ", response.StatusCode, " ", response.Status))
} else { } else {
conn.setup(response.Body, nil) conn.Setup(response.Body, nil)
} }
}() }()
return conn, nil return conn, nil

4
transport/v2rayhttp/conn.go
View file

@ -140,14 +140,14 @@ func NewHTTPConn(reader io.Reader, writer io.Writer) HTTP2Conn {
} }
} }
func newLateHTTPConn(writer io.Writer) *HTTP2Conn { func NewLateHTTPConn(writer io.Writer) *HTTP2Conn {
return &HTTP2Conn{ return &HTTP2Conn{
create: make(chan struct{}), create: make(chan struct{}),
writer: writer, writer: writer,
} }
} }
func (c *HTTP2Conn) setup(reader io.Reader, err error) { func (c *HTTP2Conn) Setup(reader io.Reader, err error) {
c.reader = reader c.reader = reader
c.err = err c.err = err
close(c.create) close(c.create)