From 02b9ca1cc1335da706ba7eecf1e6d08ddbf147e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Sat, 3 Sep 2022 16:42:52 +0800 Subject: [PATCH] Fix write trojan udp --- protocol/trojan/protocol.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/protocol/trojan/protocol.go b/protocol/trojan/protocol.go index 72edc5b..7bdffe1 100644 --- a/protocol/trojan/protocol.go +++ b/protocol/trojan/protocol.go @@ -6,6 +6,7 @@ import ( "encoding/hex" "io" "net" + "os" "github.com/sagernet/sing/common" "github.com/sagernet/sing/common/buf" @@ -125,13 +126,18 @@ func (c *ClientPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) } func (c *ClientPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) { - err = c.WritePacket(buf.With(p), M.SocksaddrFromNet(addr)) - if err == nil { - n = len(p) - } + return bufio.WritePacket(c, p, addr) +} + +func (c *ClientPacketConn) Read(p []byte) (n int, err error) { + n, _, err = c.ReadFrom(p) return } +func (c *ClientPacketConn) Write(p []byte) (n int, err error) { + return 0, os.ErrInvalid +} + func (c *ClientPacketConn) FrontHeadroom() int { if !c.headerWritten { return KeyLength + 2*M.MaxSocksaddrLength + 9