From 3abbc1b3d0af93f340110dcfca3bc5ccfaf22855 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 7 Feb 2025 11:41:21 -0500 Subject: [PATCH] Transport: Remove old NTCP 1 stats --- .../router/transport/ntcp/EventPumper.java | 2 +- .../router/transport/ntcp/NTCPTransport.java | 34 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java index c63f40bee..22f8e8b40 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java +++ b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java @@ -960,7 +960,7 @@ class EventPumper implements Runnable { con.close(true); } catch (UnresolvedAddressException uae) { if (_log.shouldLog(Log.WARN)) _log.warn("unresolved address connecting", uae); - _context.statManager().addRateData("ntcp.connectFailedUnresolved", 1); + //_context.statManager().addRateData("ntcp.connectFailedUnresolved", 1); _transport.markUnreachable(con.getRemotePeer().calculateHash()); con.close(true); } catch (CancelledKeyException cke) { diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index 4c812803e..bc90c6b1f 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -156,8 +156,8 @@ public class NTCPTransport extends TransportImpl { _context.statManager().createRateStat("ntcp.sendTime", "Total message lifetime when sent completely", "ntcp", RATES); _context.statManager().createRateStat("ntcp.sendQueueSize", "How many messages were ahead of the current one on the connection's queue when it was first added", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.receiveTime", "How long it takes to receive an inbound message", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.receiveSize", "How large the received message was", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.receiveTime", "How long it takes to receive an inbound message", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.receiveSize", "How large the received message was", "ntcp", RATES); _context.statManager().createRateStat("ntcp.sendBacklogTime", "How long the head of the send queue has been waiting when we fail to add a new one to the queue (period is the number of messages queued)", "ntcp", RATES); _context.statManager().createRateStat("ntcp.failsafeWrites", "How many times do we need to proactively add in an extra nio write to a peer at any given failsafe pass?", "ntcp", RATES); _context.statManager().createRateStat("ntcp.failsafeCloses", "How many times do we need to proactively close an idle connection to a peer at any given failsafe pass?", "ntcp", RATES); @@ -166,24 +166,24 @@ public class NTCPTransport extends TransportImpl { _context.statManager().createRateStat("ntcp.accept", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.attemptBanlistedPeer", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.attemptUnreachablePeer", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.closeOnBacklog", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.closeOnBacklog", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.connectFailedIOE", "", "ntcp", RATES); //_context.statManager().createRateStat("ntcp.connectFailedInvalidPort", "", "ntcp", RATES); //_context.statManager().createRateStat("ntcp.bidRejectedLocalAddress", "", "ntcp", RATES); //_context.statManager().createRateStat("ntcp.bidRejectedNoNTCPAddress", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.connectFailedTimeout", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.connectFailedTimeoutIOE", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.connectFailedUnresolved", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.connectFailedUnresolved", "", "ntcp", RATES); //_context.statManager().createRateStat("ntcp.connectImmediate", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.connectSuccessful", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.corruptDecryptedI2NP", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.corruptI2NPCRC", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.corruptDecryptedI2NP", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.corruptI2NPCRC", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.corruptI2NPIME", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.corruptI2NPIOE", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.corruptMetaCRC", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.corruptI2NPIOE", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.corruptMetaCRC", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.corruptSkew", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.corruptTooLargeI2NP", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.dontSendOnBacklog", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.corruptTooLargeI2NP", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.dontSendOnBacklog", "", "ntcp", RATES); //_context.statManager().createRateStat("ntcp.inboundCheckConnection", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.inboundEstablished", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.inboundEstablishedDuplicate", "", "ntcp", RATES); @@ -191,15 +191,15 @@ public class NTCPTransport extends TransportImpl { _context.statManager().createRateStat("ntcp.inboundIPv6Conn", "Inbound IPv6 NTCP Connection", "ntcp", RATES); //_context.statManager().createRateStat("ntcp.infoMessageEnqueued", "", "ntcp", RATES); //_context.statManager().createRateStat("ntcp.floodInfoMessageEnqueued", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.invalidDH", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.invalidHXY", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.invalidHXxorBIH", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.invalidInboundDFE", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.invalidInboundIOE", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.invalidDH", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.invalidHXY", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.invalidHXxorBIH", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.invalidInboundDFE", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.invalidInboundIOE", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.invalidInboundSignature", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.invalidInboundSize", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.invalidInboundSize", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.invalidInboundSkew", "", "ntcp", RATES); - _context.statManager().createRateStat("ntcp.invalidSignature", "", "ntcp", RATES); + //_context.statManager().createRateStat("ntcp.invalidSignature", "", "ntcp", RATES); //_context.statManager().createRateStat("ntcp.liveReadBufs", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.multipleCloseOnRemove", "", "ntcp", RATES); _context.statManager().createRateStat("ntcp.outboundEstablishFailed", "", "ntcp", RATES);