sync: sync upstream code

Signed-off-by: MiaoWoo <admin@yumc.pw>
This commit is contained in:
2019-07-23 10:53:42 +08:00
parent e6e9bf0beb
commit 38e396feb0
8 changed files with 148 additions and 143 deletions

View File

@@ -565,33 +565,6 @@ export default class CConnect extends CMessages {
Info.Node.IsAddrList = Data.IsAddrList
global.AddNodeInfo(Info.Node, "RETGETNODES length=" + arr.length)
}
static RETGETNODES2_F() {
return "{arr:[\
{\
addrStr:str64,\
ip:str30,\
port:uint16,\
portweb:uint16,\
LastTime:uint,\
DeltaTime:uint,\
StatData:arr70\
}\
],\
IsAddrList:byte}";
}
RETGETNODES2(Info, CurTime) {
var Data = this.DataFromF(Info);
var arr = Data.arr;
if (arr && arr.length > 0) {
for (var i = 0; i < arr.length; i++) {
var Item = this.AddToArrNodes(arr[i], true);
if (Item)
Item.LastTimeGetNode = CurTime - 0
}
}
Info.Node.IsAddrList = Data.IsAddrList
global.AddNodeInfo(Info.Node, "RETGETNODES2 length=" + arr.length)
}
GetNewNode(ip, port, addrStr?) {
var bTemp;
if (!addrStr) {

View File

@@ -134,7 +134,6 @@ export default class CTransport extends CConnect {
Map["GETBLOCK"] = { Period: global.PERIOD_GET_BLOCK, Hard: 2, Process: global.STATIC_PROCESS }
Map["GETNODES"] = { Period: 1000, Hard: 1, LowVersion: 1, IsAddrList: 1 }
Map["RETGETNODES"] = { Period: 0, IsAddrList: 1 }
Map["RETGETNODES2"] = { Period: 0, IsAddrList: 1 }
Map["GETCODE"] = { Period: 10000, Hard: 1, LowVersion: 1, Process: global.STATIC_PROCESS }
Map["RETBLOCKHEADER"] = { Period: 0 }
Map["RETBLOCKHEADER100"] = { Period: 0 }