From 6958ba9557f4c9969f0decd1e70c7dafb7ca6209 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Tue, 23 Jul 2019 12:39:07 -0700 Subject: Added ZT_DISABLE_COMPRESSION build flag for SDK and low-end NAS builds --- node/NetworkConfig.hpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp index be8c03dd..ddad52a5 100644 --- a/node/NetworkConfig.hpp +++ b/node/NetworkConfig.hpp @@ -276,10 +276,14 @@ public: */ inline bool disableCompression() const { -#ifndef ZT_SDK +#ifndef ZT_DISABLE_COMPRESSION return ((this->flags & ZT_NETWORKCONFIG_FLAG_DISABLE_COMPRESSION) != 0); #else - return false; // Compression is disabled for SDK builds since it doesn't play nice with lwIP + /* Compression is disabled for libzt builds since it causes non-obvious chaotic + interference with lwIP's TCP congestion algorithm. Compression is also disabled + for some NAS builds due to the usage of low-performance processors in certain + older and budget models. */ + return false; #endif } -- cgit v1.2.3 From d2af12b6a0bd37bdecd1edbdfdfda37e082f8844 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Tue, 23 Jul 2019 13:33:25 -0700 Subject: Forgot to add ZT_DISABLE_COMPRESSION to linux makefile --- make-linux.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/make-linux.mk b/make-linux.mk index d0745fe9..b777f67e 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -96,6 +96,10 @@ ifeq ($(ZT_SYNOLOGY), 1) override DEFS+=-D__SYNOLOGY__ endif +ifeq ($(ZT_DISABLE_COMPRESSION), 1) + override DEFS+=-DZT_DISABLE_COMPRESSION +endif + ifeq ($(ZT_TRACE),1) override DEFS+=-DZT_TRACE endif -- cgit v1.2.3