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

Refine socks handshake

Browse source
This commit is contained in:
世界 2022-06-30 14:42:07 +08:00
parent 880f405c03
commit 293cfb66d6
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
protocol/socks/handshake.go
View file

@ -20,7 +20,6 @@ import (
type Handler interface { type Handler interface {
N.TCPConnectionHandler N.TCPConnectionHandler
N.UDPConnectionHandler N.UDPConnectionHandler
E.Handler
} }
func ClientHandshake4(conn io.ReadWriter, command byte, destination M.Socksaddr, username string) (socks4.Response, error) { func ClientHandshake4(conn io.ReadWriter, command byte, destination M.Socksaddr, username string) (socks4.Response, error) {
@ -217,14 +216,12 @@ func HandleConnection0(ctx context.Context, conn net.Conn, version byte, authent
} }
metadata.Protocol = "socks5" metadata.Protocol = "socks5"
metadata.Destination = request.Destination metadata.Destination = request.Destination
var innerError error
go func() { go func() {
defer conn.Close() defer conn.Close()
err = handler.NewPacketConnection(ctx, NewAssociatePacketConn(udpConn, request.Destination, conn), metadata) innerError = handler.NewPacketConnection(ctx, NewAssociatePacketConn(udpConn, request.Destination, conn), metadata)
if err != nil {
handler.HandleError(err)
}
}() }()
return common.Error(io.Copy(io.Discard, conn)) return common.AnyError(innerError, common.Error(io.Copy(io.Discard, conn)))
default: default:
err = socks5.WriteResponse(conn, socks5.Response{ err = socks5.WriteResponse(conn, socks5.Response{
ReplyCode: socks5.ReplyCodeUnsupported, ReplyCode: socks5.ReplyCodeUnsupported,