SagerNet/sing-mux
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-mux.git synced 2025-04-03 03:47:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix missing handshake timeout

Browse source
This commit is contained in:
世界 2023-12-19 20:00:00 +08:00
parent 13614c0290
commit d7f19df3ce
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client.go
View file

@ -111,7 +111,7 @@ func (c *Client) openStream(ctx context.Context) (net.Conn, error) {
if err != nil {
continue
}
stream, err = session.Open()
stream, err = session.OpenContext(ctx)
if err != nil {
continue
}
@ -166,6 +166,8 @@ func (c *Client) offer(ctx context.Context) (abstractSession, error) {
}
func (c *Client) offerNew(ctx context.Context) (abstractSession, error) {
ctx, cancel := context.WithTimeout(ctx, TCPTimeout)
defer cancel()
conn, err := c.dialer.DialContext(ctx, N.NetworkTCP, Destination)
if err != nil {
return nil, err
@ -190,7 +192,7 @@ func (c *Client) offerNew(ctx context.Context) (abstractSession, error) {
return nil, err
}
if c.brutal.Enabled {
err = c.brutalExchange(conn, session)
err = c.brutalExchange(ctx, conn, session)
if err != nil {
conn.Close()
session.Close()
@ -201,8 +203,8 @@ func (c *Client) offerNew(ctx context.Context) (abstractSession, error) {
return session, nil
}
func (c *Client) brutalExchange(sessionConn net.Conn, session abstractSession) error {
stream, err := session.Open()
func (c *Client) brutalExchange(ctx context.Context, sessionConn net.Conn, session abstractSession) error {
stream, err := session.OpenContext(ctx)
if err != nil {
return err
}

5
h2mux.go
View file

@ -64,7 +64,7 @@ func (s *h2MuxServerSession) ServeHTTP(writer http.ResponseWriter, request *http
}
}
func (s *h2MuxServerSession) Open() (net.Conn, error) {
func (s *h2MuxServerSession) OpenContext(ctx context.Context) (net.Conn, error) {
return nil, os.ErrInvalid
}
@ -197,13 +197,14 @@ func (s *h2MuxClientSession) MarkDead(conn *http2.ClientConn) {
s.Close()
}
func (s *h2MuxClientSession) Open() (net.Conn, error) {
func (s *h2MuxClientSession) OpenContext(ctx context.Context) (net.Conn, error) {
pipeInReader, pipeInWriter := io.Pipe()
request := &http.Request{
Method: http.MethodConnect,
Body: pipeInReader,
URL: &url.URL{Scheme: "https", Host: "localhost"},
}
request = request.WithContext(ctx)
conn := newLateHTTPConn(pipeInWriter)
go func() {
response, err := s.transport.RoundTrip(request)

9
session.go
View file

@ -1,6 +1,7 @@
package mux
import (
"context"
"io"
"net"
"reflect"
@ -12,7 +13,7 @@ import (
)
type abstractSession interface {
Open() (net.Conn, error)
OpenContext(ctx context.Context) (net.Conn, error)
Accept() (net.Conn, error)
NumStreams() int
Close() error
@ -80,7 +81,7 @@ type smuxSession struct {
*smux.Session
}
func (s *smuxSession) Open() (net.Conn, error) {
func (s *smuxSession) OpenContext(context.Context) (net.Conn, error) {
return s.OpenStream()
}
@ -96,6 +97,10 @@ type yamuxSession struct {
*yamux.Session
}
func (y *yamuxSession) OpenContext(context.Context) (net.Conn, error) {
return y.OpenStream()
}
func (y *yamuxSession) CanTakeNewRequest() bool {
return true
}