From 90d324ae964fddf3355505d5d9651e75872f76b7 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Fri, 17 May 2019 10:15:40 -0700
Subject: [PATCH] Fixed ZT_SDK build issue. Moved ZT_SDK preprocessor
 directives to more permanent homes

---
 node/Constants.hpp     | 4 ++++
 node/NetworkConfig.hpp | 9 ++++++++-
 node/Node.cpp          | 2 +-
 node/Switch.cpp        | 6 +++---
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/node/Constants.hpp b/node/Constants.hpp
index e8a3e0205..4f45f6168 100644
--- a/node/Constants.hpp
+++ b/node/Constants.hpp
@@ -482,7 +482,11 @@
 /**
  * Timeout for overall peer activity (measured from last receive)
  */
+#ifndef ZT_SDK
 #define ZT_PEER_ACTIVITY_TIMEOUT 500000
+#else
+#define ZT_PEER_ACTIVITY_TIMEOUT 30000
+#endif
 
 /**
  * General rate limit timeout for multiple packet types (HELLO, etc.)
diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp
index 6367b8ec2..be8c03ddb 100644
--- a/node/NetworkConfig.hpp
+++ b/node/NetworkConfig.hpp
@@ -274,7 +274,14 @@ public:
 	/**
 	 * @return True if frames should not be compressed
 	 */
-	inline bool disableCompression() const { return ((this->flags & ZT_NETWORKCONFIG_FLAG_DISABLE_COMPRESSION) != 0); }
+	inline bool disableCompression() const
+	{
+#ifndef ZT_SDK
+		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
+#endif
+	}
 
 	/**
 	 * @return Network type is public (no access control)
diff --git a/node/Node.cpp b/node/Node.cpp
index ffa4a700c..c9f38ad30 100644
--- a/node/Node.cpp
+++ b/node/Node.cpp
@@ -340,7 +340,7 @@ ZT_ResultCode Node::processBackgroundTasks(void *tptr,int64_t now,volatile int64
 
 			// Update online status, post status change as event
 			const bool oldOnline = _online;
-			_online = (((now - lastReceivedFromUpstream) < (ZT_PEER_ACTIVITY_TIMEOUT / (ZT_SDK ? 16 : 1)))||(RR->topology->amUpstream()));
+			_online = (((now - lastReceivedFromUpstream) < ZT_PEER_ACTIVITY_TIMEOUT)||(RR->topology->amUpstream()));
 			if (oldOnline != _online)
 				postEvent(tptr,_online ? ZT_EVENT_ONLINE : ZT_EVENT_OFFLINE);
 		} catch ( ... ) {
diff --git a/node/Switch.cpp b/node/Switch.cpp
index eeab051eb..55275dc31 100644
--- a/node/Switch.cpp
+++ b/node/Switch.cpp
@@ -425,7 +425,7 @@ void Switch::onLocalEthernet(void *tPtr,const SharedPtr<Network> &network,const
 			from.appendTo(outp);
 			outp.append((uint16_t)etherType);
 			outp.append(data,len);
-			if (!network->config().disableCompression() && !ZT_SDK)
+			if (!network->config().disableCompression())
 				outp.compress();
 			aqm_enqueue(tPtr,network,outp,true,qosBucket);
 		} else {
@@ -433,7 +433,7 @@ void Switch::onLocalEthernet(void *tPtr,const SharedPtr<Network> &network,const
 			outp.append(network->id());
 			outp.append((uint16_t)etherType);
 			outp.append(data,len);
-			if (!network->config().disableCompression() && !ZT_SDK)
+			if (!network->config().disableCompression())
 				outp.compress();
 			aqm_enqueue(tPtr,network,outp,true,qosBucket);
 		}
@@ -490,7 +490,7 @@ void Switch::onLocalEthernet(void *tPtr,const SharedPtr<Network> &network,const
 				from.appendTo(outp);
 				outp.append((uint16_t)etherType);
 				outp.append(data,len);
-				if (!network->config().disableCompression() && !ZT_SDK)
+				if (!network->config().disableCompression())
 					outp.compress();
 				aqm_enqueue(tPtr,network,outp,true,qosBucket);
 			} else {