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

fix: fix compatibility issue with non_linux platform

Browse source
This commit is contained in:
oracl 2024-01-19 18:35:32 +08:00
parent 1c3132c222
commit 82361a8adf
3 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
listener/tproxy/udp.go
View file

@ -74,12 +74,14 @@ func NewUDP(addr string, tunnel C.Tunnel, additions ...inbound.Addition) (*UDPLi
continue
}
rAddr, dscp, err := getOrigDstAndDSCP(oob[:oobn])
additions = append(additions, inbound.WithDSCP(dscp))
rAddr, err := getOrigDst(oob[:oobn])
if err != nil {
continue
}
dscp, _ := getDSCP(oob[:oobn])
additions = append(additions, inbound.WithDSCP(dscp))
if rAddr.Addr().Is4() {
// try to unmap 4in6 address
lAddr = netip.AddrPortFrom(lAddr.Addr().Unmap(), lAddr.Port())

27
listener/tproxy/udp_linux.go
View file

@ -96,23 +96,22 @@ func udpAddrFamily(net string, lAddr, rAddr netip.AddrPort) int {
return syscall.AF_INET6
}
func getOrigDstAndDSCP(oob []byte) (netip.AddrPort, uint8, error) {
func getOrigDst(oob []byte) (netip.AddrPort, error) {
// oob contains socket control messages which we need to parse.
scms, err := unix.ParseSocketControlMessage(oob)
if err != nil {
return netip.AddrPort{}, 0, fmt.Errorf("parse control message: %w", err)
return netip.AddrPort{}, fmt.Errorf("parse control message: %w", err)
}
// retrieve the destination address from the SCM.
sa, err := unix.ParseOrigDstAddr(&scms[1])
if err != nil {
return netip.AddrPort{}, 0, fmt.Errorf("retrieve destination: %w", err)
return netip.AddrPort{}, fmt.Errorf("retrieve destination: %w", err)
}
// retrieve DSCP from the SCM
dscp, err := parseDSCP(&scms[0])
if err != nil {
return netip.AddrPort{}, 0, fmt.Errorf("retrieve DSCP: %w", err)
return netip.AddrPort{}, fmt.Errorf("retrieve DSCP: %w", err)
}
// encode the destination address into a cmsg.
@ -123,10 +122,22 @@ func getOrigDstAndDSCP(oob []byte) (netip.AddrPort, uint8, error) {
case *unix.SockaddrInet6:
rAddr = netip.AddrPortFrom(netip.AddrFrom16(v.Addr), uint16(v.Port))
default:
return netip.AddrPort{}, 0, fmt.Errorf("unsupported address type: %T", v)
return netip.AddrPort{}, fmt.Errorf("unsupported address type: %T", v)
}
return rAddr, dscp, nil
return rAddr, nil
}
func getDSCP (oob []byte) (uint8, error) {
scms, err := unix.ParseSocketControlMessage(oob)
if err != nil {
return 0, fmt.Errorf("parse control message: %w", err)
}
dscp, err := parseDSCP(&scms[0])
if err != nil {
return 0, fmt.Errorf("retrieve DSCP: %w", err)
}
return dscp, nil
}
func parseDSCP(m *unix.SocketControlMessage) (uint8, error) {

4
listener/tproxy/udp_other.go
View file

@ -12,6 +12,10 @@ func getOrigDst(oob []byte) (netip.AddrPort, error) {
return netip.AddrPort{}, errors.New("UDP redir not supported on current platform")
}
func getDSCP(oob []byte) (uint8, error) {
return 0, errors.New("UDP redir not supported on current platform")
}
func dialUDP(network string, lAddr, rAddr netip.AddrPort) (*net.UDPConn, error) {
return nil, errors.New("UDP redir not supported on current platform")
}