starred/godoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-25 10:18:59 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

Cherry-Pick 25ceb512b4

Browse Source
This commit is contained in:
yusing
2026-01-07 15:09:51 +08:00
parent 682b4330fc 25ceb512b4
commit 0b9553e4af
6 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/route/stream/tcp_tcp.go
View File

@@ -15,6 +15,7 @@ import (
)
type TCPTCPStream struct {
network string
listener net.Listener
laddr *net.TCPAddr
dst *net.TCPAddr
@@ -26,21 +27,21 @@ type TCPTCPStream struct {
closed atomic.Bool
}
func NewTCPTCPStream(listenAddr, dstAddr string, agentCfg *agent.AgentConfig) (nettypes.Stream, error) {
dst, err := net.ResolveTCPAddr("tcp", dstAddr)
func NewTCPTCPStream(network, listenAddr, dstAddr string, agentCfg *agent.AgentConfig) (nettypes.Stream, error) {
dst, err := net.ResolveTCPAddr(network, dstAddr)
if err != nil {
return nil, err
}
laddr, err := net.ResolveTCPAddr("tcp", listenAddr)
laddr, err := net.ResolveTCPAddr(network, listenAddr)
if err != nil {
return nil, err
}
return &TCPTCPStream{laddr: laddr, dst: dst, agent: agentCfg}, nil
return &TCPTCPStream{network: network, laddr: laddr, dst: dst, agent: agentCfg}, nil
}
func (s *TCPTCPStream) ListenAndServe(ctx context.Context, preDial, onRead nettypes.HookFunc) {
var err error
s.listener, err = net.ListenTCP("tcp", s.laddr)
s.listener, err = net.ListenTCP(s.network, s.laddr)
if err != nil {
logErr(s, err, "failed to listen")
return

24
internal/route/stream/udp_udp.go
View File

@@ -18,7 +18,7 @@ import (
)
type UDPUDPStream struct {
name string
network string
listener net.PacketConn
laddr *net.UDPAddr
@@ -53,30 +53,31 @@ const (
var bufPool = synk.GetSizedBytesPool()
func NewUDPUDPStream(listenAddr, dstAddr string, agentCfg *agent.AgentConfig) (nettypes.Stream, error) {
dst, err := net.ResolveUDPAddr("udp", dstAddr)
func NewUDPUDPStream(network, listenAddr, dstAddr string, agentCfg *agent.AgentConfig) (nettypes.Stream, error) {
dst, err := net.ResolveUDPAddr(network, dstAddr)
if err != nil {
return nil, err
}
laddr, err := net.ResolveUDPAddr("udp", listenAddr)
laddr, err := net.ResolveUDPAddr(network, listenAddr)
if err != nil {
return nil, err
}
return &UDPUDPStream{
laddr: laddr,
dst: dst,
agent: agentCfg,
conns: make(map[string]*udpUDPConn),
network: network,
laddr: laddr,
dst: dst,
agent: agentCfg,
conns: make(map[string]*udpUDPConn),
}, nil
}
func (s *UDPUDPStream) ListenAndServe(ctx context.Context, preDial, onRead nettypes.HookFunc) {
var err error
s.listener, err = net.ListenUDP("udp", s.laddr)
l, err := net.ListenUDP(s.network, s.laddr)
if err != nil {
logErr(s, err, "failed to listen")
return
}
s.listener = l
if acl := acl.ActiveConfig.Load(); acl != nil {
s.listener = acl.WrapUDP(s.listener)
}
@@ -117,9 +118,6 @@ func (s *UDPUDPStream) LocalAddr() net.Addr {
func (s *UDPUDPStream) MarshalZerologObject(e *zerolog.Event) {
e.Str("protocol", "udp-udp")
if s.name != "" {
e.Str("name", s.name)
}
if s.dst != nil {
e.Str("dst", s.dst.String())
}