From b2d5319d68a99de12adaf0fb3aa2bc3ee016d868 Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Fri, 28 Feb 2020 20:11:34 +0800 Subject: [PATCH] remove log --- relay.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/relay.go b/relay.go index 0184a51..d3157cd 100644 --- a/relay.go +++ b/relay.go @@ -271,22 +271,23 @@ func (c *relayConn) Read(b []byte) (n int, err error) { resp := new(relay.Response) _, err = resp.ReadFrom(c.Conn) if err != nil { - log.Log("[relay] read:", err) return } if resp.Version != relay.Version1 { err = relay.ErrBadVersion - log.Log("[relay] read:", err) return } if resp.Status != relay.StatusOK { err = fmt.Errorf("status %d", resp.Status) - log.Log("[relay] read:", err) return } - log.Log("[relay] read response OK") }) + if err != nil { + log.Log("[relay] %s <- %s: %s", c.Conn.LocalAddr(), c.Conn.RemoteAddr(), err) + return + } + if !c.udp { return c.Conn.Read(b) } @@ -296,7 +297,6 @@ func (c *relayConn) Read(b []byte) (n int, err error) { return } dlen := int(binary.BigEndian.Uint16(bb[:])) - log.Log("[relay] read udp", dlen) if len(b) >= dlen { return io.ReadFull(c.Conn, b[:dlen]) } @@ -325,7 +325,6 @@ func (c *relayConn) Write(b []byte) (n int, err error) { c.wbuf.Write(bb[:]) } c.wbuf.Write(b) // append the data to the cached header - log.Log("[relay] write wbuf", len(b)) // _, err = c.Conn.Write(c.wbuf.Bytes()) // c.wbuf.Reset() _, err = c.wbuf.WriteTo(c.Conn) @@ -339,7 +338,6 @@ func (c *relayConn) Write(b []byte) (n int, err error) { binary.BigEndian.PutUint16(buf[:2], uint16(len(b))) n = copy(buf[2:], b) _, err = c.Conn.Write(buf) - log.Log("[relay] write", n) return }