ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-06 11:10:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

debug code.

Browse Source
This commit is contained in:
Adam Ierymenko 2017-01-11 17:42:57 -08:00
parent d4321cdd41
commit 6513b21426
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
service/SoftwareUpdater.cpp
View File

@ -282,6 +282,7 @@ void SoftwareUpdater::loadUpdatesToDistribute()
SHA512::hash(sha512,d.bin.data(),(unsigned int)d.bin.length()); SHA512::hash(sha512,d.bin.data(),(unsigned int)d.bin.length());
if (!memcmp(sha512,metaHash.data(),ZT_SHA512_DIGEST_LEN)) { // double check that hash in JSON is correct if (!memcmp(sha512,metaHash.data(),ZT_SHA512_DIGEST_LEN)) { // double check that hash in JSON is correct
_dist[Array<uint8_t,16>(sha512)] = d; _dist[Array<uint8_t,16>(sha512)] = d;
printf("update-dist.d: %s\n",u->c_str());
} }
} }
} catch ( ... ) {} // ignore bad meta JSON, etc. } catch ( ... ) {} // ignore bad meta JSON, etc.
@ -331,6 +332,7 @@ void SoftwareUpdater::handleSoftwareUpdateUserMessage(uint64_t origin,const void
lj.push_back((char)VERB_LATEST); lj.push_back((char)VERB_LATEST);
lj.append(OSUtils::jsonDump(*latest)); lj.append(OSUtils::jsonDump(*latest));
_node.sendUserMessage(origin,ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE,lj.data(),(unsigned int)lj.length()); _node.sendUserMessage(origin,ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE,lj.data(),(unsigned int)lj.length());
printf(">> LATEST\n%s\n",OSUtils::jsonDump(*latest).c_str());
} }
} // else no reply, since we have nothing to distribute } // else no reply, since we have nothing to distribute
@ -355,6 +357,7 @@ void SoftwareUpdater::handleSoftwareUpdateUserMessage(uint64_t origin,const void
gd.append(_latestBinHashPrefix.data,16); gd.append(_latestBinHashPrefix.data,16);
gd.append((uint32_t)_latestBin.length()); gd.append((uint32_t)_latestBin.length());
_node.sendUserMessage(ZT_SOFTWARE_UPDATE_SERVICE,ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE,gd.data(),gd.size()); _node.sendUserMessage(ZT_SOFTWARE_UPDATE_SERVICE,ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE,gd.data(),gd.size());
printf(">> GET_DATA @%u\n",(unsigned int)_latestBin.length());
} }
} }
@ -377,6 +380,7 @@ void SoftwareUpdater::handleSoftwareUpdateUserMessage(uint64_t origin,const void
buf.append((uint32_t)idx); buf.append((uint32_t)idx);
buf.append(d->second.bin.data() + idx,std::max((unsigned long)ZT_SOFTWARE_UPDATE_CHUNK_SIZE,(unsigned long)(d->second.bin.length() - idx))); buf.append(d->second.bin.data() + idx,std::max((unsigned long)ZT_SOFTWARE_UPDATE_CHUNK_SIZE,(unsigned long)(d->second.bin.length() - idx)));
_node.sendUserMessage(origin,ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE,buf.data(),buf.size()); _node.sendUserMessage(origin,ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE,buf.data(),buf.size());
printf(">> DATA @%u\n",(unsigned int)idx);
} }
} }
} }
@ -388,8 +392,10 @@ void SoftwareUpdater::handleSoftwareUpdateUserMessage(uint64_t origin,const void
idx |= (unsigned long)*(reinterpret_cast<const uint8_t *>(data) + 18) << 16; idx |= (unsigned long)*(reinterpret_cast<const uint8_t *>(data) + 18) << 16;
idx |= (unsigned long)*(reinterpret_cast<const uint8_t *>(data) + 19) << 8; idx |= (unsigned long)*(reinterpret_cast<const uint8_t *>(data) + 19) << 8;
idx |= (unsigned long)*(reinterpret_cast<const uint8_t *>(data) + 20); idx |= (unsigned long)*(reinterpret_cast<const uint8_t *>(data) + 20);
if (idx == _latestBin.length()) if (idx == _latestBin.length()) {
_latestBin.append(reinterpret_cast<const char *>(data) + 21,len - 21); _latestBin.append(reinterpret_cast<const char *>(data) + 21,len - 21);
printf("<< DATA @%u / %u bytes\n",(unsigned int)idx,(unsigned int)(len - 21));
}
if (_latestBin.length() < _latestBinLength) { if (_latestBin.length() < _latestBinLength) {
Buffer<128> gd; Buffer<128> gd;
@ -397,6 +403,7 @@ void SoftwareUpdater::handleSoftwareUpdateUserMessage(uint64_t origin,const void
gd.append(_latestBinHashPrefix.data,16); gd.append(_latestBinHashPrefix.data,16);
gd.append((uint32_t)_latestBin.length()); gd.append((uint32_t)_latestBin.length());
_node.sendUserMessage(ZT_SOFTWARE_UPDATE_SERVICE,ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE,gd.data(),gd.size()); _node.sendUserMessage(ZT_SOFTWARE_UPDATE_SERVICE,ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE,gd.data(),gd.size());
printf(">> GET_DATA @%u\n",(unsigned int)_latestBin.length());
} }
} }
break; break;
@ -428,10 +435,12 @@ nlohmann::json SoftwareUpdater::check(const uint64_t now)
if (Identity(ZT_SOFTWARE_UPDATE_SIGNING_AUTHORITY).verify(_latestBin.data(),(unsigned int)_latestBin.length(),sig.data(),(unsigned int)sig.length())) { if (Identity(ZT_SOFTWARE_UPDATE_SIGNING_AUTHORITY).verify(_latestBin.data(),(unsigned int)_latestBin.length(),sig.data(),(unsigned int)sig.length())) {
// If we passed both of these, the update is good! // If we passed both of these, the update is good!
_latestBinValid = true; _latestBinValid = true;
printf("VALID UPDATE\n%s\n",OSUtils::jsonDump(_latestMeta).c_str());
return _latestMeta; return _latestMeta;
} }
} }
} catch ( ... ) {} // any exception equals verification failure } catch ( ... ) {} // any exception equals verification failure
printf("INVALID UPDATE (!!!)\n%s\n",OSUtils::jsonDump(_latestMeta).c_str());
// If we get here, checks failed. // If we get here, checks failed.
_latestMeta = nlohmann::json(); _latestMeta = nlohmann::json();
@ -445,6 +454,7 @@ nlohmann::json SoftwareUpdater::check(const uint64_t now)
gd.append(_latestBinHashPrefix.data,16); gd.append(_latestBinHashPrefix.data,16);
gd.append((uint32_t)_latestBin.length()); gd.append((uint32_t)_latestBin.length());
_node.sendUserMessage(ZT_SOFTWARE_UPDATE_SERVICE,ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE,gd.data(),gd.size()); _node.sendUserMessage(ZT_SOFTWARE_UPDATE_SERVICE,ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE,gd.data(),gd.size());
printf(">> GET_DATA @%u\n",(unsigned int)_latestBin.length());
} }
} }
@ -470,6 +480,7 @@ nlohmann::json SoftwareUpdater::check(const uint64_t now)
(int)ZT_VENDOR_ZEROTIER, (int)ZT_VENDOR_ZEROTIER,
"release"); "release");
_node.sendUserMessage(ZT_SOFTWARE_UPDATE_SERVICE,ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE,tmp,len); _node.sendUserMessage(ZT_SOFTWARE_UPDATE_SERVICE,ZT_SOFTWARE_UPDATE_USER_MESSAGE_TYPE,tmp,len);
printf(">> GET_LATEST\n");
} }
return nlohmann::json(); return nlohmann::json();