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

tuntap: ignore read error

Browse Source
This commit is contained in:
ginuerzh 2020-01-06 19:34:26 +08:00
parent c0c477493d
commit 47d5b72b92
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tuntap.go
View File

@ -12,6 +12,8 @@ import (
"github.com/go-log/log" "github.com/go-log/log"
"github.com/shadowsocks/go-shadowsocks2/core" "github.com/shadowsocks/go-shadowsocks2/core"
"github.com/shadowsocks/go-shadowsocks2/shadowaead"
"github.com/shadowsocks/go-shadowsocks2/shadowstream"
"github.com/songgao/water" "github.com/songgao/water"
"github.com/songgao/water/waterutil" "github.com/songgao/water/waterutil"
"github.com/xtaci/tcpraw" "github.com/xtaci/tcpraw"
@ -210,7 +212,8 @@ func (h *tunHandler) transportTun(tun net.Conn, conn net.PacketConn, raddr net.A
defer mPool.Put(b) defer mPool.Put(b)
n, addr, err := conn.ReadFrom(b) n, addr, err := conn.ReadFrom(b)
if err != nil { if err != nil &&
err != shadowaead.ErrShortPacket && err != shadowstream.ErrShortPacket {
return err return err
} }
@ -537,7 +540,8 @@ func (h *tapHandler) transportTap(tap net.Conn, conn net.PacketConn, raddr net.A
defer mPool.Put(b) defer mPool.Put(b)
n, addr, err := conn.ReadFrom(b) n, addr, err := conn.ReadFrom(b)
if err != nil { if err != nil &&
err != shadowaead.ErrShortPacket && err != shadowstream.ErrShortPacket {
return err return err
} }