void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Adam Ierymenko 2019-07-23 16:06:40 -07:00
commit 196bac726c
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
make-linux.mk
View file

@ -96,6 +96,10 @@ ifeq ($(ZT_SYNOLOGY), 1)
override DEFS+=-D__SYNOLOGY__ override DEFS+=-D__SYNOLOGY__
endif endif
ifeq ($(ZT_DISABLE_COMPRESSION), 1)
override DEFS+=-DZT_DISABLE_COMPRESSION
endif
ifeq ($(ZT_TRACE),1) ifeq ($(ZT_TRACE),1)
override DEFS+=-DZT_TRACE override DEFS+=-DZT_TRACE
endif endif

8
node/NetworkConfig.hpp
View file

@ -276,10 +276,14 @@ public:
*/ */
inline bool disableCompression() const inline bool disableCompression() const
{ {
#ifndef ZT_SDK #ifndef ZT_DISABLE_COMPRESSION
return ((this->flags & ZT_NETWORKCONFIG_FLAG_DISABLE_COMPRESSION) != 0); return ((this->flags & ZT_NETWORKCONFIG_FLAG_DISABLE_COMPRESSION) != 0);
#else #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 #endif
} }