sync: sync upstream code

Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
2019-07-20 22:30:47 +08:00
parent a981ccbcae
commit 88bae3a4bd
12 changed files with 127 additions and 37 deletions

View File

@@ -1270,10 +1270,10 @@ export default class CConnect extends CMessages {
if (!this.LastNotZeroNodesTime)
this.LastNotZeroNodesTime = CurTime
var DeltaTime = CurTime - this.LastNotZeroNodesTime;
if (DeltaTime > 10 * 1000) {
if (DeltaTime > 60 * 1000) {
global.ToLog("DETECT GRAY MODE")
if (!global.NET_WORK_MODE) {
global.NET_WORK_MODE = { ip: "", port: "" }
global.NET_WORK_MODE = { ip: "", port: 30000 }
}
global.NET_WORK_MODE.UseDirectIP = 0
global.SAVE_CONST()
@@ -1282,7 +1282,7 @@ export default class CConnect extends CMessages {
SetDirectMode() {
var CountNodes = this.ActualNodes.size;
if (CountNodes && !global.NET_WORK_MODE) {
global.NET_WORK_MODE = { ip: "", port: "30000" }
global.NET_WORK_MODE = { ip: "", port: "30000", NOT_RUN: 0 }
global.NET_WORK_MODE.UseDirectIP = 1
global.SAVE_CONST()
}

View File

@@ -852,6 +852,9 @@ export default class CTransport extends CConnect {
this.CanSend++
return;
}
if (global.NET_WORK_MODE && global.NET_WORK_MODE.NOT_RUN) {
return;
}
let SELF = this;
this.Server = net.createServer(function(sock: any) {
if (SELF.WasBanIP({ address: sock.remoteAddress })) {