summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-12-15 10:53:15 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-12-15 10:53:15 -0800
commita6c5596782bf25c6563f97c5018efcb175079e2d (patch)
treeee9372f6f2a0b1e33838a620578087bdde56ff77
parent022d3857cc3f4535ffaf5e7211cde6502c4d6e10 (diff)
downloadinfinitytier-a6c5596782bf25c6563f97c5018efcb175079e2d.tar.gz
infinitytier-a6c5596782bf25c6563f97c5018efcb175079e2d.zip
Patch controller to not send relays to 1.1.0 to avoid triggering 1.1.0 network preferred relays bug.
-rw-r--r--controller/SqliteNetworkController.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/controller/SqliteNetworkController.cpp b/controller/SqliteNetworkController.cpp
index fa741be1..0e90163d 100644
--- a/controller/SqliteNetworkController.cpp
+++ b/controller/SqliteNetworkController.cpp
@@ -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);