purgatory/Clash.Meta
1
0
Fork 0
mirror of https://github.com/MetaCubeX/Clash.Meta.git synced 2025-04-16 07:20:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore: better addr parsing

Browse source
This commit is contained in:
wwqgtxx 2025-04-06 10:43:21 +08:00
parent 09c7ee0d12
commit 9e8f4ada47
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
listener/sing_shadowsocks/server.go
View file

@ -196,7 +196,7 @@ func (l *Listener) HandleConn(conn net.Conn, tunnel C.Tunnel, additions ...inbou
ctx := sing.WithAdditions(context.TODO(), additions...)
err := l.service.NewConnection(ctx, conn, M.Metadata{
Protocol: "shadowsocks",
Source: M.ParseSocksaddr(conn.RemoteAddr().String()),
Source: M.SocksaddrFromNet(conn.RemoteAddr()),
})
if err != nil {
_ = conn.Close()

2
listener/sing_vless/server.go
View file

@ -201,7 +201,7 @@ func (l *Listener) HandleConn(conn net.Conn, tunnel C.Tunnel, additions ...inbou
ctx := sing.WithAdditions(context.TODO(), additions...)
err := l.service.NewConnection(ctx, conn, metadata.Metadata{
Protocol: "vless",
Source: metadata.ParseSocksaddr(conn.RemoteAddr().String()),
Source: metadata.SocksaddrFromNet(conn.RemoteAddr()),
})
if err != nil {
_ = conn.Close()

2
listener/sing_vmess/server.go
View file

@ -187,7 +187,7 @@ func (l *Listener) HandleConn(conn net.Conn, tunnel C.Tunnel, additions ...inbou
ctx := sing.WithAdditions(context.TODO(), additions...)
err := l.service.NewConnection(ctx, conn, metadata.Metadata{
Protocol: "vmess",
Source: metadata.ParseSocksaddr(conn.RemoteAddr().String()),
Source: metadata.SocksaddrFromNet(conn.RemoteAddr()),
})
if err != nil {
_ = conn.Close()

17
transport/socks5/socks5.go
View file

@ -189,7 +189,7 @@ func ServerHandshake(rw net.Conn, authenticator auth.Authenticator) (addr Addr,
switch command {
case CmdConnect, CmdUDPAssociate:
// Acquire server listened address info
localAddr := ParseAddr(rw.LocalAddr().String())
localAddr := ParseAddrToSocksAddr(rw.LocalAddr())
if localAddr == nil {
err = ErrAddressNotSupported
} else {
@ -414,12 +414,15 @@ func ParseAddr(s string) Addr {
func ParseAddrToSocksAddr(addr net.Addr) Addr {
var hostip net.IP
var port int
if udpaddr, ok := addr.(*net.UDPAddr); ok {
hostip = udpaddr.IP
port = udpaddr.Port
} else if tcpaddr, ok := addr.(*net.TCPAddr); ok {
hostip = tcpaddr.IP
port = tcpaddr.Port
switch addr := addr.(type) {
case *net.UDPAddr:
hostip = addr.IP
port = addr.Port
case *net.TCPAddr:
hostip = addr.IP
port = addr.Port
case nil:
return nil
}
// fallback parse