works fine

This commit is contained in:
p_caiwfeng
2022-02-23 17:33:19 +08:00
parent 1248527045
commit 45f4831b50
2 changed files with 9 additions and 9 deletions

View File

@@ -133,10 +133,10 @@ func newFakeUDPTunnelConnOverTCP(conn net.Conn, targetAddr net.Addr) (net.Conn,
}, nil
}
func (c *fakeUDPTunnelConn) Read(b []byte) (n int, err error) {
n, _, err = c.ReadFrom(b)
return
}
//func (c *fakeUDPTunnelConn) Read(b []byte) (n int, err error) {
// n, _, err = c.ReadFrom(b)
// return
//}
func (c *fakeUDPTunnelConn) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
dgram, err := ReadDatagramPacket(c.Conn)
@@ -149,11 +149,11 @@ func (c *fakeUDPTunnelConn) ReadFrom(b []byte) (n int, addr net.Addr, err error)
return
}
func (c *fakeUDPTunnelConn) Write(b []byte) (n int, err error) {
return c.WriteTo(b)
}
//func (c *fakeUDPTunnelConn) Write(b []byte) (n int, err error) {
// return c.WriteTo(b, nil)
//}
func (c *fakeUDPTunnelConn) WriteTo(b []byte) (n int, err error) {
func (c *fakeUDPTunnelConn) WriteTo(b []byte, _ net.Addr) (n int, err error) {
dgram := NewDatagramPacket(b)
if err = dgram.Write(c.Conn); err != nil {
return

View File

@@ -100,7 +100,7 @@ func (h *tunHandler) Handle(ctx context.Context, conn net.Conn) {
case <-ctx.Done():
h.chExit <- struct{}{}
default:
log.Warnln("next loop")
log.Warnf("next loop, err: %v", err)
}
if err != nil {