|
|
@ -15,7 +15,9 @@
|
|
|
|
package net
|
|
|
|
package net
|
|
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
import (
|
|
|
|
|
|
|
|
"io"
|
|
|
|
"net"
|
|
|
|
"net"
|
|
|
|
|
|
|
|
"time"
|
|
|
|
|
|
|
|
|
|
|
|
"github.com/fatedier/frp/utils/log"
|
|
|
|
"github.com/fatedier/frp/utils/log"
|
|
|
|
)
|
|
|
|
)
|
|
|
@ -32,12 +34,44 @@ type WrapLogConn struct {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func WrapConn(c net.Conn) Conn {
|
|
|
|
func WrapConn(c net.Conn) Conn {
|
|
|
|
return WrapLogConn{
|
|
|
|
return &WrapLogConn{
|
|
|
|
Conn: c,
|
|
|
|
Conn: c,
|
|
|
|
Logger: log.NewPrefixLogger(""),
|
|
|
|
Logger: log.NewPrefixLogger(""),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
type WrapReadWriteCloserConn struct {
|
|
|
|
|
|
|
|
io.ReadWriteCloser
|
|
|
|
|
|
|
|
log.Logger
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (conn *WrapReadWriteCloserConn) LocalAddr() net.Addr {
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (conn *WrapReadWriteCloserConn) RemoteAddr() net.Addr {
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (conn *WrapReadWriteCloserConn) SetDeadline(t time.Time) error {
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (conn *WrapReadWriteCloserConn) SetReadDeadline(t time.Time) error {
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (conn *WrapReadWriteCloserConn) SetWriteDeadline(t time.Time) error {
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func WrapReadWriteCloserToConn(rwc io.ReadWriteCloser) Conn {
|
|
|
|
|
|
|
|
return &WrapReadWriteCloserConn{
|
|
|
|
|
|
|
|
ReadWriteCloser: rwc,
|
|
|
|
|
|
|
|
Logger: log.NewPrefixLogger(""),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
type Listener interface {
|
|
|
|
type Listener interface {
|
|
|
|
Accept() (Conn, error)
|
|
|
|
Accept() (Conn, error)
|
|
|
|
Close() error
|
|
|
|
Close() error
|
|
|
|