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

add buffer size option for udp connection

Browse Source
This commit is contained in:
ginuerzh
2025-07-30 21:40:53 +08:00
parent b64e5901b6
commit a5309eee97
26 changed files with 218 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/net/udp/listener.go
+6
View File
@@ -176,6 +176,8 @@ func (c *conn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
if !c.keepalive {
defer c.Close()
}
c.SetIdle(false)
return c.PacketConn.WriteTo(b, addr)
}
@@ -212,6 +214,10 @@ func (c *conn) RemoteAddr() net.Addr {
return c.remoteAddr
}
func (c *conn) SetReadDeadline(t time.Time) error {
return nil
}
func (c *conn) IsIdle() bool {
return atomic.LoadInt32(&c.idle) > 0
}
internal/net/udp/relay.go
+25 -13
View File
@@ -2,23 +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
defaultBufferSize = 4096
)
type Relay struct {
pc1 net.PacketConn
pc2 net.PacketConn
bypass bypass.Bypass
logger logger.Logger
pc1 net.PacketConn
pc2 net.PacketConn
bufferSize int
bypass bypass.Bypass
logger logger.Logger
}
func NewRelay(pc1, pc2 net.PacketConn) *Relay {
@@ -38,14 +38,26 @@ func (r *Relay) WithLogger(logger logger.Logger) *Relay {
return r
}
func (r *Relay) WithBufferSize(n int) *Relay {
r.bufferSize = n
return r
}
func (r *Relay) Run(ctx context.Context) (err error) {
errc := make(chan error, 2)
bufferSize := r.bufferSize
if bufferSize <= 0 {
bufferSize = defaultBufferSize
}
go func() {
var b [MaxMessageSize]byte
b := bufpool.Get(bufferSize)
defer bufpool.Put(b)
for {
err := func() error {
n, raddr, err := r.pc1.ReadFrom(b[:])
n, raddr, err := r.pc1.ReadFrom(b)
if err != nil {
return err
}
@@ -64,7 +76,6 @@ func (r *Relay) Run(ctx context.Context) (err error) {
if r.logger != nil {
r.logger.Tracef("%s >>> %s data: %d",
r.pc2.LocalAddr(), raddr, n)
}
return nil
@@ -78,10 +89,12 @@ func (r *Relay) Run(ctx context.Context) (err error) {
}()
go func() {
var b [MaxMessageSize]byte
b := bufpool.Get(bufferSize)
defer bufpool.Put(b)
for {
err := func() error {
n, raddr, err := r.pc2.ReadFrom(b[:])
n, raddr, err := r.pc2.ReadFrom(b)
if err != nil {
return err
}
@@ -100,7 +113,6 @@ func (r *Relay) Run(ctx context.Context) (err error) {
if r.logger != nil {
r.logger.Tracef("%s <<< %s data: %d",
r.pc2.LocalAddr(), raddr, n)
}
return nil
internal/util/relay/conn.go
-88
View File
@@ -1,10 +1,8 @@
package relay
import (
"bytes"
"net"
"github.com/go-gost/core/common/bufpool"
"github.com/go-gost/gosocks5"
"github.com/go-gost/relay"
)
@@ -108,89 +106,3 @@ func (c *udpTunConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
func (c *udpTunConn) Write(b []byte) (n int, err error) {
return c.WriteTo(b, c.taddr)
}
var (
DefaultBufferSize = 4096
)
type udpConn struct {
net.PacketConn
raddr net.Addr
taddr net.Addr
bufferSize int
}
func UDPConn(c net.PacketConn, bufferSize int) net.PacketConn {
return &udpConn{
PacketConn: c,
bufferSize: bufferSize,
}
}
// ReadFrom reads an UDP datagram.
// 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)
n, c.raddr, err = c.PacketConn.ReadFrom(rbuf)
if err != nil {
return
}
socksAddr := gosocks5.Addr{}
header := gosocks5.UDPHeader{
Addr: &socksAddr,
}
hlen, err := header.ReadFrom(bytes.NewReader(rbuf[:n]))
if err != nil {
return
}
n = copy(b, rbuf[hlen:n])
addr, err = net.ResolveUDPAddr("udp", socksAddr.String())
return
}
func (c *udpConn) Read(b []byte) (n int, err error) {
n, _, err = c.ReadFrom(b)
return
}
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 {
return
}
header := gosocks5.UDPHeader{
Addr: &socksAddr,
}
dgram := gosocks5.UDPDatagram{
Header: &header,
Data: b,
}
buf := bytes.NewBuffer(wbuf[:0])
_, err = dgram.WriteTo(buf)
if err != nil {
return
}
_, err = c.PacketConn.WriteTo(buf.Bytes(), c.raddr)
n = len(b)
return
}
func (c *udpConn) Write(b []byte) (n int, err error) {
return c.WriteTo(b, c.taddr)
}
func (c *udpConn) RemoteAddr() net.Addr {
return c.raddr
}
internal/util/socks/conn.go
+21 -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"
)
@@ -86,18 +86,23 @@ func (c *udpTunConn) Write(b []byte) (n int, err error) {
}
const (
MaxMessageSize = math.MaxUint16
defaultBufferSize = 4096
)
type udpConn struct {
net.PacketConn
raddr net.Addr
taddr net.Addr
raddr net.Addr
taddr net.Addr
bufferSize int
}
func UDPConn(c net.PacketConn) net.PacketConn {
func UDPConn(c net.PacketConn, bufferSize int) net.PacketConn {
if bufferSize <= 0 {
bufferSize = defaultBufferSize
}
return &udpConn{
PacketConn: c,
bufferSize: bufferSize,
}
}
@@ -105,9 +110,10 @@ func UDPConn(c net.PacketConn) 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) {
var rbuf [MaxMessageSize]byte
buf := bufpool.Get(c.bufferSize)
defer bufpool.Put(buf)
n, c.raddr, err = c.PacketConn.ReadFrom(rbuf[:])
n, c.raddr, err = c.PacketConn.ReadFrom(buf)
if err != nil {
return
}
@@ -116,11 +122,11 @@ func (c *udpConn) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
header := gosocks5.UDPHeader{
Addr: &socksAddr,
}
hlen, err := header.ReadFrom(bytes.NewReader(rbuf[:n]))
hlen, err := header.ReadFrom(bytes.NewReader(buf[:n]))
if err != nil {
return
}
n = copy(b, rbuf[hlen:n])
n = copy(b, buf[hlen:n])
addr, err = net.ResolveUDPAddr("udp", socksAddr.String())
return
@@ -132,7 +138,6 @@ func (c *udpConn) Read(b []byte) (n int, err error) {
}
func (c *udpConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
socksAddr := gosocks5.Addr{}
if err = socksAddr.ParseFrom(addr.String()); err != nil {
return
@@ -146,14 +151,16 @@ func (c *udpConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
Data: b,
}
var wbuf [MaxMessageSize]byte
buf := bytes.NewBuffer(wbuf[:][:0])
_, err = dgram.WriteTo(buf)
buf := bufpool.Get(c.bufferSize)
defer bufpool.Put(buf)
bw := bytes.NewBuffer(buf[:0])
_, err = dgram.WriteTo(bw)
if err != nil {
return
}
_, err = c.PacketConn.WriteTo(buf.Bytes(), c.raddr)
_, err = c.PacketConn.WriteTo(bw.Bytes(), c.raddr)
n = len(b)
return
internal/util/ss/conn.go
+28 -15
View File
@@ -2,14 +2,14 @@ package ss
import (
"bytes"
"math"
"net"
"github.com/go-gost/core/common/bufpool"
"github.com/go-gost/gosocks5"
)
const (
MaxMessageSize = math.MaxUint16
defaultBufferSize = 4096
)
var (
@@ -19,40 +19,52 @@ var (
type UDPConn struct {
net.PacketConn
raddr net.Addr
taddr net.Addr
raddr net.Addr
taddr net.Addr
bufferSize int
}
func UDPClientConn(c net.PacketConn, remoteAddr, targetAddr net.Addr) *UDPConn {
func UDPClientConn(c net.PacketConn, remoteAddr, targetAddr net.Addr, bufferSize int) *UDPConn {
if bufferSize <= 0 {
bufferSize = defaultBufferSize
}
return &UDPConn{
PacketConn: c,
raddr: remoteAddr,
taddr: targetAddr,
bufferSize: bufferSize,
}
}
func UDPServerConn(c net.PacketConn, remoteAddr net.Addr) *UDPConn {
func UDPServerConn(c net.PacketConn, remoteAddr net.Addr, bufferSize int) *UDPConn {
if bufferSize <= 0 {
bufferSize = defaultBufferSize
}
return &UDPConn{
PacketConn: c,
raddr: remoteAddr,
bufferSize: bufferSize,
}
}
func (c *UDPConn) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
var rbuf [MaxMessageSize]byte
buf := bufpool.Get(c.bufferSize)
defer bufpool.Put(buf)
n, _, err = c.PacketConn.ReadFrom(rbuf[:])
n, _, err = c.PacketConn.ReadFrom(buf)
if err != nil {
return
}
saddr := gosocks5.Addr{}
addrLen, err := saddr.ReadFrom(bytes.NewReader(rbuf[:n]))
addrLen, err := saddr.ReadFrom(bytes.NewReader(buf[:n]))
if err != nil {
return
}
n = copy(b, rbuf[addrLen:n])
n = copy(b, buf[addrLen:n])
addr, err = net.ResolveUDPAddr("udp", saddr.String())
return
@@ -64,20 +76,21 @@ func (c *UDPConn) Read(b []byte) (n int, err error) {
}
func (c *UDPConn) WriteTo(b []byte, addr net.Addr) (n int, err error) {
var wbuf [MaxMessageSize]byte
socksAddr := gosocks5.Addr{}
if err = socksAddr.ParseFrom(addr.String()); err != nil {
return
}
addrLen, err := socksAddr.Encode(wbuf[:])
buf := bufpool.Get(c.bufferSize)
defer bufpool.Put(buf)
addrLen, err := socksAddr.Encode(buf)
if err != nil {
return
}
n = copy(wbuf[addrLen:], b)
_, err = c.PacketConn.WriteTo(wbuf[:addrLen+n], c.raddr)
n = copy(buf[addrLen:], b)
_, err = c.PacketConn.WriteTo(buf[:addrLen+n], c.raddr)
return
}