chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-12 05:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Suppress expected error

Browse Source
This commit is contained in:
世界 2022-08-27 16:48:30 +08:00
parent 7301a2e69a
commit d6dce7e634
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
transport/v2raygrpclite/conn.go
View File

@ -1,6 +1,3 @@
// Modified from: https://github.com/Qv2ray/gun-lite
// License: MIT
package v2raygrpclite
import (
@ -20,7 +17,7 @@ import (
"github.com/sagernet/sing/common/rw"
)
var ErrInvalidLength = E.New("invalid length")
// kanged from: https://github.com/Qv2ray/gun-lite
var _ net.Conn = (*GunConn)(nil)
@ -55,6 +52,11 @@ func (c *GunConn) setup(reader io.Reader, err error) {
}
func (c *GunConn) Read(b []byte) (n int, err error) {
n, err = c.read(b)
return n, wrapError(err)
}
func (c *GunConn) read(b []byte) (n int, err error) {
if c.reader == nil {
<-c.create
if c.err != nil {
@ -103,7 +105,7 @@ func (c *GunConn) Write(b []byte) (n int, err error) {
if f, ok := c.writer.(http.Flusher); ok {
f.Flush()
}
return len(b), err
return len(b), wrapError(err)
}
func uLen(x uint64) int {
@ -127,7 +129,7 @@ func (c *GunConn) WriteBuffer(buffer *buf.Buffer) error {
if c.flusher != nil {
c.flusher.Flush()
}
return err
return wrapError(err)
}
func (c *GunConn) FrontHeadroom() int {
@ -157,3 +159,10 @@ func (c *GunConn) SetReadDeadline(t time.Time) error {
func (c *GunConn) SetWriteDeadline(t time.Time) error {
return os.ErrInvalid
}
func wrapError(err error) error {
if E.IsMulti(err, io.ErrUnexpectedEOF) {
return io.EOF
}
return err
}