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

Add network name constants

Browse source
This commit is contained in:
世界 2022-07-29 19:48:14 +08:00
parent 6045339c12
commit c922e42771
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
4 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
protocol/http/client.go
View file

@ -8,7 +8,6 @@ import (
"net/http"
"net/url"
"os"
"strings"
"github.com/sagernet/sing/common/buf"
"github.com/sagernet/sing/common/bufio"
@ -36,11 +35,16 @@ func NewClient(dialer N.Dialer, serverAddr M.Socksaddr, username string, passwor
}
func (c *Client) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
if !strings.HasPrefix(network, "tcp") {
network = N.NetworkName(network)
switch network {
case N.NetworkTCP:
case N.NetworkUDP:
return nil, os.ErrInvalid
default:
return nil, E.Extend(N.ErrUnknownNetwork, network)
}
var conn net.Conn
conn, err := c.dialer.DialContext(ctx, "tcp", c.serverAddr)
conn, err := c.dialer.DialContext(ctx, N.NetworkTCP, c.serverAddr)
if err != nil {
return nil, err
}

3
protocol/http/handshake.go
View file

@ -97,9 +97,6 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
DialContext: func(context context.Context, network, address string) (net.Conn, error) {
if network != "tcp" && network != "tcp4" && network != "tcp6" {
return nil, E.New("unsupported network ", network)
}
metadata.Destination = M.ParseSocksaddr(address)
metadata.Protocol = "http"
left, right := net.Pipe()