guoswork/frp
1
0
Fork 0
mirror of https://gitee.com/IrisVega/frp.git synced 2024-11-01 22:31:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

frpc: add proxy status 'wait start'

Browse Source
This commit is contained in:
fatedier 2018-01-29 23:51:46 +08:00
parent 44e8108910
commit 9b990adf96
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -53,6 +53,3 @@ clean:
rm -f ./bin/frpc rm -f ./bin/frpc
rm -f ./bin/frps rm -f ./bin/frps
cd ./tests && ./clean_test.sh && cd - cd ./tests && ./clean_test.sh && cd -
save:
godep save ./...

16
client/proxy_manager.go
View File

@ -12,10 +12,11 @@ import (
) )
const ( const (
ProxyStatusNew = "new" ProxyStatusNew = "new"
ProxyStatusStartErr = "start error" ProxyStatusStartErr = "start error"
ProxyStatusRunning = "running" ProxyStatusWaitStart = "wait start"
ProxyStatusClosed = "closed" ProxyStatusRunning = "running"
ProxyStatusClosed = "closed"
) )
type ProxyManager struct { type ProxyManager struct {
@ -89,6 +90,12 @@ func (pw *ProxyWrapper) GetStatus() *ProxyStatus {
return ps return ps
} }
func (pw *ProxyWrapper) WaitStart() {
pw.mu.Lock()
defer pw.mu.Unlock()
pw.Status = ProxyStatusWaitStart
}
func (pw *ProxyWrapper) Start(remoteAddr string, serverRespErr string) error { func (pw *ProxyWrapper) Start(remoteAddr string, serverRespErr string) error {
if pw.pxy != nil { if pw.pxy != nil {
pw.pxy.Close() pw.pxy.Close()
@ -226,6 +233,7 @@ func (pm *ProxyManager) CheckAndStartProxy(pxyStatus []string) {
pm.Warn("[%s] proxy send NewProxy message error") pm.Warn("[%s] proxy send NewProxy message error")
return return
} }
pxy.WaitStart()
break break
} }
} }