Sfoglia il codice sorgente

fix a couple of metrics (#1989)

Grant Limberg 2 anni fa
parent
commit
54f339f0c0
3 ha cambiato i file con 3 aggiunte e 2 eliminazioni
  1. 1 0
      node/Bond.cpp
  2. 0 1
      node/IncomingPacket.cpp
  3. 2 1
      node/Peer.cpp

+ 1 - 0
node/Bond.cpp

@@ -879,6 +879,7 @@ void Bond::processBackgroundBondTasks(void* tPtr, int64_t now)
 						RR->node->putPacket(tPtr, _paths[i].p->localSocket(), _paths[i].p->address(), outp.data(), outp.size());
 						_paths[i].p->_lastOut = now;
 						_overheadBytes += outp.size();
+						Metrics::pkt_echo_out++;
 						// debug("tx: verb 0x%-2x of len %4d via %s (ECHO)", Packet::VERB_ECHO, outp.size(), pathToStr(_paths[i].p).c_str());
 					}
 				}

+ 0 - 1
node/IncomingPacket.cpp

@@ -733,7 +733,6 @@ bool IncomingPacket::_doWHOIS(const RuntimeEnvironment *RR,void *tPtr,const Shar
 	if (count > 0) {
 		Metrics::pkt_ok_out++;
 		outp.armor(peer->key(),true,peer->aesKeysIfSupported());
-		Metrics::pkt_ok_out++;
 		_path->send(RR,tPtr,outp.data(),outp.size(),RR->node->now());
 	}
 

+ 2 - 1
node/Peer.cpp

@@ -445,9 +445,10 @@ void Peer::sendHELLO(void *tPtr,const int64_t localSocket,const InetAddress &atA
 
 	outp.cryptField(_key,startCryptedPortionAt,outp.size() - startCryptedPortionAt);
 
+	Metrics::pkt_hello_out++;
+
 	if (atAddress) {
 		outp.armor(_key,false,nullptr); // false == don't encrypt full payload, but add MAC
-		Metrics::pkt_hello_out++;
 		RR->node->expectReplyTo(outp.packetId());
 		RR->node->putPacket(tPtr,RR->node->lowBandwidthModeEnabled() ? localSocket : -1,atAddress,outp.data(),outp.size());
 	} else {