From a6c5596782bf25c6563f97c5018efcb175079e2d Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 15 Dec 2015 10:53:15 -0800 Subject: [PATCH] Patch controller to not send relays to 1.1.0 to avoid triggering 1.1.0 network preferred relays bug. --- controller/SqliteNetworkController.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/controller/SqliteNetworkController.cpp b/controller/SqliteNetworkController.cpp index fa741be1c..0e90163de 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);