void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev

Browse source
This commit is contained in:
Grant Limberg 2018-11-11 23:06:31 -08:00
commit 33d7b22abe
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
service/OneService.cpp
View file

@ -174,6 +174,9 @@ namespace ZeroTier { typedef BSDEthernetTap EthernetTap; }
// TCP activity timeout // TCP activity timeout
#define ZT_TCP_ACTIVITY_TIMEOUT 60000 #define ZT_TCP_ACTIVITY_TIMEOUT 60000
// Number of receive path threads to start
#define ZT_INCOMING_PACKET_THREAD_POOL_SIZE 8
#if ZT_VAULT_SUPPORT #if ZT_VAULT_SUPPORT
size_t curlResponseWrite(void *ptr, size_t size, size_t nmemb, std::string *data) size_t curlResponseWrite(void *ptr, size_t size, size_t nmemb, std::string *data)
{ {
@ -437,8 +440,6 @@ struct TcpConnection
Mutex writeq_m; Mutex writeq_m;
}; };
#define ZT_INCOMING_PACKET_THREAD_POOL_SIZE 8
class OneServiceImpl : public OneService class OneServiceImpl : public OneService
{ {
public: public: