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

Improve: UDP relay refactor (#441)

Browse Source 
Co-authored-by: Dreamacro <Dreamacro@vip.qq.com>
This commit is contained in:
Comzyh
2019-12-28 18:44:01 +08:00
committed by Dreamacro
parent 3f592988a9
commit 93ea037230
11 changed files with 202 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
proxy/socks/udp.go
View File

@ -1,7 +1,6 @@
package socks
import (
"bytes"
"net"
adapters "github.com/Dreamacro/clash/adapters/inbound"
@ -57,12 +56,12 @@ func handleSocksUDP(pc net.PacketConn, buf []byte, addr net.Addr) {
pool.BufPool.Put(buf[:cap(buf)])
return
}
conn := &fakeConn{
packet := &fakeConn{
PacketConn: pc,
remoteAddr: addr,
targetAddr: target,
buffer: bytes.NewBuffer(payload),
payload: payload,
bufRef: buf,
}
tun.Add(adapters.NewSocket(target, conn, C.SOCKS, C.UDP))
tun.AddPacket(adapters.NewPacket(target, packet, C.SOCKS, C.UDP))
}

20
proxy/socks/utils.go
View File

@ -1,7 +1,6 @@
package socks
import (
"bytes"
"net"
"github.com/Dreamacro/clash/common/pool"
@ -12,23 +11,30 @@ type fakeConn struct {
net.PacketConn
remoteAddr net.Addr
targetAddr socks5.Addr
buffer *bytes.Buffer
payload []byte
bufRef []byte
}
func (c *fakeConn) Read(b []byte) (n int, err error) {
return c.buffer.Read(b)
func (c *fakeConn) Data() []byte {
return c.payload
}
func (c *fakeConn) Write(b []byte) (n int, err error) {
packet, err := socks5.EncodeUDPPacket(c.targetAddr, b)
// WriteBack wirtes UDP packet with source(ip, port) = `addr`
func (c *fakeConn) WriteBack(b []byte, addr net.Addr) (n int, err error) {
from := c.targetAddr
if addr != nil {
// if addr is provided, use the parsed addr
from = socks5.ParseAddrToSocksAddr(addr)
}
packet, err := socks5.EncodeUDPPacket(from, b)
if err != nil {
return
}
return c.PacketConn.WriteTo(packet, c.remoteAddr)
}
func (c *fakeConn) RemoteAddr() net.Addr {
// LocalAddr returns the source IP/Port of UDP Packet
func (c *fakeConn) LocalAddr() net.Addr {
return c.remoteAddr
}