extern/frp
1
1
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-02-15 01:39:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ports not being released on Service.Close() (#4666)

Browse Source
This commit is contained in:
ubergeek77 2025-02-11 21:28:30 -06:00 committed by GitHub
parent b8d3ace113
commit 8b86e1473c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
server/service.go
View File

@ -77,7 +77,7 @@ type Service struct {
muxer *mux.Mux muxer *mux.Mux
// Accept connections from client // Accept connections from client
listener net.Listener muxListener net.Listener
// Accept connections using kcp // Accept connections using kcp
kcpListener net.Listener kcpListener net.Listener
@ -125,6 +125,11 @@ type Service struct {
ctx context.Context ctx context.Context
// call cancel to stop service // call cancel to stop service
cancel context.CancelFunc cancel context.CancelFunc
// Track listeners so they can be closed manually
vhostHTTPSListener net.Listener
tcpmuxHTTPConnectListener net.Listener
tcpListener net.Listener
} }
func NewService(cfg *v1.ServerConfig) (*Service, error) { func NewService(cfg *v1.ServerConfig) (*Service, error) {
@ -180,6 +185,8 @@ func NewService(cfg *v1.ServerConfig) (*Service, error) {
return nil, fmt.Errorf("create server listener error, %v", err) return nil, fmt.Errorf("create server listener error, %v", err)
} }
// Save listener so it can be closed in svr.Close()
svr.tcpmuxHTTPConnectListener = l
svr.rc.TCPMuxHTTPConnectMuxer, err = tcpmux.NewHTTPConnectTCPMuxer(l, cfg.TCPMuxPassthrough, vhostReadWriteTimeout) svr.rc.TCPMuxHTTPConnectMuxer, err = tcpmux.NewHTTPConnectTCPMuxer(l, cfg.TCPMuxPassthrough, vhostReadWriteTimeout)
if err != nil { if err != nil {
return nil, fmt.Errorf("create vhost tcpMuxer error, %v", err) return nil, fmt.Errorf("create vhost tcpMuxer error, %v", err)
@ -226,14 +233,16 @@ func NewService(cfg *v1.ServerConfig) (*Service, error) {
return nil, fmt.Errorf("create server listener error, %v", err) return nil, fmt.Errorf("create server listener error, %v", err)
} }
// Save listener so it can be closed in svr.Close()
svr.tcpListener = ln
svr.muxer = mux.NewMux(ln) svr.muxer = mux.NewMux(ln)
svr.muxer.SetKeepAlive(time.Duration(cfg.Transport.TCPKeepAlive) * time.Second) svr.muxer.SetKeepAlive(time.Duration(cfg.Transport.TCPKeepAlive) * time.Second)
go func() { go func() {
_ = svr.muxer.Serve() _ = svr.muxer.Serve()
}() }()
ln = svr.muxer.DefaultListener() ln = svr.muxer.DefaultListener()
svr.muxListener = ln
svr.listener = ln
log.Infof("frps tcp listen on %s", address) log.Infof("frps tcp listen on %s", address)
// Listen for accepting connections from client using kcp protocol. // Listen for accepting connections from client using kcp protocol.
@ -318,7 +327,8 @@ func NewService(cfg *v1.ServerConfig) (*Service, error) {
} }
log.Infof("https service listen on %s", address) log.Infof("https service listen on %s", address)
} }
// Save listener so it can be closed in svr.Close()
svr.vhostHTTPSListener = l
svr.rc.VhostHTTPSMuxer, err = vhost.NewHTTPSMuxer(l, vhostReadWriteTimeout) svr.rc.VhostHTTPSMuxer, err = vhost.NewHTTPSMuxer(l, vhostReadWriteTimeout)
if err != nil { if err != nil {
return nil, fmt.Errorf("create vhost httpsMuxer error, %v", err) return nil, fmt.Errorf("create vhost httpsMuxer error, %v", err)
@ -374,11 +384,11 @@ func (svr *Service) Run(ctx context.Context) {
go svr.sshTunnelGateway.Run() go svr.sshTunnelGateway.Run()
} }
svr.HandleListener(svr.listener, false) svr.HandleListener(svr.muxListener, false)
<-svr.ctx.Done() <-svr.ctx.Done()
// service context may not be canceled by svr.Close(), we should call it here to release resources // service context may not be canceled by svr.Close(), we should call it here to release resources
if svr.listener != nil { if svr.muxListener != nil {
svr.Close() svr.Close()
} }
} }
@ -400,9 +410,25 @@ func (svr *Service) Close() error {
svr.tlsListener.Close() svr.tlsListener.Close()
svr.tlsConfig = nil svr.tlsConfig = nil
} }
if svr.listener != nil { if svr.muxListener != nil {
svr.listener.Close() svr.muxListener.Close()
svr.listener = nil svr.muxListener = nil
}
if svr.vhostHTTPSListener != nil {
svr.vhostHTTPSListener.Close()
svr.vhostHTTPSListener = nil
}
if svr.tcpmuxHTTPConnectListener != nil {
svr.tcpmuxHTTPConnectListener.Close()
svr.tcpmuxHTTPConnectListener = nil
}
if svr.webServer != nil {
svr.webServer.Close()
svr.webServer = nil
}
if svr.tcpListener != nil {
svr.tcpListener.Close()
svr.tcpListener = nil
} }
svr.ctlManager.Close() svr.ctlManager.Close()
if svr.cancel != nil { if svr.cancel != nil {