@@ -271,22 +271,23 @@ func (c *relayConn) Read(b []byte) (n int, err error) {
271
271
resp := new (relay.Response )
272
272
_ , err = resp .ReadFrom (c .Conn )
273
273
if err != nil {
274
- log .Log ("[relay] read:" , err )
275
274
return
276
275
}
277
276
if resp .Version != relay .Version1 {
278
277
err = relay .ErrBadVersion
279
- log .Log ("[relay] read:" , err )
280
278
return
281
279
}
282
280
if resp .Status != relay .StatusOK {
283
281
err = fmt .Errorf ("status %d" , resp .Status )
284
- log .Log ("[relay] read:" , err )
285
282
return
286
283
}
287
- log .Log ("[relay] read response OK" )
288
284
})
289
285
286
+ if err != nil {
287
+ log .Log ("[relay] %s <- %s: %s" , c .Conn .LocalAddr (), c .Conn .RemoteAddr (), err )
288
+ return
289
+ }
290
+
290
291
if ! c .udp {
291
292
return c .Conn .Read (b )
292
293
}
@@ -296,7 +297,6 @@ func (c *relayConn) Read(b []byte) (n int, err error) {
296
297
return
297
298
}
298
299
dlen := int (binary .BigEndian .Uint16 (bb [:]))
299
- log .Log ("[relay] read udp" , dlen )
300
300
if len (b ) >= dlen {
301
301
return io .ReadFull (c .Conn , b [:dlen ])
302
302
}
@@ -325,7 +325,6 @@ func (c *relayConn) Write(b []byte) (n int, err error) {
325
325
c .wbuf .Write (bb [:])
326
326
}
327
327
c .wbuf .Write (b ) // append the data to the cached header
328
- log .Log ("[relay] write wbuf" , len (b ))
329
328
// _, err = c.Conn.Write(c.wbuf.Bytes())
330
329
// c.wbuf.Reset()
331
330
_ , err = c .wbuf .WriteTo (c .Conn )
@@ -339,7 +338,6 @@ func (c *relayConn) Write(b []byte) (n int, err error) {
339
338
binary .BigEndian .PutUint16 (buf [:2 ], uint16 (len (b )))
340
339
n = copy (buf [2 :], b )
341
340
_ , err = c .Conn .Write (buf )
342
- log .Log ("[relay] write" , n )
343
341
return
344
342
}
345
343
0 commit comments