summaryrefslogtreecommitdiff
path: root/service/OneService.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-03-17 13:56:01 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-03-17 13:56:01 -0700
commitcc883cc3d81dd72427c0be0f386f39590f4578dd (patch)
tree4227f77bb0293bbc2d13240abe5149d0f13766d7 /service/OneService.cpp
parentdf3025554213570aca6259b30d2bd314f3628659 (diff)
parentc6a39ed927161736e44aeaa67c6783024c1fb86a (diff)
downloadinfinitytier-cc883cc3d81dd72427c0be0f386f39590f4578dd.tar.gz
infinitytier-cc883cc3d81dd72427c0be0f386f39590f4578dd.zip
Merge branch 'master' of http://10.6.6.2/zerotier/ZeroTierOne
Diffstat (limited to 'service/OneService.cpp')
-rw-r--r--service/OneService.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp
index 4a2102f1..1c2fa05d 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -488,6 +488,8 @@ public:
,_updater((SoftwareUpdater *)0)
,_updateAutoApply(false)
,_primaryPort(port)
+ ,_v4TcpControlSocket((PhySocket *)0)
+ ,_v6TcpControlSocket((PhySocket *)0)
,_lastDirectReceiveFromGlobal(0)
#ifdef ZT_TCP_FALLBACK_RELAY
,_lastSendToGlobalV4(0)