diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-12-21 16:15:39 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-12-21 16:15:39 -0800 |
| commit | 436c1fac1dc9daed033ca78719031b687b984c29 (patch) | |
| tree | 10a78810012fef7e55553867c780c5ceae99b6f8 /controller | |
| parent | a4cfe4cd1650ea7e9aada0b004fd7aade2e43ced (diff) | |
| download | infinitytier-436c1fac1dc9daed033ca78719031b687b984c29.tar.gz infinitytier-436c1fac1dc9daed033ca78719031b687b984c29.zip | |
Selectively move over changes from "edge" to "dev" excluding netcon.
Diffstat (limited to 'controller')
| -rw-r--r-- | controller/SqliteNetworkController.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/controller/SqliteNetworkController.cpp b/controller/SqliteNetworkController.cpp index 049db04e..0e90163d 100644 --- a/controller/SqliteNetworkController.cpp +++ b/controller/SqliteNetworkController.cpp @@ -72,7 +72,7 @@ #define ZT_NETCONF_MIN_REQUEST_PERIOD 1000 // Delay between backups in milliseconds -#define ZT_NETCONF_BACKUP_PERIOD 60000 +#define ZT_NETCONF_BACKUP_PERIOD 120000 namespace ZeroTier { @@ -1719,7 +1719,9 @@ NetworkController::ResultCode SqliteNetworkController::_doNetworkConfigRequest(c netconf[ZT_NETWORKCONFIG_DICT_KEY_ACTIVE_BRIDGES] = activeBridges; } - { + // Do not send relays to 1.1.0 since it had a serious bug in using them + // 1.1.0 will still work, it'll just fall back to roots instead of using network preferred relays + if (!((clientMajorVersion == 1)&&(clientMinorVersion == 1)&&(clientRevision == 0))) { std::string relays; sqlite3_reset(_sGetRelays); sqlite3_bind_text(_sGetRelays,1,network.id,16,SQLITE_STATIC); |