summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorGrant Limberg <grant.limberg@zerotier.com>2018-11-11 23:06:31 -0800
committerGrant Limberg <grant.limberg@zerotier.com>2018-11-11 23:06:31 -0800
commit33d7b22abe3988b2682f4bdf87ce632cf6243ae6 (patch)
tree8de4e3a1cf6dee097b32778585c09dcd28030c93 /service
parent2f9712e6a721a57fe05bc21b03c12ec67d87e294 (diff)
parentb937aeb857255c44dcdd66ef0ac3aed1c843fb13 (diff)
downloadinfinitytier-33d7b22abe3988b2682f4bdf87ce632cf6243ae6.tar.gz
infinitytier-33d7b22abe3988b2682f4bdf87ce632cf6243ae6.zip
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'service')
-rw-r--r--service/OneService.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp
index f970c674..effe90c2 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -174,6 +174,9 @@ namespace ZeroTier { typedef BSDEthernetTap EthernetTap; }
// TCP activity timeout
#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
size_t curlResponseWrite(void *ptr, size_t size, size_t nmemb, std::string *data)
{
@@ -437,8 +440,6 @@ struct TcpConnection
Mutex writeq_m;
};
-#define ZT_INCOMING_PACKET_THREAD_POOL_SIZE 8
-
class OneServiceImpl : public OneService
{
public: