From b0e86d11c947d080b3fd13d7d6a8e2b3745150cb Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Wed, 14 Aug 2019 11:24:03 -0700 Subject: [PATCH] Minor. Name change for trace functions --- node/Peer.cpp | 4 ++-- node/Trace.cpp | 4 ++-- node/Trace.hpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/node/Peer.cpp b/node/Peer.cpp index 2bba9bd9b..ce3083cc1 100644 --- a/node/Peer.cpp +++ b/node/Peer.cpp @@ -794,10 +794,10 @@ unsigned int Peer::doPingAndKeepalive(void *tPtr,int64_t now) } } if (alivePathCount < 2 && _linkIsRedundant) { _linkIsRedundant = !_linkIsRedundant; - RR->t->peerLinkNoLongerRedundant(NULL,*this); + RR->t->peerLinkNoLongerAggregate(NULL,*this); } if (alivePathCount > 1 && !_linkIsRedundant) { _linkIsRedundant = !_linkIsRedundant; - RR->t->peerLinkNowRedundant(NULL,*this); + RR->t->peerLinkNoLongerAggregate(NULL,*this); } } diff --git a/node/Trace.cpp b/node/Trace.cpp index 8e98cb072..b7c002719 100644 --- a/node/Trace.cpp +++ b/node/Trace.cpp @@ -107,7 +107,7 @@ void Trace::peerConfirmingUnknownPath(void *const tPtr,const uint64_t networkId, } } -void Trace::peerLinkNowRedundant(void *const tPtr,Peer &peer) +void Trace::peerLinkNowAggregate(void *const tPtr,Peer &peer) { if ((RR->node->getMultipathMode() == ZT_MULTIPATH_RANDOM)) { ZT_LOCAL_TRACE(tPtr,RR,"link to peer %.10llx is now a randomly-distributed aggregate link",peer.address().toInt()); @@ -117,7 +117,7 @@ void Trace::peerLinkNowRedundant(void *const tPtr,Peer &peer) } } -void Trace::peerLinkNoLongerRedundant(void *const tPtr,Peer &peer) +void Trace::peerLinkNoLongerAggregate(void *const tPtr,Peer &peer) { ZT_LOCAL_TRACE(tPtr,RR,"link to peer %.10llx has degraded and is no longer an aggregate link",peer.address().toInt()); } diff --git a/node/Trace.hpp b/node/Trace.hpp index 2effb7f0e..162df1542 100644 --- a/node/Trace.hpp +++ b/node/Trace.hpp @@ -122,8 +122,8 @@ public: void peerConfirmingUnknownPath(void *const tPtr,const uint64_t networkId,Peer &peer,const SharedPtr &path,const uint64_t packetId,const Packet::Verb verb); - void peerLinkNowRedundant(void *const tPtr,Peer &peer); - void peerLinkNoLongerRedundant(void *const tPtr,Peer &peer); + void peerLinkNowAggregate(void *const tPtr,Peer &peer); + void peerLinkNoLongerAggregate(void *const tPtr,Peer &peer); void peerLinkAggregateStatistics(void *const tPtr,Peer &peer);