Author: zothar
Date: 2006-08-13 17:31:06 +0000 (Sun, 13 Aug 2006)
New Revision: 10065
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/PeerNodeStatus.java
Log:
Fix a few reversions that made it through the recent DarknetConnectionsToadlet
HTMLNode-ification.
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-08-13 16:54:56 UTC (rev 10064)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-08-13 17:31:06 UTC (rev 10065)
@@ -102,7 +102,7 @@
if (statusDifference != 0) {
return statusDifference;
}
- return
firstNode.getName().compareTo(secondNode.getName());
+ return
firstNode.getName().compareToIgnoreCase(secondNode.getName());
}
});
@@ -307,22 +307,21 @@
if (peerNodeStatus.isConnected() &&
(Integer.parseInt(peerNodeStatus.getSimpleVersion()) > 476)) {
peerRow.addChild("td", "class",
"peer-name").addChild("a", "href", "/send_n2ntm/?peernode_hashcode=" +
peerNodeStatus.hashCode(), peerNodeStatus.getName());
} else {
- peerRow.addChild("td", "class",
"peer-name").addChild("#", peerNodeStatus.getName());
+ peerRow.addChild("td", "class",
"peer-name").addChild("#", peerNodeStatus.getName()); // TODO: This branch can
probably be removed at some point
}
// address column
if (advancedEnabled) {
String pingTime = "";
- if (peerNodeStatus.getStatusValue() ==
Node.PEER_NODE_STATUS_CONNECTED ||
-
peerNodeStatus.getStatusValue() == Node.PEER_NODE_STATUS_ROUTING_BACKED_OFF) {
+ if (peerNodeStatus.isConnected()) {
pingTime = " (" + (int)
peerNodeStatus.getAveragePingTime() + "ms)";
}
peerRow.addChild("td", "class",
"peer-address").addChild("#", ((peerNodeStatus.getPeerAddress() != null) ?
(peerNodeStatus.getPeerAddress() + ":" + peerNodeStatus.getPeerPort()) :
("(unknown address)")) + pingTime);
}
// version column
- if
(peerNodeStatus.isPublicReverseInvalidVersion()) {
- peerRow.addChild("td", "class",
"peer-version").addChild("span", "class", "peer_too_new", advancedEnabled ?
peerNodeStatus.getVersion() : peerNodeStatus.getSimpleVersion());
+ if (peerNodeStatus.isPublicInvalidVersion() ||
peerNodeStatus.isPublicReverseInvalidVersion()) {
+ peerRow.addChild("td", "class",
"peer-version").addChild("span", "class", "peer_version_problem",
advancedEnabled ? peerNodeStatus.getVersion() :
peerNodeStatus.getSimpleVersion());
} else {
peerRow.addChild("td", "class",
"peer-version").addChild("#", advancedEnabled ? peerNodeStatus.getVersion() :
peerNodeStatus.getSimpleVersion());
}
@@ -332,8 +331,8 @@
peerRow.addChild("td", "class",
"peer-location", String.valueOf(peerNodeStatus.getLocation()));
}
- // backoff column
if (advancedEnabled) {
+ // backoff column
HTMLNode backoffCell =
peerRow.addChild("td", "class", "peer-backoff");
backoffCell.addChild("#",
fix1.format(peerNodeStatus.getBackedOffPercent()));
int backoff = (int)
(Math.max(peerNodeStatus.getRoutingBackedOffUntil() - now, 0));
@@ -344,13 +343,14 @@
backoffCell.addChild("#", " " +
String.valueOf(backoff / 1000) + "/" +
String.valueOf(peerNodeStatus.getRoutingBackoffLength() / 1000));
backoffCell.addChild("#",
(peerNodeStatus.getLastBackoffReason() == null) ? "" : ("/" +
(peerNodeStatus.getLastBackoffReason())));
+ // overload probability column
HTMLNode pRejectCell =
peerRow.addChild("td", "class", "peer-backoff"); // FIXME
pRejectCell.addChild("#",
fix1.format(peerNodeStatus.getPReject()));
}
// idle column
long idle =
peerNodeStatus.getTimeLastRoutable();
- if (peerNodeStatus.getStatusValue() ==
Node.PEER_NODE_STATUS_CONNECTED) {
+ if (peerNodeStatus.isRoutable()) {
idle =
peerNodeStatus.getTimeLastConnectionCompleted();
} else if (peerNodeStatus.getStatusValue() ==
Node.PEER_NODE_STATUS_NEVER_CONNECTED) {
idle =
peerNodeStatus.getPeerAddedTime();
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-08-13 16:54:56 UTC
(rev 10064)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-08-13 17:31:06 UTC
(rev 10065)
@@ -2325,6 +2325,7 @@
*/
public synchronized boolean shouldDisconnectNow() {
// TODO: We should disconnect here if "protocol version
mismatch", maybe throwing an exception
+ // TODO: shouldDisconnectNow() is hopefully only called when
we're connected, otherwise we're breaking the meaning of
verifiedIncompable[Older|Newer]Version
verifiedIncompatibleOlderVersion = invalidVersion();
verifiedIncompatibleNewerVersion = reverseInvalidVersion();
if(verifiedIncompatibleNewerVersion ||
verifiedIncompatibleOlderVersion) return true;
Modified: trunk/freenet/src/freenet/node/PeerNodeStatus.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNodeStatus.java 2006-08-13 16:54:56 UTC
(rev 10064)
+++ trunk/freenet/src/freenet/node/PeerNodeStatus.java 2006-08-13 17:31:06 UTC
(rev 10065)
@@ -45,10 +45,14 @@
private final boolean connected;
+ private final boolean routable;
+
private final boolean isFetchingARK;
private final double averagePingTime;
+ private final boolean publicInvalidVersion;
+
private final boolean publicReverseInvalidVersion;
private final double backedOffPercent;
@@ -85,8 +89,10 @@
this.listening = peerNode.isListenOnly();
this.disabled = peerNode.isDisabled();
this.connected = peerNode.isConnected();
+ this.routable = peerNode.isRoutable();
this.isFetchingARK = peerNode.isFetchingARK();
this.averagePingTime = peerNode.averagePingTime();
+ this.publicInvalidVersion = peerNode.publicInvalidVersion();
this.publicReverseInvalidVersion =
peerNode.publicReverseInvalidVersion();
this.backedOffPercent =
peerNode.backedOffPercent.currentValue();
this.lastBackoffReason = peerNode.getLastBackoffReason();
@@ -149,6 +155,13 @@
}
/**
+ * @return the publicInvalidVersion
+ */
+ public boolean isPublicInvalidVersion() {
+ return publicInvalidVersion;
+ }
+
+ /**
* @return the publicReverseInvalidVersion
*/
public boolean isPublicReverseInvalidVersion() {
@@ -247,6 +260,13 @@
}
/**
+ * @return the routable
+ */
+ public boolean isRoutable() {
+ return routable;
+ }
+
+ /**
* @return the disabled
*/
public boolean isDisabled() {
