gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patched ZeroTierOne to disable outgoing frame compression

Browse Source
This commit is contained in:
Joseph Henry
2019-02-14 19:03:49 -08:00
parent 34b84a0b3c
commit e40c3f5527
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -39,7 +39,7 @@ CONCURRENT_BUILD_JOBS=2
patch: patch:
-git -C ext/lwip apply ../lwip.patch -git -C ext/lwip apply ../lwip.patch
-git -C ext/lwip-contrib apply ../lwip-contrib.patch -git -C ext/lwip-contrib apply ../lwip-contrib.patch
#-git -C ext/ZeroTierOne apply ../ZeroTierOne.patch -git -C ext/ZeroTierOne apply ../ZeroTierOne.patch
.PHONY: clean .PHONY: clean
clean: clean:

23
ext/ZeroTierOne.patch
View File

@@ -15,9 +15,30 @@ index dab81b9e..0d90152b 100644
* @return A pointer to the underlying buffer * @return A pointer to the underlying buffer
*/ */
diff --git a/node/Switch.cpp b/node/Switch.cpp diff --git a/node/Switch.cpp b/node/Switch.cpp
index 74c22d33..58979e26 100644 index 74c22d33..3e4f53b4 100644
--- a/node/Switch.cpp --- a/node/Switch.cpp
+++ b/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 & @@ -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); TXQueueEntry *txEntry = new TXQueueEntry(dest,RR->node->now(),packet,encrypt);