更新frps代码,添加关闭功能

This commit is contained in:
haidy 2018-06-14 14:23:27 +08:00
parent bf64f410b1
commit 4d86202521
3 changed files with 15 additions and 0 deletions

View File

@ -35,3 +35,7 @@ func RunFrps(cfgFilePath string) (err error) {
return frps.RunFrps(cfgFilePath) return frps.RunFrps(cfgFilePath)
} }
func StopFrps() error {
return frps.StopFrps()
}

View File

@ -214,6 +214,8 @@ func runServer() (err error) {
return return
} }
var service *server.Service
func runBackgroundServer() (err error) { func runBackgroundServer() (err error) {
log.InitLog(g.GlbServerCfg.LogWay, g.GlbServerCfg.LogFile, g.GlbServerCfg.LogLevel, log.InitLog(g.GlbServerCfg.LogWay, g.GlbServerCfg.LogFile, g.GlbServerCfg.LogLevel,
g.GlbServerCfg.LogMaxDays) g.GlbServerCfg.LogMaxDays)
@ -223,6 +225,11 @@ func runBackgroundServer() (err error) {
} }
log.Info("Start frps success") log.Info("Start frps success")
server.ServerService = svr server.ServerService = svr
service = svr
go svr.Run() go svr.Run()
return return
} }
func StopFrps() error {
return service.Stop()
}

View File

@ -218,6 +218,10 @@ func (svr *Service) Run() {
} }
func (svr *Service) Stop() error {
return svr.listener.Close()
}
func (svr *Service) HandleListener(l frpNet.Listener) { func (svr *Service) HandleListener(l frpNet.Listener) {
// Listen for incoming connections from client. // Listen for incoming connections from client.
for { for {