From 4d862025215ca915c72adcb8e6312e0cf02faddc Mon Sep 17 00:00:00 2001
From: haidy <haidycao@gmail.com>
Date: Thu, 14 Jun 2018 14:23:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0frps=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=97=AD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/frp/frp.go        | 4 ++++
 cmd/frps/frps/root.go | 7 +++++++
 server/service.go     | 4 ++++
 3 files changed, 15 insertions(+)

diff --git a/cmd/frp/frp.go b/cmd/frp/frp.go
index 85aa1f61..1858a37b 100644
--- a/cmd/frp/frp.go
+++ b/cmd/frp/frp.go
@@ -35,3 +35,7 @@ func RunFrps(cfgFilePath string) (err error) {
 
 	return frps.RunFrps(cfgFilePath)
 }
+
+func StopFrps() error {
+	return frps.StopFrps()
+}
diff --git a/cmd/frps/frps/root.go b/cmd/frps/frps/root.go
index 68486125..32dcc99d 100644
--- a/cmd/frps/frps/root.go
+++ b/cmd/frps/frps/root.go
@@ -214,6 +214,8 @@ func runServer() (err error) {
 	return
 }
 
+var service *server.Service
+
 func runBackgroundServer() (err error) {
 	log.InitLog(g.GlbServerCfg.LogWay, g.GlbServerCfg.LogFile, g.GlbServerCfg.LogLevel,
 		g.GlbServerCfg.LogMaxDays)
@@ -223,6 +225,11 @@ func runBackgroundServer() (err error) {
 	}
 	log.Info("Start frps success")
 	server.ServerService = svr
+	service = svr
 	go svr.Run()
 	return
 }
+
+func StopFrps() error {
+	return service.Stop()
+}
diff --git a/server/service.go b/server/service.go
index a9b14a62..4c115bfd 100644
--- a/server/service.go
+++ b/server/service.go
@@ -218,6 +218,10 @@ func (svr *Service) Run() {
 
 }
 
+func (svr *Service) Stop() error {
+	return svr.listener.Close()
+}
+
 func (svr *Service) HandleListener(l frpNet.Listener) {
 	// Listen for incoming connections from client.
 	for {