ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-07 03:40:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only send new format netconf for PV>=6

Browse Source
This commit is contained in:
Adam Ierymenko 2016-06-07 11:13:18 -07:00
parent 523ea68ae2
commit 2885aea65c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
controller/SqliteNetworkController.cpp
View File

@ -2134,12 +2134,17 @@ NetworkController::ResultCode SqliteNetworkController::_doNetworkConfigRequest(c
return NETCONF_QUERY_INTERNAL_SERVER_ERROR; return NETCONF_QUERY_INTERNAL_SERVER_ERROR;
} }
// First append the legacy dictionary and a terminating NULL, then serialize the new-format one. // Append legacy network config data for older devices
// Newer clients will use the new-format dictionary and older ones will use the old one. if (metaData.protocolVersion < 6) {
std::string legacyStr(legacy.toString()); std::string legacyStr(legacy.toString());
netconf.append((const void *)legacyStr.data(),(unsigned int)legacyStr.length()); netconf.append((const void *)legacyStr.data(),(unsigned int)legacyStr.length());
}
netconf.append((uint8_t)0); netconf.append((uint8_t)0);
nc.serialize(netconf);
// Append new format data for newer devices
if (metaData.protocolVersion >= 6) {
nc.serialize(netconf);
}
return NetworkController::NETCONF_QUERY_OK; return NetworkController::NETCONF_QUERY_OK;
} }