summaryrefslogtreecommitdiff
path: root/node/Peer.cpp
diff options
context:
space:
mode:
authorGrant Limberg <grant.limberg@zerotier.com>2019-03-04 16:27:52 -0800
committerGrant Limberg <grant.limberg@zerotier.com>2019-03-04 16:31:36 -0800
commit801401a6e7022fa44c129f6626d944722d1ec6be (patch)
tree3771b94d80abd1307b965e537d7cfa0f80841ef9 /node/Peer.cpp
parentde1fc43cc58ce6a02c6eeef7791328c44189aa7c (diff)
parent270debb3fc39c3f1f6a3f6fbc2c5fb6183182c8f (diff)
downloadinfinitytier-801401a6e7022fa44c129f6626d944722d1ec6be.tar.gz
infinitytier-801401a6e7022fa44c129f6626d944722d1ec6be.zip
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'node/Peer.cpp')
-rw-r--r--node/Peer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/node/Peer.cpp b/node/Peer.cpp
index aecbd3a0..9f8c5bbc 100644
--- a/node/Peer.cpp
+++ b/node/Peer.cpp
@@ -78,7 +78,9 @@ Peer::Peer(const RuntimeEnvironment *renv,const Identity &myIdentity,const Ident
Utils::getSecureRandom(&_freeRandomByte, 1);
if (!myIdentity.agree(peerIdentity,_key,ZT_PEER_SECRET_KEY_LENGTH))
throw ZT_EXCEPTION_INVALID_ARGUMENT;
+#if ZT_PROTO_VERSION >= 10
_pathChoiceHist = new RingBuffer<int>(ZT_MULTIPATH_PROPORTION_WIN_SZ);
+#endif
}
void Peer::received(