go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use fixed buffer size

Browse Source
This commit is contained in:
ginuerzh
2025-02-18 17:38:27 +08:00
parent d610e2dc01
commit e0915affda
14 changed files with 67 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/net/udp/relay.go
+11 -21
View File
@@ -2,20 +2,23 @@ package udp
import (
"context"
"math"
"net"
"github.com/go-gost/core/bypass"
"github.com/go-gost/core/common/bufpool"
"github.com/go-gost/core/logger"
)
const (
MaxMessageSize = math.MaxUint16
)
type Relay struct {
pc1 net.PacketConn
pc2 net.PacketConn
bypass bypass.Bypass
bufferSize int
logger logger.Logger
bypass bypass.Bypass
logger logger.Logger
}
func NewRelay(pc1, pc2 net.PacketConn) *Relay {
@@ -35,25 +38,14 @@ func (r *Relay) WithLogger(logger logger.Logger) *Relay {
return r
}
func (r *Relay) SetBufferSize(n int) {
r.bufferSize = n
}
func (r *Relay) Run(ctx context.Context) (err error) {
bufSize := r.bufferSize
if bufSize <= 0 {
bufSize = 4096
}
errc := make(chan error, 2)
go func() {
var b [MaxMessageSize]byte
for {
err := func() error {
b := bufpool.Get(bufSize)
defer bufpool.Put(b)
n, raddr, err := r.pc1.ReadFrom(b)
n, raddr, err := r.pc1.ReadFrom(b[:])
if err != nil {
return err
}
@@ -86,12 +78,10 @@ func (r *Relay) Run(ctx context.Context) (err error) {
}()
go func() {
var b [MaxMessageSize]byte
for {
err := func() error {
b := bufpool.Get(bufSize)
defer bufpool.Put(b)
n, raddr, err := r.pc2.ReadFrom(b)
n, raddr, err := r.pc2.ReadFrom(b[:])
if err != nil {
return err
}
internal/util/socks/conn.go
+10 -14
View File
@@ -2,9 +2,9 @@ package socks
import (
"bytes"
"math"
"net"
"github.com/go-gost/core/common/bufpool"
"github.com/go-gost/gosocks5"
)
@@ -85,21 +85,19 @@ func (c *udpTunConn) Write(b []byte) (n int, err error) {
return c.WriteTo(b, c.taddr)
}
var (
DefaultBufferSize = 4096
const (
MaxMessageSize = math.MaxUint16
)
type udpConn struct {
net.PacketConn
raddr net.Addr
taddr net.Addr
bufferSize int
raddr net.Addr
taddr net.Addr
}
func UDPConn(c net.PacketConn, bufferSize int) net.PacketConn {
func UDPConn(c net.PacketConn) net.PacketConn {
return &udpConn{
PacketConn: c,
bufferSize: bufferSize,
}
}
@@ -107,10 +105,9 @@ func UDPConn(c net.PacketConn, bufferSize int) net.PacketConn {
// NOTE: for server side,
// the returned addr is the target address the client want to relay to.
func (c *udpConn) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
rbuf := bufpool.Get(c.bufferSize)
defer bufpool.Put(rbuf)
var rbuf [MaxMessageSize]byte
n, c.raddr, err = c.PacketConn.ReadFrom(rbuf)
n, c.raddr, err = c.PacketConn.ReadFrom(rbuf[:])
if err != nil {
return
}
@@ -135,8 +132,6 @@ func (c *udpConn) Read(b []byte) (n int, err error) {
}
func (c *udpConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
wbuf := bufpool.Get(c.bufferSize)
defer bufpool.Put(wbuf)
socksAddr := gosocks5.Addr{}
if err = socksAddr.ParseFrom(addr.String()); err != nil {
@@ -151,7 +146,8 @@ func (c *udpConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
Data: b,
}
buf := bytes.NewBuffer(wbuf[:0])
var wbuf [MaxMessageSize]byte
buf := bytes.NewBuffer(wbuf[:][:0])
_, err = dgram.WriteTo(buf)
if err != nil {
return
internal/util/ss/conn.go
+11 -16
View File
@@ -2,14 +2,14 @@ package ss
import (
"bytes"
"math"
"net"
"github.com/go-gost/core/common/bufpool"
"github.com/go-gost/gosocks5"
)
var (
DefaultBufferSize = 4096
const (
MaxMessageSize = math.MaxUint16
)
var (
@@ -19,33 +19,29 @@ var (
type UDPConn struct {
net.PacketConn
raddr net.Addr
taddr net.Addr
bufferSize int
raddr net.Addr
taddr net.Addr
}
func UDPClientConn(c net.PacketConn, remoteAddr, targetAddr net.Addr, bufferSize int) *UDPConn {
func UDPClientConn(c net.PacketConn, remoteAddr, targetAddr net.Addr) *UDPConn {
return &UDPConn{
PacketConn: c,
raddr: remoteAddr,
taddr: targetAddr,
bufferSize: bufferSize,
}
}
func UDPServerConn(c net.PacketConn, remoteAddr net.Addr, bufferSize int) *UDPConn {
func UDPServerConn(c net.PacketConn, remoteAddr net.Addr) *UDPConn {
return &UDPConn{
PacketConn: c,
raddr: remoteAddr,
bufferSize: bufferSize,
}
}
func (c *UDPConn) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
rbuf := bufpool.Get(c.bufferSize)
defer bufpool.Put(rbuf)
var rbuf [MaxMessageSize]byte
n, _, err = c.PacketConn.ReadFrom(rbuf)
n, _, err = c.PacketConn.ReadFrom(rbuf[:])
if err != nil {
return
}
@@ -68,15 +64,14 @@ func (c *UDPConn) Read(b []byte) (n int, err error) {
}
func (c *UDPConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
wbuf := bufpool.Get(c.bufferSize)
defer bufpool.Put(wbuf)
var wbuf [MaxMessageSize]byte
socksAddr := gosocks5.Addr{}
if err = socksAddr.ParseFrom(addr.String()); err != nil {
return
}
addrLen, err := socksAddr.Encode(wbuf)
addrLen, err := socksAddr.Encode(wbuf[:])
if err != nil {
return
}