summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorJoseph Henry <[email protected]>2019-01-31 03:08:48 -0800
committerJoseph Henry <[email protected]>2019-01-31 03:08:48 -0800
commit292fcdda2c6acb78b85aee438bf1126ebe7b502f (patch)
tree81204c280dffe9fce94419da9b3e0e0ef6dd4189 /ext
parentd715ebd461d1797d42b17c83f765d01fe96de7fa (diff)
Improved callback logic. Simplified lwip driver.
Diffstat (limited to 'ext')
-rw-r--r--ext/ZeroTierOne.patch13
1 files changed, 11 insertions, 2 deletions
diff --git a/ext/ZeroTierOne.patch b/ext/ZeroTierOne.patch
index 5a766ab..4094e39 100644
--- a/ext/ZeroTierOne.patch
+++ b/ext/ZeroTierOne.patch
@@ -37,10 +37,19 @@ index 74c22d33..58979e26 100644
if (nqcb->oldQueues[i]->byteLength > maxQueueLength) {
maxQueueLength = nqcb->oldQueues[i]->byteLength;
diff --git a/service/OneService.cpp b/service/OneService.cpp
-index a1c53764..757863a8 100644
+index a1c53764..e3034059 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
-@@ -2244,6 +2244,12 @@ public:
+@@ -625,6 +625,8 @@ public:
+ break;
+ if (!pkt)
+ break;
++ if (!_run)
++ break;
+
+ const ZT_ResultCode rc = _node->processWirePacket(nullptr,pkt->now,pkt->sock,&(pkt->from),pkt->data,pkt->size,&_nextBackgroundTaskDeadline);
+ {
+@@ -2244,6 +2246,12 @@ public:
#endif
syncManagedStuff(n,true,true);
n.tap->setMtu(nwc->mtu);