GuanM/hysteria-dev
1
0
Fork 0
mirror of https://github.com/cmz0228/hysteria-dev.git synced 2025-06-08 13:29:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: reduce obfs gc overhead by reusing buffers

Browse Source
This commit is contained in:
Toby 2021-12-23 17:25:11 -08:00
parent 8bd5573c93
commit 9e5483c11b
6 changed files with 83 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/core/client.go
View File

@ -76,10 +76,7 @@ func (c *Client) connectToServer() error {
return err
}
if c.obfuscator != nil {
pktConn = &obfsUDPConn{
Orig: udpConn,
Obfuscator: c.obfuscator,
}
pktConn = newObfsUDPConn(udpConn, c.obfuscator)
} else {
pktConn = udpConn
}
@ -89,10 +86,7 @@ func (c *Client) connectToServer() error {
return err
}
if c.obfuscator != nil {
pktConn = &obfsPacketConn{
Orig: ftcpConn,
Obfuscator: c.obfuscator,
}
pktConn = newObfsPacketConn(ftcpConn, c.obfuscator)
} else {
pktConn = ftcpConn
}

99
pkg/core/obfs.go
View File

@ -3,41 +3,60 @@ package core
import (
"net"
"os"
"sync"
"syscall"
"time"
)
type Obfuscator interface {
Deobfuscate(in []byte, out []byte) int
Obfuscate(p []byte) []byte
Obfuscate(in []byte, out []byte) int
}
type obfsUDPConn struct {
Orig *net.UDPConn
Obfuscator Obfuscator
orig *net.UDPConn
obfs Obfuscator
readBuf []byte
readMutex sync.Mutex
writeBuf []byte
writeMutex sync.Mutex
}
func newObfsUDPConn(orig *net.UDPConn, obfs Obfuscator) *obfsUDPConn {
return &obfsUDPConn{
orig: orig,
obfs: obfs,
readBuf: make([]byte, udpBufferSize),
writeBuf: make([]byte, udpBufferSize),
}
}
func (c *obfsUDPConn) ReadFrom(p []byte) (int, net.Addr, error) {
buf := make([]byte, udpBufferSize)
for {
n, addr, err := c.Orig.ReadFrom(buf)
c.readMutex.Lock()
n, addr, err := c.orig.ReadFrom(c.readBuf)
if n <= 0 {
c.readMutex.Unlock()
return 0, addr, err
}
newN := c.Obfuscator.Deobfuscate(buf[:n], p)
newN := c.obfs.Deobfuscate(c.readBuf[:n], p)
c.readMutex.Unlock()
if newN > 0 {
// Valid packet
return newN, addr, err
} else if err != nil {
// Not valid and Orig.ReadFrom had some error
// Not valid and orig.ReadFrom had some error
return 0, addr, err
}
}
}
func (c *obfsUDPConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
np := c.Obfuscator.Obfuscate(p)
_, err = c.Orig.WriteTo(np, addr)
c.writeMutex.Lock()
bn := c.obfs.Obfuscate(p, c.writeBuf)
_, err = c.orig.WriteTo(c.writeBuf[:bn], addr)
c.writeMutex.Unlock()
if err != nil {
return 0, err
} else {
@ -46,67 +65,85 @@ func (c *obfsUDPConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
}
func (c *obfsUDPConn) Close() error {
return c.Orig.Close()
return c.orig.Close()
}
func (c *obfsUDPConn) LocalAddr() net.Addr {
return c.Orig.LocalAddr()
return c.orig.LocalAddr()
}
func (c *obfsUDPConn) SetDeadline(t time.Time) error {
return c.Orig.SetDeadline(t)
return c.orig.SetDeadline(t)
}
func (c *obfsUDPConn) SetReadDeadline(t time.Time) error {
return c.Orig.SetReadDeadline(t)
return c.orig.SetReadDeadline(t)
}
func (c *obfsUDPConn) SetWriteDeadline(t time.Time) error {
return c.Orig.SetWriteDeadline(t)
return c.orig.SetWriteDeadline(t)
}
func (c *obfsUDPConn) SetReadBuffer(bytes int) error {
return c.Orig.SetReadBuffer(bytes)
return c.orig.SetReadBuffer(bytes)
}
func (c *obfsUDPConn) SetWriteBuffer(bytes int) error {
return c.Orig.SetWriteBuffer(bytes)
return c.orig.SetWriteBuffer(bytes)
}
func (c *obfsUDPConn) SyscallConn() (syscall.RawConn, error) {
return c.Orig.SyscallConn()
return c.orig.SyscallConn()
}
func (c *obfsUDPConn) File() (f *os.File, err error) {
return c.Orig.File()
return c.orig.File()
}
type obfsPacketConn struct {
Orig net.PacketConn
Obfuscator Obfuscator
orig net.PacketConn
obfs Obfuscator
readBuf []byte
readMutex sync.Mutex
writeBuf []byte
writeMutex sync.Mutex
}
func newObfsPacketConn(orig net.PacketConn, obfs Obfuscator) *obfsPacketConn {
return &obfsPacketConn{
orig: orig,
obfs: obfs,
readBuf: make([]byte, udpBufferSize),
writeBuf: make([]byte, udpBufferSize),
}
}
func (c *obfsPacketConn) ReadFrom(p []byte) (int, net.Addr, error) {
buf := make([]byte, udpBufferSize)
for {
n, addr, err := c.Orig.ReadFrom(buf)
c.readMutex.Lock()
n, addr, err := c.orig.ReadFrom(c.readBuf)
if n <= 0 {
c.readMutex.Unlock()
return 0, addr, err
}
newN := c.Obfuscator.Deobfuscate(buf[:n], p)
newN := c.obfs.Deobfuscate(c.readBuf[:n], p)
c.readMutex.Unlock()
if newN > 0 {
// Valid packet
return newN, addr, err
} else if err != nil {
// Not valid and Orig.ReadFrom had some error
// Not valid and orig.ReadFrom had some error
return 0, addr, err
}
}
}
func (c *obfsPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
np := c.Obfuscator.Obfuscate(p)
_, err = c.Orig.WriteTo(np, addr)
c.writeMutex.Lock()
bn := c.obfs.Obfuscate(p, c.writeBuf)
_, err = c.orig.WriteTo(c.writeBuf[:bn], addr)
c.writeMutex.Unlock()
if err != nil {
return 0, err
} else {
@ -115,21 +152,21 @@ func (c *obfsPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
}
func (c *obfsPacketConn) Close() error {
return c.Orig.Close()
return c.orig.Close()
}
func (c *obfsPacketConn) LocalAddr() net.Addr {
return c.Orig.LocalAddr()
return c.orig.LocalAddr()
}
func (c *obfsPacketConn) SetDeadline(t time.Time) error {
return c.Orig.SetDeadline(t)
return c.orig.SetDeadline(t)
}
func (c *obfsPacketConn) SetReadDeadline(t time.Time) error {
return c.Orig.SetReadDeadline(t)
return c.orig.SetReadDeadline(t)
}
func (c *obfsPacketConn) SetWriteDeadline(t time.Time) error {
return c.Orig.SetWriteDeadline(t)
return c.orig.SetWriteDeadline(t)
}

10
pkg/core/server.go
View File

@ -53,10 +53,7 @@ func NewServer(addr string, protocol string, tlsConfig *tls.Config, quicConfig *
return nil, err
}
if obfuscator != nil {
pktConn = &obfsUDPConn{
Orig: udpConn,
Obfuscator: obfuscator,
}
pktConn = newObfsUDPConn(udpConn, obfuscator)
} else {
pktConn = udpConn
}
@ -66,10 +63,7 @@ func NewServer(addr string, protocol string, tlsConfig *tls.Config, quicConfig *
return nil, err
}
if obfuscator != nil {
pktConn = &obfsPacketConn{
Orig: ftcpConn,
Obfuscator: obfuscator,
}
pktConn = newObfsPacketConn(ftcpConn, obfuscator)
} else {
pktConn = ftcpConn
}

20
pkg/obfs/xor.go
View File

@ -1,20 +0,0 @@
package obfs
type XORObfuscator []byte
func (x XORObfuscator) Deobfuscate(in []byte, out []byte) int {
l := len(x)
for i := range in {
out[i] = in[i] ^ x[i%l]
}
return len(in)
}
func (x XORObfuscator) Obfuscate(p []byte) []byte {
np := make([]byte, len(p))
l := len(x)
for i := range p {
np[i] = p[i] ^ x[i%l]
}
return np
}

14
pkg/obfs/xplus.go
View File

@ -39,16 +39,14 @@ func (x *XPlusObfuscator) Deobfuscate(in []byte, out []byte) int {
return pLen
}
func (x *XPlusObfuscator) Obfuscate(p []byte) []byte {
pLen := len(p)
buf := make([]byte, saltLen+pLen)
func (x *XPlusObfuscator) Obfuscate(in []byte, out []byte) int {
x.lk.Lock()
_, _ = x.RandSrc.Read(buf[:saltLen]) // salt
_, _ = x.RandSrc.Read(out[:saltLen]) // salt
x.lk.Unlock()
// Obfuscate the payload
key := sha256.Sum256(append(x.Key, buf[:saltLen]...))
for i, c := range p {
buf[i+saltLen] = c ^ key[i%sha256.Size]
key := sha256.Sum256(append(x.Key, out[:saltLen]...))
for i, c := range in {
out[i+saltLen] = c ^ key[i%sha256.Size]
}
return buf
return len(in) + saltLen
}

10
pkg/obfs/xplus_test.go
View File

@ -20,11 +20,11 @@ func TestXPlusObfuscator(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
bs := x.Obfuscate(tt.p)
outBs := make([]byte, len(bs))
n := x.Deobfuscate(bs, outBs)
if !bytes.Equal(tt.p, outBs[:n]) {
t.Errorf("Inconsistent deobfuscate result: got %v, want %v", outBs[:n], tt.p)
buf := make([]byte, 10240)
n := x.Obfuscate(tt.p, buf)
n2 := x.Deobfuscate(buf[:n], buf[n:])
if !bytes.Equal(tt.p, buf[n:n+n2]) {
t.Errorf("Inconsistent deobfuscate result: got %v, want %v", buf[n:n+n2], tt.p)
}
})
}