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

Improve bufio.NATPacketConn for fake ip, domain_strategy and sniff_override_destination

Browse source
This commit is contained in:
dyhkwong 2024-04-09 23:07:50 +08:00 • committed by GitHub
parent 10f242e3c9
commit 40190f9aa3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

42
common/bufio/nat.go
View file

@ -37,9 +37,15 @@ type unidirectionalNATPacketConn struct {
} }
func (c *unidirectionalNATPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) { func (c *unidirectionalNATPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
if M.SocksaddrFromNet(addr) == c.destination { destination := M.SocksaddrFromNet(addr)
addr = c.origin.UDPAddr() if destination == c.destination {
destination = c.origin
} }
if c.destination.Port == c.origin.Port && destination.AddrString() == c.destination.AddrString() {
destination.Addr = c.origin.Addr
destination.Fqdn = c.origin.Fqdn
}
addr = destination.UDPAddr()
return c.NetPacketConn.WriteTo(p, addr) return c.NetPacketConn.WriteTo(p, addr)
} }
@ -47,6 +53,10 @@ func (c *unidirectionalNATPacketConn) WritePacket(buffer *buf.Buffer, destinatio
if destination == c.destination { if destination == c.destination {
destination = c.origin destination = c.origin
} }
if c.destination.Port == c.origin.Port && destination.AddrString() == c.destination.AddrString() {
destination.Addr = c.origin.Addr
destination.Fqdn = c.origin.Fqdn
}
return c.NetPacketConn.WritePacket(buffer, destination) return c.NetPacketConn.WritePacket(buffer, destination)
} }
@ -66,16 +76,28 @@ type bidirectionalNATPacketConn struct {
func (c *bidirectionalNATPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) { func (c *bidirectionalNATPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
n, addr, err = c.NetPacketConn.ReadFrom(p) n, addr, err = c.NetPacketConn.ReadFrom(p)
if err == nil && M.SocksaddrFromNet(addr) == c.origin { destination := M.SocksaddrFromNet(addr)
addr = c.destination.UDPAddr() if err == nil && destination == c.origin {
destination = c.destination
} }
if c.destination.Port == c.origin.Port && destination.AddrString() == c.origin.AddrString() {
destination.Addr = c.destination.Addr
destination.Fqdn = c.destination.Fqdn
}
addr = destination.UDPAddr()
return return
} }
func (c *bidirectionalNATPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) { func (c *bidirectionalNATPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
if M.SocksaddrFromNet(addr) == c.destination { destination := M.SocksaddrFromNet(addr)
addr = c.origin.UDPAddr() if destination == c.destination {
destination = c.origin
} }
if c.destination.Port == c.origin.Port && destination.AddrString() == c.destination.AddrString() {
destination.Addr = c.origin.Addr
destination.Fqdn = c.origin.Fqdn
}
addr = destination.UDPAddr()
return c.NetPacketConn.WriteTo(p, addr) return c.NetPacketConn.WriteTo(p, addr)
} }
@ -84,6 +106,10 @@ func (c *bidirectionalNATPacketConn) ReadPacket(buffer *buf.Buffer) (destination
if destination == c.origin { if destination == c.origin {
destination = c.destination destination = c.destination
} }
if c.destination.Port == c.origin.Port && destination.AddrString() == c.origin.AddrString() {
destination.Addr = c.destination.Addr
destination.Fqdn = c.destination.Fqdn
}
return return
} }
@ -91,6 +117,10 @@ func (c *bidirectionalNATPacketConn) WritePacket(buffer *buf.Buffer, destination
if destination == c.destination { if destination == c.destination {
destination = c.origin destination = c.origin
} }
if c.destination.Port == c.origin.Port && destination.AddrString() == c.destination.AddrString() {
destination.Addr = c.origin.Addr
destination.Fqdn = c.origin.Fqdn
}
return c.NetPacketConn.WritePacket(buffer, destination) return c.NetPacketConn.WritePacket(buffer, destination)
} }