From 5ad0212b9370ee2c0d8fc8a09a2552ddfb27f5b8 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Wed, 31 May 2023 15:02:17 -0700 Subject: [PATCH 1/2] Allow sending all surface addresses to peer in low-bandwidth mode --- node/Peer.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/node/Peer.cpp b/node/Peer.cpp index 6fcf193d9..d7f543ead 100644 --- a/node/Peer.cpp +++ b/node/Peer.cpp @@ -210,10 +210,8 @@ void Peer::received( if (sinceLastPush >= ((hops == 0) ? ZT_DIRECT_PATH_PUSH_INTERVAL_HAVEPATH * timerScale : ZT_DIRECT_PATH_PUSH_INTERVAL)) { _lastDirectPathPushSent = now; std::vector pathsToPush(RR->node->directPaths()); - if (! lowBandwidth) { - std::vector ma = RR->sa->whoami(); - pathsToPush.insert(pathsToPush.end(), ma.begin(), ma.end()); - } + std::vector ma = RR->sa->whoami(); + pathsToPush.insert(pathsToPush.end(), ma.begin(), ma.end()); if (!pathsToPush.empty()) { std::vector::const_iterator p(pathsToPush.begin()); while (p != pathsToPush.end()) { From 405f96c4b7cfe143c3c01a0649c98cfe88a87cfe Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Wed, 31 May 2023 15:07:57 -0700 Subject: [PATCH 2/2] allow enabling of low bandwidth mode on controllers --- ext/central-controller-docker/main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ext/central-controller-docker/main.sh b/ext/central-controller-docker/main.sh index a258c0902..1ec8e10f2 100755 --- a/ext/central-controller-docker/main.sh +++ b/ext/central-controller-docker/main.sh @@ -64,6 +64,7 @@ fi popd DEFAULT_PORT=9993 +DEFAULT_LB_MODE=false APP_NAME="controller-$(cat /var/lib/zerotier-one/identity.public | cut -d ':' -f 1)" @@ -76,6 +77,7 @@ echo "{ \"inot\", \"nat64\" ], + \"lowBandwidthMode\": ${ZT_LB_MODE:-$DEFAULT_LB_MODE}, \"ssoRedirectURL\": \"${ZT_SSO_REDIRECT_URL}\", \"allowManagementFrom\": [\"127.0.0.1\", \"::1\", \"10.0.0.0/8\"], ${REDIS}