Browse Source

Minor. Name change for trace functions

Joseph Henry 6 years ago
parent
commit
b0e86d11c9
3 changed files with 6 additions and 6 deletions
  1. 2 2
      node/Peer.cpp
  2. 2 2
      node/Trace.cpp
  3. 2 2
      node/Trace.hpp

+ 2 - 2
node/Peer.cpp

@@ -794,10 +794,10 @@ unsigned int Peer::doPingAndKeepalive(void *tPtr,int64_t now)
 			}
 			}
 		} if (alivePathCount < 2 && _linkIsRedundant) {
 		} if (alivePathCount < 2 && _linkIsRedundant) {
 			_linkIsRedundant = !_linkIsRedundant;
 			_linkIsRedundant = !_linkIsRedundant;
-			RR->t->peerLinkNoLongerRedundant(NULL,*this);
+			RR->t->peerLinkNoLongerAggregate(NULL,*this);
 		} if (alivePathCount > 1 && !_linkIsRedundant) {
 		} if (alivePathCount > 1 && !_linkIsRedundant) {
 			_linkIsRedundant = !_linkIsRedundant;
 			_linkIsRedundant = !_linkIsRedundant;
-			RR->t->peerLinkNowRedundant(NULL,*this);
+			RR->t->peerLinkNoLongerAggregate(NULL,*this);
 		}
 		}
 	}
 	}
 
 

+ 2 - 2
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)) {
 	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());
 		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());
 	ZT_LOCAL_TRACE(tPtr,RR,"link to peer %.10llx has degraded and is no longer an aggregate link",peer.address().toInt());
 }
 }

+ 2 - 2
node/Trace.hpp

@@ -122,8 +122,8 @@ public:
 
 
 	void peerConfirmingUnknownPath(void *const tPtr,const uint64_t networkId,Peer &peer,const SharedPtr<Path> &path,const uint64_t packetId,const Packet::Verb verb);
 	void peerConfirmingUnknownPath(void *const tPtr,const uint64_t networkId,Peer &peer,const SharedPtr<Path> &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);
 	void peerLinkAggregateStatistics(void *const tPtr,Peer &peer);