root/gost_software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: relay udp forward

Browse Source
This commit is contained in:
Yang.Liu 2020-11-04 16:12:53 +08:00
parent f7995ab564
commit 5d51c76ae2
No known key found for this signature in database
GPG Key ID: 2DF89F5618CF3E9E
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
relay.go
View File

@ -261,6 +261,7 @@ type relayConn struct {
udp bool udp bool
wbuf bytes.Buffer wbuf bytes.Buffer
once sync.Once once sync.Once
headerSent bool
} }
func (c *relayConn) Read(b []byte) (n int, err error) { func (c *relayConn) Read(b []byte) (n int, err error) {
@ -323,6 +324,7 @@ func (c *relayConn) Write(b []byte) (n int, err error) {
var bb [2]byte var bb [2]byte
binary.BigEndian.PutUint16(bb[:2], uint16(len(b))) binary.BigEndian.PutUint16(bb[:2], uint16(len(b)))
c.wbuf.Write(bb[:]) c.wbuf.Write(bb[:])
c.headerSent = true
} }
c.wbuf.Write(b) // append the data to the cached header c.wbuf.Write(b) // append the data to the cached header
// _, err = c.Conn.Write(c.wbuf.Bytes()) // _, err = c.Conn.Write(c.wbuf.Bytes())
@ -334,7 +336,13 @@ func (c *relayConn) Write(b []byte) (n int, err error) {
if !c.udp { if !c.udp {
return c.Conn.Write(b) return c.Conn.Write(b)
} }
if !c.headerSent {
c.headerSent = true
b2 := make([]byte, len(b)+2)
copy(b2, b)
_, err = c.Conn.Write(b2)
return
}
nsize := 2 + len(b) nsize := 2 + len(b)
var buf []byte var buf []byte
if nsize <= mediumBufferSize { if nsize <= mediumBufferSize {