github/tun2socks
4
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2024-12-30 02:37:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Chore: ignore io timeout

Browse Source
This commit is contained in:
xjasonlyu
2022-04-06 16:07:59 +08:00
parent d65d3b08d0
commit 764657d657
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tunnel/tcp.go
+5 -9
View File
@@ -72,17 +72,13 @@ func relay(left, right net.Conn) {
wg.Wait()
}
func copyBuffer(dst io.Writer, src io.Reader) (err error) {
func copyBuffer(dst io.Writer, src io.Reader) error {
buf := pool.Get(pool.RelayBufferSize)
defer pool.Put(buf)
defer func() {
if err != nil {
if ne, ok := err.(net.Error); ok && ne.Timeout() {
err = nil /* ignore I/O timeout */
}
}
}()
_, err = io.CopyBuffer(dst, src, buf)
_, err := io.CopyBuffer(dst, src, buf)
if ne, ok := err.(net.Error); ok && ne.Timeout() {
return nil /* ignore I/O timeout */
}
return err
}
tunnel/udp.go
+3 -4
View File
@@ -86,10 +86,9 @@ func copyPacketBuffer(dst net.PacketConn, src net.PacketConn, to net.Addr, timeo
for {
src.SetReadDeadline(time.Now().Add(timeout))
n, _, err := src.ReadFrom(buf)
if err != nil {
if ne, ok := err.(net.Error); ok && ne.Timeout() {
return nil /* ignore I/O timeout */
}
if ne, ok := err.(net.Error); ok && ne.Timeout() {
return nil /* ignore I/O timeout */
} else if err != nil {
return err
}