Browse Source

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

Grant Limberg 6 years ago
parent
commit
33d7b22abe
1 changed files with 3 additions and 2 deletions
  1. 3 2
      service/OneService.cpp

+ 3 - 2
service/OneService.cpp

@@ -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: