Author: toad
Date: 2007-09-20 22:00:22 +0000 (Thu, 20 Sep 2007)
New Revision: 15215
Modified:
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
Log:
Only count disconnected darknet peers towards too-many-disconnected warning
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2007-09-20 21:49:17 UTC
(rev 15214)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2007-09-20 22:00:22 UTC
(rev 15215)
@@ -878,8 +878,9 @@
ua.darknetConns =
getPeerNodeStatusSize(PEER_NODE_STATUS_CONNECTED, true) +
getPeerNodeStatusSize(PEER_NODE_STATUS_ROUTING_BACKED_OFF, true);
ua.conns =
getPeerNodeStatusSize(PEER_NODE_STATUS_CONNECTED, false) +
-
getPeerNodeStatusSize(PEER_NODE_STATUS_ROUTING_BACKED_OFF, false);
+
getPeerNodeStatusSize(PEER_NODE_STATUS_ROUTING_BACKED_OFF, false);
ua.darknetPeers = darknetPeers;
+ ua.disconnDarknetPeers = darknetPeers - ua.darknetConns;
ua.peers = peers;
ua.neverConn =
getPeerNodeStatusSize(PEER_NODE_STATUS_NEVER_CONNECTED, true);
ua.clockProblem =
getPeerNodeStatusSize(PEER_NODE_STATUS_CLOCK_PROBLEM, false);
Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2007-09-20 21:49:17 UTC (rev 15214)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2007-09-20 22:00:22 UTC (rev 15215)
@@ -15,6 +15,7 @@
public int neverConn = 0;
public int clockProblem = 0;
public int connError = 0;
+ public int disconnDarknetPeers = 0;
boolean isValid=true;
int bwlimitDelayTime = 1;
int nodeAveragePingTime = 1;
@@ -67,7 +68,7 @@
return l10n("clockProblemTitle");
if(connError > MIN_CONN_ERROR_ALERT_THRESHOLD)
return l10n("connErrorTitle");
- if((peers - conns) > MAX_DISCONN_PEER_ALERT_THRESHOLD)
+ if(disconnDarknetPeers > MAX_DISCONN_PEER_ALERT_THRESHOLD)
return l10n("tooManyDisconnectedTitle");
if(conns > MAX_CONN_ALERT_THRESHOLD)
return l10n("tooManyConnsTitle");
@@ -118,7 +119,7 @@
s = l10n("clockProblem", "count",
Integer.toString(clockProblem));
} else if(connError > MIN_CONN_ERROR_ALERT_THRESHOLD) {
s = l10n("connError", "count",
Integer.toString(connError));
- } else if((peers - conns) > MAX_DISCONN_PEER_ALERT_THRESHOLD){
+ } else if(disconnDarknetPeers >
MAX_DISCONN_PEER_ALERT_THRESHOLD){
s = l10n("tooManyDisconnected", new String[] { "count",
"max" },
new String[] {
Integer.toString(disconnected),
Integer.toString(MAX_DISCONN_PEER_ALERT_THRESHOLD)});
} else if(conns > MAX_CONN_ALERT_THRESHOLD) {
@@ -190,7 +191,7 @@
alertNode.addChild("#", l10n("clockProblem", "count",
Integer.toString(clockProblem)));
} else if(connError > MIN_CONN_ERROR_ALERT_THRESHOLD) {
alertNode.addChild("#", l10n("connError", "count",
Integer.toString(connError)));
- } else if ((peers - conns) > MAX_DISCONN_PEER_ALERT_THRESHOLD) {
+ } else if (disconnDarknetPeers >
MAX_DISCONN_PEER_ALERT_THRESHOLD) {
alertNode.addChild("#", l10n("tooManyDisconnected", new
String[] { "count", "max" }, new String[] { Integer.toString(disconnected),
Integer.toString(MAX_DISCONN_PEER_ALERT_THRESHOLD)}));
} else if (conns > MAX_CONN_ALERT_THRESHOLD) {
alertNode.addChild("#", l10n("tooManyConns", new
String[] { "count", "max" },
@@ -215,7 +216,7 @@
if((peers == 0) ||
(conns == 0) ||
(neverConn >
MAX_NEVER_CONNECTED_PEER_ALERT_THRESHOLD) ||
- ((peers - conns) >
MAX_DISCONN_PEER_ALERT_THRESHOLD) ||
+ (disconnDarknetPeers >
MAX_DISCONN_PEER_ALERT_THRESHOLD) ||
(conns > MAX_CONN_ALERT_THRESHOLD) ||
(peers > MAX_PEER_ALERT_THRESHOLD) ||
(n.bwlimitDelayAlertRelevant &&
(bwlimitDelayTime > NodeStats.MAX_BWLIMIT_DELAY_TIME_ALERT_THRESHOLD)) ||
@@ -232,7 +233,7 @@
return ((peers == 0) ||
(conns < 3) ||
(neverConn >
MAX_NEVER_CONNECTED_PEER_ALERT_THRESHOLD) ||
- ((peers - conns) >
MAX_DISCONN_PEER_ALERT_THRESHOLD) ||
+ (disconnDarknetPeers >
MAX_DISCONN_PEER_ALERT_THRESHOLD) ||
(conns > MAX_CONN_ALERT_THRESHOLD) ||
(peers > MAX_PEER_ALERT_THRESHOLD) ||
(clockProblem >
MIN_CLOCK_PROBLEM_PEER_ALERT_THRESHOLD) ||
