Skip to content

Commit b2d5319

Browse files
committed
remove log
1 parent ee8b5d5 commit b2d5319

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

relay.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -271,22 +271,23 @@ func (c *relayConn) Read(b []byte) (n int, err error) {
271271
resp := new(relay.Response)
272272
_, err = resp.ReadFrom(c.Conn)
273273
if err != nil {
274-
log.Log("[relay] read:", err)
275274
return
276275
}
277276
if resp.Version != relay.Version1 {
278277
err = relay.ErrBadVersion
279-
log.Log("[relay] read:", err)
280278
return
281279
}
282280
if resp.Status != relay.StatusOK {
283281
err = fmt.Errorf("status %d", resp.Status)
284-
log.Log("[relay] read:", err)
285282
return
286283
}
287-
log.Log("[relay] read response OK")
288284
})
289285

286+
if err != nil {
287+
log.Log("[relay] %s <- %s: %s", c.Conn.LocalAddr(), c.Conn.RemoteAddr(), err)
288+
return
289+
}
290+
290291
if !c.udp {
291292
return c.Conn.Read(b)
292293
}
@@ -296,7 +297,6 @@ func (c *relayConn) Read(b []byte) (n int, err error) {
296297
return
297298
}
298299
dlen := int(binary.BigEndian.Uint16(bb[:]))
299-
log.Log("[relay] read udp", dlen)
300300
if len(b) >= dlen {
301301
return io.ReadFull(c.Conn, b[:dlen])
302302
}
@@ -325,7 +325,6 @@ func (c *relayConn) Write(b []byte) (n int, err error) {
325325
c.wbuf.Write(bb[:])
326326
}
327327
c.wbuf.Write(b) // append the data to the cached header
328-
log.Log("[relay] write wbuf", len(b))
329328
// _, err = c.Conn.Write(c.wbuf.Bytes())
330329
// c.wbuf.Reset()
331330
_, err = c.wbuf.WriteTo(c.Conn)
@@ -339,7 +338,6 @@ func (c *relayConn) Write(b []byte) (n int, err error) {
339338
binary.BigEndian.PutUint16(buf[:2], uint16(len(b)))
340339
n = copy(buf[2:], b)
341340
_, err = c.Conn.Write(buf)
342-
log.Log("[relay] write", n)
343341
return
344342
}
345343

0 commit comments

Comments
 (0)