Updated ZeroTierOne submodule to incorperate minor SDK-related changes
This commit is contained in:
Joseph Henry
2
Makefile
2
Makefile
@@ -24,7 +24,7 @@ update:
|
||||
patch:
|
||||
-cd ext/lwip; git apply ../lwip.patch;
|
||||
-cd ext/lwip-contrib; git apply ../lwip-contrib.patch;
|
||||
-cd ext/ZeroTierOne; git apply ../ZeroTierOne.patch;
|
||||
#-cd ext/ZeroTierOne; git apply ../ZeroTierOne.patch;
|
||||
|
||||
# Target-specific clean
|
||||
clean_ios:
|
||||
|
||||
Submodule ext/ZeroTierOne updated: 21f4f16e63...4743ad0b16
@@ -1,123 +0,0 @@
|
||||
diff --git a/node/Node.cpp b/node/Node.cpp
|
||||
index 30c722b2..f0503e1c 100644
|
||||
--- a/node/Node.cpp
|
||||
+++ b/node/Node.cpp
|
||||
@@ -317,7 +317,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)||(RR->topology->amUpstream()));
|
||||
+ _online = (((now - lastReceivedFromUpstream) < (ZT_PEER_ACTIVITY_TIMEOUT / 16))||(RR->topology->amUpstream()));
|
||||
if (oldOnline != _online)
|
||||
postEvent(tptr,_online ? ZT_EVENT_ONLINE : ZT_EVENT_OFFLINE);
|
||||
} catch ( ... ) {
|
||||
diff --git a/node/RingBuffer.hpp b/node/RingBuffer.hpp
|
||||
index dab81b9e..0d90152b 100644
|
||||
--- a/node/RingBuffer.hpp
|
||||
+++ b/node/RingBuffer.hpp
|
||||
@@ -72,6 +72,11 @@ public:
|
||||
memset(buf, 0, sizeof(T) * size);
|
||||
}
|
||||
|
||||
+ ~RingBuffer()
|
||||
+ {
|
||||
+ delete [] buf;
|
||||
+ }
|
||||
+
|
||||
/**
|
||||
* @return A pointer to the underlying buffer
|
||||
*/
|
||||
diff --git a/node/Switch.cpp b/node/Switch.cpp
|
||||
index 74c22d33..3e4f53b4 100644
|
||||
--- a/node/Switch.cpp
|
||||
+++ b/node/Switch.cpp
|
||||
@@ -425,16 +425,16 @@ 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())
|
||||
- outp.compress();
|
||||
+ //if (!network->config().disableCompression())
|
||||
+ // outp.compress();
|
||||
aqm_enqueue(tPtr,network,outp,true,qosBucket);
|
||||
} else {
|
||||
Packet outp(toZT,RR->identity.address(),Packet::VERB_FRAME);
|
||||
outp.append(network->id());
|
||||
outp.append((uint16_t)etherType);
|
||||
outp.append(data,len);
|
||||
- if (!network->config().disableCompression())
|
||||
- outp.compress();
|
||||
+ //if (!network->config().disableCompression())
|
||||
+ // outp.compress();
|
||||
aqm_enqueue(tPtr,network,outp,true,qosBucket);
|
||||
}
|
||||
|
||||
@@ -532,7 +532,7 @@ void Switch::aqm_enqueue(void *tPtr, const SharedPtr<Network> &network, Packet &
|
||||
TXQueueEntry *txEntry = new TXQueueEntry(dest,RR->node->now(),packet,encrypt);
|
||||
|
||||
ManagedQueue *selectedQueue = nullptr;
|
||||
- for (int i=0; i<ZT_QOS_NUM_BUCKETS; i++) {
|
||||
+ for (size_t i=0; i<ZT_QOS_NUM_BUCKETS; i++) {
|
||||
if (i < nqcb->oldQueues.size()) { // search old queues first (I think this is best since old would imply most recent usage of the queue)
|
||||
if (nqcb->oldQueues[i]->id == qosBucket) {
|
||||
selectedQueue = nqcb->oldQueues[i];
|
||||
@@ -568,7 +568,7 @@ void Switch::aqm_enqueue(void *tPtr, const SharedPtr<Network> &network, Packet &
|
||||
{
|
||||
// DEBUG_INFO("too many enqueued packets (%d), finding packet to drop", nqcb->_currEnqueuedPackets);
|
||||
int maxQueueLength = 0;
|
||||
- for (int i=0; i<ZT_QOS_NUM_BUCKETS; i++) {
|
||||
+ for (size_t i=0; i<ZT_QOS_NUM_BUCKETS; i++) {
|
||||
if (i < nqcb->oldQueues.size()) {
|
||||
if (nqcb->oldQueues[i]->byteLength > maxQueueLength) {
|
||||
maxQueueLength = nqcb->oldQueues[i]->byteLength;
|
||||
diff --git a/osdep/OSUtils.cpp b/osdep/OSUtils.cpp
|
||||
index 676f6335..2834fd22 100644
|
||||
--- a/osdep/OSUtils.cpp
|
||||
+++ b/osdep/OSUtils.cpp
|
||||
@@ -452,6 +452,7 @@ std::string OSUtils::platformDefaultHomePath()
|
||||
#endif // __UNIX_LIKE__ or not...
|
||||
}
|
||||
|
||||
+#ifndef OMIT_JSON_SUPPORT
|
||||
// Inline these massive JSON operations in one place only to reduce binary footprint and compile time
|
||||
nlohmann::json OSUtils::jsonParse(const std::string &buf) { return nlohmann::json::parse(buf.c_str()); }
|
||||
std::string OSUtils::jsonDump(const nlohmann::json &j,int indentation) { return j.dump(indentation); }
|
||||
@@ -543,6 +544,8 @@ std::string OSUtils::jsonBinFromHex(const nlohmann::json &jv)
|
||||
return std::string();
|
||||
}
|
||||
|
||||
+#endif // OMIT_JSON_SUPPORT
|
||||
+
|
||||
// Used to convert HTTP header names to ASCII lower case
|
||||
const unsigned char OSUtils::TOLOWER_TABLE[256] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, ' ', '!', '"', '#', '$', '%', '&', 0x27, '(', ')', '*', '+', ',', '-', '.', '/', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', '@', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '{', '|', '}', '~', '_', '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '{', '|', '}', '~', 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff };
|
||||
|
||||
diff --git a/osdep/OSUtils.hpp b/osdep/OSUtils.hpp
|
||||
index 2c4283b0..afdb1bf1 100644
|
||||
--- a/osdep/OSUtils.hpp
|
||||
+++ b/osdep/OSUtils.hpp
|
||||
@@ -55,7 +55,9 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#ifndef OMIT_JSON_SUPPORT
|
||||
#include "../ext/json/json.hpp"
|
||||
+#endif
|
||||
|
||||
namespace ZeroTier {
|
||||
|
||||
@@ -284,6 +286,7 @@ public:
|
||||
*/
|
||||
static std::string platformDefaultHomePath();
|
||||
|
||||
+#ifndef OMIT_JSON_SUPPORT
|
||||
static nlohmann::json jsonParse(const std::string &buf);
|
||||
static std::string jsonDump(const nlohmann::json &j,int indentation = 1);
|
||||
static uint64_t jsonInt(const nlohmann::json &jv,const uint64_t dfl);
|
||||
@@ -291,6 +294,7 @@ public:
|
||||
static bool jsonBool(const nlohmann::json &jv,const bool dfl);
|
||||
static std::string jsonString(const nlohmann::json &jv,const char *dfl);
|
||||
static std::string jsonBinFromHex(const nlohmann::json &jv);
|
||||
+#endif // OMIT_JSON_SUPPORT
|
||||
|
||||
private:
|
||||
static const unsigned char TOLOWER_TABLE[256];
|
||||
Reference in New Issue
Block a user