fix xnet.Pipe

This commit is contained in:
ginuerzh
2025-08-01 23:00:50 +08:00
parent a5309eee97
commit db21de831a
22 changed files with 122 additions and 51 deletions
+29
View File
@@ -3,9 +3,38 @@ package proxyproto
import (
"net"
xio "github.com/go-gost/x/internal/io"
proxyproto "github.com/pires/go-proxyproto"
)
type serverConn struct {
net.Conn
}
func (c *serverConn) CloseRead() error {
if sc, ok := c.Conn.(xio.CloseRead); ok {
return sc.CloseRead()
}
if conn, ok := c.Conn.(*proxyproto.Conn); ok {
if tcpConn, ok := conn.TCPConn(); ok {
return tcpConn.CloseRead()
}
}
return xio.ErrUnsupported
}
func (c *serverConn) CloseWrite() error {
if sc, ok := c.Conn.(xio.CloseWrite); ok {
return sc.CloseWrite()
}
if conn, ok := c.Conn.(*proxyproto.Conn); ok {
if tcpConn, ok := conn.TCPConn(); ok {
return tcpConn.CloseWrite()
}
}
return xio.ErrUnsupported
}
func WrapClientConn(ppv int, src, dst net.Addr, c net.Conn) net.Conn {
if ppv <= 0 {
return c
+17 -3
View File
@@ -7,13 +7,27 @@ import (
proxyproto "github.com/pires/go-proxyproto"
)
type listener struct {
net.Listener
}
func (ln *listener) Accept() (net.Conn, error) {
conn, err := ln.Listener.Accept()
if err != nil {
return nil, err
}
return &serverConn{Conn: conn}, nil
}
func WrapListener(ppv int, ln net.Listener, readHeaderTimeout time.Duration) net.Listener {
if ppv <= 0 {
return ln
}
return &proxyproto.Listener{
Listener: ln,
ReadHeaderTimeout: readHeaderTimeout,
return &listener{
Listener: &proxyproto.Listener{
Listener: ln,
ReadHeaderTimeout: readHeaderTimeout,
},
}
}