diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-07-23 16:06:40 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-07-23 16:06:40 -0700 |
| commit | 196bac726c65be729c9fd4348dc30ac0c60e3177 (patch) | |
| tree | 9e3fa4dd48758ca0a66a233ed878683ea62cc565 | |
| parent | ac2688de5853160a1d4afb02395488594e6cca8e (diff) | |
| parent | d2af12b6a0bd37bdecd1edbdfdfda37e082f8844 (diff) | |
| download | infinitytier-196bac726c65be729c9fd4348dc30ac0c60e3177.tar.gz infinitytier-196bac726c65be729c9fd4348dc30ac0c60e3177.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev
| -rw-r--r-- | make-linux.mk | 4 | ||||
| -rw-r--r-- | node/NetworkConfig.hpp | 8 |
2 files changed, 10 insertions, 2 deletions
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 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 } |