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

Updated UDP packetization between service and client-side socket API implementation

Browse Source
This commit is contained in:
Joseph Henry
2016-08-24 13:08:19 -07:00
parent d376e5f69c
commit 6836348386
5 changed files with 80 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SDK_EthernetTap.hpp
View File

@@ -76,8 +76,8 @@ struct accept_st;
#define DEFAULT_TCP_RX_BUF_SOFTMIN DEFAULT_TCP_RX_BUF_SZ * 0.20
// UDP Buffer sizes (should be about the size of your MTU)
#define DEFAULT_UDP_TX_BUF_SZ 1500
#define DEFAULT_UDP_RX_BUF_SZ 1500
#define DEFAULT_UDP_TX_BUF_SZ ZT_MAX_MTU
#define DEFAULT_UDP_RX_BUF_SZ ZT_MAX_MTU * 128
namespace ZeroTier {
@@ -101,7 +101,6 @@ namespace ZeroTier {
unsigned char rxbuf[DEFAULT_TCP_RX_BUF_SZ];
// TODO: necessary still?
bool unread_udp_packet;
int proxy_conn_state;
};
@@ -167,6 +166,8 @@ namespace ZeroTier {
void phyOnFileDescriptorActivity(PhySocket *sock,void **uptr,bool readable,bool writable);
// --- end Proxy
std::string _homePath;
private:
// LWIP callbacks
// NOTE: these are called from within LWIP, meaning that lwipstack->_lock is ALREADY
@@ -496,7 +497,6 @@ namespace ZeroTier {
MAC _mac;
Thread _thread;
std::string _homePath;
std::string _dev; // path to Unix domain socket
std::vector<MulticastGroup> _multicastGroups;