Merge 735470eff4
into 3f9749488a
This commit is contained in:
commit
07ef4cbb7f
0
Makefile.cross-compiles
Normal file → Executable file
0
Makefile.cross-compiles
Normal file → Executable file
@ -91,6 +91,9 @@ func controlWorker(c *conn.Conn) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ret == 999 {
|
||||||
|
closeFlag = false
|
||||||
|
}
|
||||||
// if login failed, just return
|
// if login failed, just return
|
||||||
if ret > 0 {
|
if ret > 0 {
|
||||||
return
|
return
|
||||||
@ -287,6 +290,7 @@ func doLogin(req *msg.ControlReq, c *conn.Conn) (ret int64, info string, s *serv
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
info = fmt.Sprintf("ProxyName [%s], %v", req.ProxyName, err)
|
info = fmt.Sprintf("ProxyName [%s], %v", req.ProxyName, err)
|
||||||
log.Warn(info)
|
log.Warn(info)
|
||||||
|
ret = 999
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user