hesoyam/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-07-12 14:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Salamander finalmask: Support packetSize (Gecko in Hysteria v2.9.2) (#6198)

Browse Source 
And some other refinements

https://github.com/XTLS/Xray-core/pull/6198#issuecomment-4567438813

Example: https://github.com/XTLS/Xray-core/pull/6198#issue-4522226670
This commit is contained in:
LjhAUMEM
2026-05-29 16:36:45 +08:00
committed by RPRX
parent 36303694d1
commit 66a8100737
17 changed files with 587 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
transport/internet/finalmask/finalmask.go
+56 -53
View File
@@ -3,9 +3,8 @@ package finalmask
import (
"context"
"net"
"sync"
"github.com/xtls/xray-core/common/bytespool"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/errors"
)
@@ -105,61 +104,60 @@ type headerSize interface {
}
type headerManagerConn struct {
sync.Mutex
net.PacketConn
sizes []int
conns []net.PacketConn
writeBuf [UDPSize]byte
sizes []int
conns []net.PacketConn
}
func (c *headerManagerConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
buf := p
if len(buf) < UDPSize {
b := bytespool.Alloc(UDPSize)
b = b[:UDPSize]
defer bytespool.Free(b)
buf = b
b := p
if len(b) < UDPSize {
buf := buf.New()
buf.Resize(0, UDPSize)
b = buf.Bytes()
defer buf.Release()
}
n, addr, err = c.PacketConn.ReadFrom(buf)
if n == 0 || err != nil {
return 0, addr, err
}
newBuf := buf[:n]
sum := 0
for _, size := range c.sizes {
sum += size
}
if n < sum {
errors.LogDebug(context.Background(), addr, " mask read err short length")
return 0, addr, nil
}
for i := range c.conns {
n, _, err = c.conns[i].ReadFrom(newBuf)
if n == 0 || err != nil {
errors.LogDebug(context.Background(), addr, " mask read err ", err)
return 0, addr, nil
for {
n, addr, err = c.PacketConn.ReadFrom(b)
if err != nil {
return n, addr, err
}
newBuf = newBuf[c.sizes[i] : n+c.sizes[i]]
b = b[:n]
sum := 0
for _, size := range c.sizes {
sum += size
}
if n < sum {
errors.LogError(context.Background(), "[mask] drop packet from ", addr, " with size ", len(b))
continue
}
for i := range c.conns {
n, _, err = c.conns[i].ReadFrom(b)
if err != nil {
errors.LogErrorInner(context.Background(), err, "[mask] drop packet from ", addr, " with size ", len(b))
break
}
b = b[c.sizes[i] : n+c.sizes[i]]
}
if err != nil {
continue
}
return copy(p, b), addr, nil
}
if len(p) < n {
errors.LogDebug(context.Background(), addr, " mask read err short buffer")
return 0, addr, nil
}
copy(p, buf[sum:sum+n])
return n, addr, nil
}
func (c *headerManagerConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
c.Lock()
defer c.Unlock()
buf := buf.New()
buf.Resize(0, UDPSize)
b := buf.Bytes()
defer buf.Release()
sum := 0
for _, size := range c.sizes {
@@ -167,24 +165,29 @@ func (c *headerManagerConn) WriteTo(p []byte, addr net.Addr) (n int, err error)
}
if sum+len(p) > UDPSize {
errors.LogDebug(context.Background(), addr, " mask write err short write")
errors.LogError(context.Background(), "[mask] drop packet to ", addr, " with size ", len(p))
return 0, nil
}
n = copy(c.writeBuf[sum:], p)
n = copy(b[sum:], p)
for i := len(c.conns) - 1; i >= 0; i-- {
n, err = c.conns[i].WriteTo(c.writeBuf[sum-c.sizes[i]:n+sum], nil)
if n == 0 || err != nil {
errors.LogDebug(context.Background(), addr, " mask write err ", err)
n, err = c.conns[i].WriteTo(b[sum-c.sizes[i]:n+sum], nil)
if err != nil {
errors.LogErrorInner(context.Background(), err, "[mask] drop packet to ", addr, " with size ", len(p))
return 0, nil
}
sum -= c.sizes[i]
}
n, err = c.PacketConn.WriteTo(c.writeBuf[:n], addr)
if n == 0 || err != nil {
return n, err
if n > UDPSize {
errors.LogError(context.Background(), "[mask] drop packet to ", addr, " with size ", len(p))
return 0, nil
}
_, err = c.PacketConn.WriteTo(b[:n], addr)
if err != nil {
return 0, err
}
return len(p), nil