Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv13876/src/freenet
Modified Files:
OpenConnectionManager.java Version.java
Log Message:
6266:
FORK UNSTABLE NETWORK. Protocol version increases to 1.47. The purpose of this: it is
likely that NGRouting and CPAlgoRT are not really compatible in their present
implementations. Hopefully we can get a decent sized test network together.
Minor changes:
Don't reference old nodes in the RT. Take them out if they are serialized in. Add a
means of checking whether it is old for purposes of routing to or for purposes of
accepting requests from it.
Try to keep the references on the RT up to date.
Detect Opera as well as IE.
Minor fix in TimeEstimator.drawGraphBMP()
Added diagnostic requestDataNotFound.
Fix load %.
Fix CHK for README in dist servlet.
Minor UI tweak to General infolet.
Minor graphical change (add a stretched graph per estimator) to per node pages linked
from Node Reference Status.
Index: OpenConnectionManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/OpenConnectionManager.java,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -w -r1.140 -r1.141
--- OpenConnectionManager.java 22 Oct 2003 12:32:06 -0000 1.140
+++ OpenConnectionManager.java 22 Oct 2003 22:07:12 -0000 1.141
@@ -247,6 +247,14 @@
KillSurplusConnections();
}
+ public void updateReference(NodeReference ref) {
+ if(ref == null) return;
+ synchronized(peerHandlers) {
+ PeerHandler ph =
(PeerHandler)(peerHandlers.get(ref.getIdentity()));
+ if(ph != null) ph.updateReference(ref);
+ }
+ }
+
public PeerHandler makePeerHandler(Identity i, NodeReference ref) {
synchronized(peerHandlers) {
PeerHandler ph = (PeerHandler)(peerHandlers.get(i));
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.458
retrieving revision 1.459
diff -u -w -r1.458 -r1.459
--- Version.java 22 Oct 2003 10:45:59 -0000 1.458
+++ Version.java 22 Oct 2003 22:07:12 -0000 1.459
@@ -15,10 +15,10 @@
public static final String nodeVersion = "0.6";
/** The protocolversion supported */
- public static String protocolVersion = "1.46";
+ public static String protocolVersion = "1.47";
/** The build number of the current revision */
- public static final int buildNumber = 6265;
+ public static final int buildNumber = 6266;
// 6028: may 3; ARK retrieval fix
public static final int ignoreBuildsAfter = 6500;
@@ -56,11 +56,18 @@
return Fields.commaList(getVersion());
}
+ public static final boolean checkGoodVersion(String version) {
+ return checkGoodVersion(version, false);
+ }
+
/**
* @return true if requests should be accepted from nodes
* brandishing this version string
+ * @param reference if true, this is for purposes of referencing,
+ * if false, it is for purposes of accepting inbound requests
*/
- public static final boolean checkGoodVersion(String version) {
+ public static final boolean checkGoodVersion(String version,
+ boolean reference) {
String[] v = Fields.commaList(version);
if (v.length < 3 || !v[2].equals(protocolVersion)) {
return false;
@@ -76,6 +83,9 @@
return false;
}
}
+ // Don't reference 0.5 nodes, only accept requests from them
+ if(reference && v[1].equals("0.5")) // FIXME!
+ return false;
return true;
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
