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

fix

Browse source
This commit is contained in:
世界 2024-04-10 20:10:22 +08:00
parent 40190f9aa3
commit 0467888f27
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 52 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

87
common/bufio/nat.go
View file

@ -17,16 +17,16 @@ type NATPacketConn interface {
func NewUnidirectionalNATPacketConn(conn N.NetPacketConn, origin M.Socksaddr, destination M.Socksaddr) NATPacketConn { func NewUnidirectionalNATPacketConn(conn N.NetPacketConn, origin M.Socksaddr, destination M.Socksaddr) NATPacketConn {
return &unidirectionalNATPacketConn{ return &unidirectionalNATPacketConn{
NetPacketConn: conn, NetPacketConn: conn,
origin: origin, origin: socksaddrWithoutPort(origin),
destination: destination, destination: socksaddrWithoutPort(destination),
} }
} }
func NewNATPacketConn(conn N.NetPacketConn, origin M.Socksaddr, destination M.Socksaddr) NATPacketConn { func NewNATPacketConn(conn N.NetPacketConn, origin M.Socksaddr, destination M.Socksaddr) NATPacketConn {
return &bidirectionalNATPacketConn{ return &bidirectionalNATPacketConn{
NetPacketConn: conn, NetPacketConn: conn,
origin: origin, origin: socksaddrWithoutPort(origin),
destination: destination, destination: socksaddrWithoutPort(destination),
} }
} }
@ -38,24 +38,23 @@ 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) {
destination := M.SocksaddrFromNet(addr) destination := M.SocksaddrFromNet(addr)
if destination == c.destination { if socksaddrWithoutPort(destination) == c.destination {
destination = c.origin destination = M.Socksaddr{
Addr: c.origin.Addr,
Fqdn: c.origin.Fqdn,
Port: destination.Port,
} }
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, destination.UDPAddr())
return c.NetPacketConn.WriteTo(p, addr)
} }
func (c *unidirectionalNATPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error { func (c *unidirectionalNATPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
if destination == c.destination { if socksaddrWithoutPort(destination) == c.destination {
destination = c.origin destination = M.Socksaddr{
Addr: c.origin.Addr,
Fqdn: c.origin.Fqdn,
Port: destination.Port,
} }
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)
} }
@ -76,13 +75,16 @@ 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)
destination := M.SocksaddrFromNet(addr) if err != nil {
if err == nil && destination == c.origin { return
destination = c.destination }
destination := M.SocksaddrFromNet(addr)
if socksaddrWithoutPort(destination) == c.origin {
destination = M.Socksaddr{
Addr: c.destination.Addr,
Fqdn: c.destination.Fqdn,
Port: destination.Port,
} }
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() addr = destination.UDPAddr()
return return
@ -90,36 +92,38 @@ func (c *bidirectionalNATPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, e
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) {
destination := M.SocksaddrFromNet(addr) destination := M.SocksaddrFromNet(addr)
if destination == c.destination { if socksaddrWithoutPort(destination) == c.destination {
destination = c.origin destination = M.Socksaddr{
Addr: c.origin.Addr,
Fqdn: c.origin.Fqdn,
Port: destination.Port,
} }
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, destination.UDPAddr())
return c.NetPacketConn.WriteTo(p, addr)
} }
func (c *bidirectionalNATPacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksaddr, err error) { func (c *bidirectionalNATPacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksaddr, err error) {
destination, err = c.NetPacketConn.ReadPacket(buffer) destination, err = c.NetPacketConn.ReadPacket(buffer)
if destination == c.origin { if err != nil {
destination = c.destination return
}
if socksaddrWithoutPort(destination) == c.origin {
destination = M.Socksaddr{
Addr: c.destination.Addr,
Fqdn: c.destination.Fqdn,
Port: destination.Port,
} }
if c.destination.Port == c.origin.Port && destination.AddrString() == c.origin.AddrString() {
destination.Addr = c.destination.Addr
destination.Fqdn = c.destination.Fqdn
} }
return return
} }
func (c *bidirectionalNATPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error { func (c *bidirectionalNATPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
if destination == c.destination { if socksaddrWithoutPort(destination) == c.destination {
destination = c.origin destination = M.Socksaddr{
Addr: c.origin.Addr,
Fqdn: c.origin.Fqdn,
Port: destination.Port,
} }
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)
} }
@ -131,3 +135,8 @@ func (c *bidirectionalNATPacketConn) UpdateDestination(destinationAddress netip.
func (c *bidirectionalNATPacketConn) Upstream() any { func (c *bidirectionalNATPacketConn) Upstream() any {
return c.NetPacketConn return c.NetPacketConn
} }
func socksaddrWithoutPort(destination M.Socksaddr) M.Socksaddr {
destination.Port = 0
return destination
}