From 234ceb15d764b4ba92f1d1e60c3021c477750c81 Mon Sep 17 00:00:00 2001 From: Lidashuang Date: Thu, 11 Apr 2024 17:02:21 +0800 Subject: [PATCH 1/2] frpc --- client/proxy/xtcp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/proxy/xtcp.go b/client/proxy/xtcp.go index 31f9ac89..6dc4f049 100644 --- a/client/proxy/xtcp.go +++ b/client/proxy/xtcp.go @@ -151,7 +151,7 @@ func (pxy *XTCPProxy) listenByKCP(listenConn *net.UDPConn, raddr *net.UDPAddr, s defer session.Close() for { - muxConn, err := session.Accept() + muxConn, err := session.AcceptStreamWithContext(pxy.ctx) if err != nil { xl.Errorf("accept connection error: %v", err) return From b21d0d121466707ae0cc8d86356be65863daaba8 Mon Sep 17 00:00:00 2001 From: Lidashuang Date: Fri, 12 Apr 2024 10:17:31 +0800 Subject: [PATCH 2/2] frpc --- server/service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/service.go b/server/service.go index 325f7f6c..0cfa5ed6 100644 --- a/server/service.go +++ b/server/service.go @@ -519,7 +519,7 @@ func (svr *Service) HandleListener(l net.Listener, internal bool) { } for { - stream, err := session.AcceptStream() + stream, err := session.AcceptStreamWithContext(ctx) if err != nil { log.Debugf("Accept new mux stream error: %v", err) session.Close()