history-museum/clash
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve: recycle buffer after packet used

Browse Source
This commit is contained in:
Dreamacro
2020-04-16 18:19:36 +08:00
parent 2750c7ead0
commit 1825535abd
6 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
proxy/redir/udp.go
View File

@ -66,10 +66,9 @@ func (l *RedirUDPListener) Address() string {
func handleRedirUDP(pc net.PacketConn, buf []byte, lAddr *net.UDPAddr, rAddr *net.UDPAddr) {
target := socks5.ParseAddrToSocksAddr(rAddr)
packet := &fakeConn{
PacketConn: pc,
lAddr: lAddr,
buf: buf,
pkt := &packet{
lAddr: lAddr,
buf: buf,
}
tunnel.AddPacket(adapters.NewPacket(target, packet, C.REDIR))
tunnel.AddPacket(adapters.NewPacket(target, pkt, C.REDIR))
}

14
proxy/redir/utils.go
View File

@ -6,18 +6,17 @@ import (
"github.com/Dreamacro/clash/common/pool"
)
type fakeConn struct {
net.PacketConn
type packet struct {
lAddr *net.UDPAddr
buf []byte
}
func (c *fakeConn) Data() []byte {
func (c *packet) Data() []byte {
return c.buf
}
// WriteBack opens a new socket binding `addr` to wirte UDP packet back
func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
func (c *packet) WriteBack(b []byte, addr net.Addr) (n int, err error) {
tc, err := dialUDP("udp", addr.(*net.UDPAddr), c.lAddr)
if err != nil {
n = 0
@ -29,12 +28,11 @@ func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
}
// LocalAddr returns the source IP/Port of UDP Packet
func (c *fakeConn) LocalAddr() net.Addr {
func (c *packet) LocalAddr() net.Addr {
return c.lAddr
}
func (c *fakeConn) Close() error {
err := c.PacketConn.Close()
func (c *packet) Drop() {
pool.BufPool.Put(c.buf[:cap(c.buf)])
return err
return
}