Author: toad
Date: 2008-01-15 21:17:13 +0000 (Tue, 15 Jan 2008)
New Revision: 17063
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
Log:
Don't display the too many connected warning if we're definitely port forwarded
*and not assuming otherwise* i.e. iff we are actually bursting to all
disconnected nodes.
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-01-15 21:09:01 UTC (rev
17062)
+++ trunk/freenet/src/freenet/node/Node.java 2008-01-15 21:17:13 UTC (rev
17063)
@@ -344,7 +344,7 @@
// Darknet stuff
- private NodeCrypto darknetCrypto;
+ NodeCrypto darknetCrypto;
// Opennet stuff
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2008-01-15 21:09:01 UTC
(rev 17062)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2008-01-15 21:17:13 UTC
(rev 17063)
@@ -961,12 +961,27 @@
opennetPeers = this.getOpennetPeers().length;
peers = darknetPeers + opennetPeers; // Seednodes don't
count.
}
- boolean opennetDefinitelyPortForwarded =
node.opennetDefinitelyPortForwarded();
+ OpennetManager om = node.getOpennet();
+
+ boolean opennetDefinitelyPortForwarded;
+ boolean opennetEnabled;
+ boolean opennetAssumeNAT;
+ if(om != null) {
+ opennetEnabled = true;
+ opennetDefinitelyPortForwarded =
om.crypto.definitelyPortForwarded();
+ opennetAssumeNAT =
om.crypto.config.alwaysHandshakeAggressively();
+ } else {
+ opennetEnabled = false;
+ opennetDefinitelyPortForwarded = false;
+ opennetAssumeNAT = false;
+ }
boolean darknetDefinitelyPortForwarded =
node.darknetDefinitelyPortForwarded();
- boolean opennetEnabled = node.isOpennetEnabled();
+ boolean darknetAssumeNAT =
node.darknetCrypto.config.alwaysHandshakeAggressively();
synchronized(ua) {
ua.opennetDefinitelyPortForwarded =
opennetDefinitelyPortForwarded;
ua.darknetDefinitelyPortForwarded =
darknetDefinitelyPortForwarded;
+ ua.opennetAssumeNAT = opennetAssumeNAT;
+ ua.darknetAssumeNAT = darknetAssumeNAT;
ua.darknetConns =
getPeerNodeStatusSize(PEER_NODE_STATUS_CONNECTED, true) +
getPeerNodeStatusSize(PEER_NODE_STATUS_ROUTING_BACKED_OFF, true);
ua.conns =
getPeerNodeStatusSize(PEER_NODE_STATUS_CONNECTED, false) +
Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2008-01-15 21:09:01 UTC (rev 17062)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2008-01-15 21:17:13 UTC (rev 17063)
@@ -24,6 +24,8 @@
public boolean isOpennetEnabled;
public boolean darknetDefinitelyPortForwarded;
public boolean opennetDefinitelyPortForwarded;
+ public boolean opennetAssumeNAT;
+ public boolean darknetAssumeNAT;
/** How many connected peers we need to not get alert about not enough
*/
public static final int MIN_CONN_ALERT_THRESHOLD = 3;
@@ -69,7 +71,7 @@
return l10n("clockProblemTitle");
if(connError > MIN_CONN_ERROR_ALERT_THRESHOLD)
return l10n("connErrorTitle");
- if(disconnDarknetPeers > MAX_DISCONN_PEER_ALERT_THRESHOLD &&
!darknetDefinitelyPortForwarded)
+ if(disconnDarknetPeers > MAX_DISCONN_PEER_ALERT_THRESHOLD &&
!darknetDefinitelyPortForwarded && !darknetAssumeNAT)
return l10n("tooManyDisconnectedTitle");
if(conns > MAX_CONN_ALERT_THRESHOLD)
return l10n("tooManyConnsTitle");
@@ -119,7 +121,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(disconnDarknetPeers >
MAX_DISCONN_PEER_ALERT_THRESHOLD && !darknetDefinitelyPortForwarded){
+ } else if(disconnDarknetPeers >
MAX_DISCONN_PEER_ALERT_THRESHOLD && !darknetDefinitelyPortForwarded &&
!darknetAssumeNAT){
s = l10n("tooManyDisconnected", new String[] { "count",
"max" },
new String[] {
Integer.toString(disconnDarknetPeers),
Integer.toString(MAX_DISCONN_PEER_ALERT_THRESHOLD)});
} else if(conns > MAX_CONN_ALERT_THRESHOLD) {
@@ -190,7 +192,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 (disconnDarknetPeers >
MAX_DISCONN_PEER_ALERT_THRESHOLD && !darknetDefinitelyPortForwarded) {
+ } else if (disconnDarknetPeers >
MAX_DISCONN_PEER_ALERT_THRESHOLD && !darknetDefinitelyPortForwarded &&
!darknetAssumeNAT) {
alertNode.addChild("#", l10n("tooManyDisconnected", new
String[] { "count", "max" }, new String[] {
Integer.toString(disconnDarknetPeers),
Integer.toString(MAX_DISCONN_PEER_ALERT_THRESHOLD)}));
} else if (conns > MAX_CONN_ALERT_THRESHOLD) {
alertNode.addChild("#", l10n("tooManyConns", new
String[] { "count", "max" },
@@ -215,7 +217,7 @@
if((peers == 0 && !isOpennetEnabled) ||
(conns == 0 && !isOpennetEnabled) ||
(neverConn >
MAX_NEVER_CONNECTED_PEER_ALERT_THRESHOLD) ||
- (disconnDarknetPeers >
MAX_DISCONN_PEER_ALERT_THRESHOLD && !darknetDefinitelyPortForwarded) ||
+ (disconnDarknetPeers >
MAX_DISCONN_PEER_ALERT_THRESHOLD && !darknetDefinitelyPortForwarded &&
!darknetAssumeNAT) ||
(conns > MAX_CONN_ALERT_THRESHOLD) ||
(peers > MAX_PEER_ALERT_THRESHOLD) ||
(n.bwlimitDelayAlertRelevant &&
(bwlimitDelayTime > NodeStats.MAX_BWLIMIT_DELAY_TIME_ALERT_THRESHOLD)) ||
@@ -232,7 +234,7 @@
return ((peers == 0 && !isOpennetEnabled) ||
(conns < 3 && !isOpennetEnabled) ||
(neverConn >
MAX_NEVER_CONNECTED_PEER_ALERT_THRESHOLD) ||
- (disconnDarknetPeers >
MAX_DISCONN_PEER_ALERT_THRESHOLD && !darknetDefinitelyPortForwarded) ||
+ (disconnDarknetPeers >
MAX_DISCONN_PEER_ALERT_THRESHOLD && !darknetDefinitelyPortForwarded &&
!darknetAssumeNAT) ||
(conns > MAX_CONN_ALERT_THRESHOLD) ||
(peers > MAX_PEER_ALERT_THRESHOLD) ||
(clockProblem >
MIN_CLOCK_PROBLEM_PEER_ALERT_THRESHOLD) ||
