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

chore: add WaitReadFrom support in ssr

Browse Source
This commit is contained in:
wwqgtxx
2023-05-28 22:51:26 +08:00
parent 097f3e250c
commit 8e88e0b9f5
20 changed files with 182 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
transport/trojan/trojan.go
View File

@ -370,7 +370,9 @@ func (pc *PacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, er
_, err = io.ReadFull(pc.Conn, data[:2+2]) // u16be length + CR LF
if err != nil {
put()
if put != nil {
put()
}
return nil, nil, nil, err
}
length := binary.BigEndian.Uint16(data)
@ -379,11 +381,15 @@ func (pc *PacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, er
data = data[:length]
_, err = io.ReadFull(pc.Conn, data)
if err != nil {
put()
if put != nil {
put()
}
return nil, nil, nil, err
}
} else {
put()
if put != nil {
put()
}
return nil, nil, addr, nil
}