Author: nextgens
Date: 2006-07-08 20:25:22 +0000 (Sat, 08 Jul 2006)
New Revision: 9514
Modified:
trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
trunk/freenet/src/freenet/io/comm/DummyPeerContext.java
trunk/freenet/src/freenet/io/comm/PeerContext.java
trunk/freenet/src/freenet/node/CHKInsertSender.java
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
trunk/freenet/src/freenet/node/InsertHandler.java
trunk/freenet/src/freenet/node/KeyTracker.java
trunk/freenet/src/freenet/node/LocationManager.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/Version.java
Log:
Revert my patch ... to ease the debugging of the load-limiting code
Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2006-07-08
20:00:29 UTC (rev 9513)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2006-07-08
20:25:22 UTC (rev 9514)
@@ -164,7 +164,7 @@
buf.append("PeerNode.hashCode
'"+request.getParam("hashcode")+"' not found.<br /><br />\n");
buf.append("</div>");
buf.append("</div>");
- } else if(!pn.isConnected()) {
+ } else if(!pn.isConnected() &&
!pn.isVerifiedIncompatibleNewerVersion() &&
!pn.isVerifiedIncompatibleOlderVersion()) {
ctx.getPageMaker().makeHead(buf, "Node To
Node Text Message Failed");
buf.append("<div class=\"infobox
infobox-error\">");
Modified: trunk/freenet/src/freenet/io/comm/DummyPeerContext.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/DummyPeerContext.java 2006-07-08
20:00:29 UTC (rev 9513)
+++ trunk/freenet/src/freenet/io/comm/DummyPeerContext.java 2006-07-08
20:25:22 UTC (rev 9514)
@@ -22,11 +22,8 @@
// Do nothing
}
- public boolean isReallyConnected() {
- return false;
- }
-
public boolean isConnected() {
return false;
}
+
}
Modified: trunk/freenet/src/freenet/io/comm/PeerContext.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/PeerContext.java 2006-07-08 20:00:29 UTC
(rev 9513)
+++ trunk/freenet/src/freenet/io/comm/PeerContext.java 2006-07-08 20:25:22 UTC
(rev 9514)
@@ -13,9 +13,6 @@
/** Force the peer to disconnect */
void forceDisconnect();
- /** Is the peer connected? Have we established the session link? */
+ /** Is the peer connected? If we can't tell, return true. */
boolean isConnected();
-
- /** Is the peer connected? are we able to route requests to it? */
- boolean isReallyConnected();
}
Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2006-07-08 20:00:29 UTC
(rev 9513)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2006-07-08 20:25:22 UTC
(rev 9514)
@@ -645,7 +645,7 @@
MessageFilter mf = null;
for(int i=0;i<waiters.length;i++) {
AwaitingCompletion awc = waiters[i];
- if(!awc.pn.isReallyConnected()) {
+ if(!awc.pn.isConnected()) {
Logger.normal(this, "Disconnected:
"+awc.pn+" in "+CHKInsertSender.this);
continue;
}
@@ -677,7 +677,7 @@
}
if(noTimeLeft) {
for(int
i=0;i<waiters.length;i++) {
-
if(!waiters[i].pn.isReallyConnected()) continue;
+
if(!waiters[i].pn.isConnected()) continue;
if(!waiters[i].completedTransfer) {
waiters[i].completedTransfer(false);
}
@@ -744,7 +744,7 @@
if(noTimeLeft) {
Logger.minor(this, "Overall
timeout on "+CHKInsertSender.this);
for(int
i=0;i<waiters.length;i++) {
-
if(!waiters[i].pn.isReallyConnected()) continue;
+
if(!waiters[i].pn.isConnected()) continue;
if(!waiters[i].receivedCompletionNotice)
waiters[i].completed(false, false);
if(!waiters[i].completedTransfer)
@@ -769,7 +769,7 @@
boolean completedTransfers = true;
synchronized(nodesWaitingForCompletion) {
for(int i=0;i<waiters.length;i++) {
- if(!waiters[i].pn.isReallyConnected())
continue;
+ if(!waiters[i].pn.isConnected())
continue;
if(!waiters[i].completedTransfer) {
completedTransfers = false;
break;
@@ -785,7 +785,7 @@
}
completedTransfers = true;
for(int
i=0;i<waiters.length;i++) {
-
if(!waiters[i].pn.isReallyConnected()) continue;
+
if(!waiters[i].pn.isConnected()) continue;
if(!waiters[i].completedTransfer) {
completedTransfers = false;
break;
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-07-08
20:00:29 UTC (rev 9513)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-07-08
20:25:22 UTC (rev 9514)
@@ -126,7 +126,7 @@
if(tryProcessAuth(buf, offset, length, pn, peer)) return;
}
}
- if(opn != null && !opn.isReallyConnected())
+ if(opn != null && !opn.isConnected())
Logger.minor(this,"Unmatchable packet from "+peer);
else
Logger.error(this,"Unmatchable packet from "+peer);
@@ -1126,7 +1126,7 @@
else log += (""+callbacks.length+(callbacks.length >= 1 ?
String.valueOf(callbacks[0]) : ""));
Logger.minor(this, log);
}
- if(tracker == null || (!tracker.pn.isReallyConnected())) {
+ if(tracker == null || (!tracker.pn.isConnected())) {
throw new NotConnectedException();
}
@@ -1398,11 +1398,6 @@
public boolean isDisconnected(PeerContext context) {
if(context == null) return false;
- return !((PeerNode)context).isReallyConnected();
+ return !((PeerNode)context).isConnected();
}
-
- public boolean isRestricted(PeerContext context) {
- if(context == null) return false;
- return (!((PeerNode)context).isReallyConnected() &&
((PeerNode)context).isConnected());
- }
}
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2006-07-08
20:00:29 UTC (rev 9513)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2006-07-08
20:25:22 UTC (rev 9514)
@@ -153,7 +153,7 @@
// Unique IP address?
Peer peer = p.getPeer();
InetAddress addr =
peer.getAddress(false);
- if(p.isReallyConnected() &&
peer != null && addr != null && IPUtil.checkAddress(peer.getAddress())) {
+ if(p.isConnected() && peer !=
null && addr != null && IPUtil.checkAddress(peer.getAddress())) {
// Connected node, on a
real internet IP address.
// Is it internal?
boolean internal =
false;
@@ -250,7 +250,7 @@
if(firstTimeMaybeFakePeers > 0)
timeref = firstTimeMaybeFakePeers;
for(int i=0;i<peers.length;i++)
{
PeerNode p = peers[i];
-
if((!p.isReallyConnected()) || now - p.lastReceivedPacketTime() < 5*60*1000) {
+ if((!p.isConnected())
|| now - p.lastReceivedPacketTime() < 5*60*1000) {
// Not
connected now but has been within the past 5 minutes.
count++;
}
Modified: trunk/freenet/src/freenet/node/InsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertHandler.java 2006-07-08 20:00:29 UTC
(rev 9513)
+++ trunk/freenet/src/freenet/node/InsertHandler.java 2006-07-08 20:25:22 UTC
(rev 9514)
@@ -103,7 +103,7 @@
if(msg == null) {
try {
- if(source.isReallyConnected() && startTime >
(source.timeLastConnected()+Node.HANDSHAKE_TIMEOUT*4))
+ if(source.isConnected() && startTime >
(source.timeLastConnected()+Node.HANDSHAKE_TIMEOUT*4))
Logger.error(this, "Did not receive DataInsert
on "+uid+" from "+source+" !");
Message tooSlow = DMT.createFNPRejectedTimeout(uid);
source.sendAsync(tooSlow, null, 0, null);
Modified: trunk/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyTracker.java 2006-07-08 20:00:29 UTC
(rev 9513)
+++ trunk/freenet/src/freenet/node/KeyTracker.java 2006-07-08 20:25:22 UTC
(rev 9514)
@@ -634,7 +634,7 @@
*/
public int allocateOutgoingPacketNumber() throws KeyChangedException,
NotConnectedException {
int packetNumber;
- if(!pn.isReallyConnected()) throw new NotConnectedException();
+ if(!pn.isConnected()) throw new NotConnectedException();
synchronized(this) {
if(isDeprecated) throw new KeyChangedException();
packetNumber = nextPacketNumber++;
@@ -658,7 +658,7 @@
*/
public int allocateOutgoingPacketNumberNeverBlock() throws
KeyChangedException, NotConnectedException, WouldBlockException {
int packetNumber;
- if(!pn.isReallyConnected()) throw new NotConnectedException();
+ if(!pn.isConnected()) throw new NotConnectedException();
synchronized(this) {
packetNumber = nextPacketNumber;
if(isDeprecated) throw new KeyChangedException();
Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2006-07-08 20:00:29 UTC
(rev 9513)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2006-07-08 20:25:22 UTC
(rev 9514)
@@ -124,7 +124,7 @@
PeerNode[] peers = node.peers.connectedPeers;
for(int i=0;i<peers.length;i++) {
PeerNode pn = peers[i];
- if(pn.isReallyConnected()) {
+ if(pn.isConnected()) {
double ploc =
pn.getLocation().getValue();
if(ploc == myLoc) {
myFlag = true;
@@ -386,7 +386,7 @@
}
if(reply == null) {
- if(pn.isReallyConnected() && System.currentTimeMillis() -
pn.timeLastConnected() > TIMEOUT*2) {
+ if(pn.isConnected() && System.currentTimeMillis() -
pn.timeLastConnected() > TIMEOUT*2) {
// Timed out! Abort...
Logger.error(this, "Timed out waiting for
SwapRejected/SwapReply on "+uid);
}
@@ -421,7 +421,7 @@
}
if(reply == null) {
- if(pn.isReallyConnected() && System.currentTimeMillis() -
pn.timeLastConnected() > TIMEOUT*2) {
+ if(pn.isConnected() && System.currentTimeMillis() -
pn.timeLastConnected() > TIMEOUT*2) {
// Hrrrm!
Logger.error(this, "Timed out waiting for SwapComplete
- malicious node?? on "+uid);
}
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2006-07-08 20:00:29 UTC
(rev 9513)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2006-07-08 20:25:22 UTC
(rev 9514)
@@ -50,32 +50,7 @@
Logger.minor(this, "Lost connection replying to "+m);
}
return true;
- }else if(spec == DMT.FNPLinkPing) {
- long id = m.getLong(DMT.PING_SEQNO);
- Message msg = DMT.createFNPLinkPong(id);
- try {
- source.sendAsync(msg, null, 0, null);
- } catch (NotConnectedException e) {
- // Ignore
- }
- return true;
- } else if(spec == DMT.FNPLinkPong) {
- long id = m.getLong(DMT.PING_SEQNO);
- source.receivedLinkPong(id);
- return true;
- } else if(spec == DMT.FNPDetectedIPAddress) {
- Peer p = (Peer) m.getObject(DMT.EXTERNAL_ADDRESS);
- source.setRemoteDetectedPeer(p);
- node.redetectAddress();
- } else if(spec == DMT.FNPVoid) {
- return true;
- } else if(spec == DMT.nodeToNodeTextMessage) {
- node.receivedNodeToNodeTextMessage(m);
- return true;
}
-
- if(!source.isReallyConnected()) return false;
-
if(spec == DMT.FNPLocChangeNotification) {
double newLoc = m.getDouble(DMT.LOCATION);
source.updateLocation(newLoc);
@@ -104,7 +79,29 @@
return handleInsertRequest(m, false);
} else if(spec == DMT.FNPSSKInsertRequest) {
return handleInsertRequest(m, true);
- }
+ } else if(spec == DMT.FNPLinkPing) {
+ long id = m.getLong(DMT.PING_SEQNO);
+ Message msg = DMT.createFNPLinkPong(id);
+ try {
+ source.sendAsync(msg, null, 0, null);
+ } catch (NotConnectedException e) {
+ // Ignore
+ }
+ return true;
+ } else if(spec == DMT.FNPLinkPong) {
+ long id = m.getLong(DMT.PING_SEQNO);
+ source.receivedLinkPong(id);
+ return true;
+ } else if(spec == DMT.FNPDetectedIPAddress) {
+ Peer p = (Peer) m.getObject(DMT.EXTERNAL_ADDRESS);
+ source.setRemoteDetectedPeer(p);
+ node.redetectAddress();
+ } else if(spec == DMT.FNPVoid) {
+ return true;
+ } else if(spec == DMT.nodeToNodeTextMessage) {
+ node.receivedNodeToNodeTextMessage(m);
+ return true;
+ }
return false;
}
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2006-07-08 20:00:29 UTC
(rev 9513)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2006-07-08 20:25:22 UTC
(rev 9514)
@@ -180,7 +180,7 @@
}
public void addConnectedPeer(PeerNode pn) {
- if(!pn.isReallyConnected()) {
+ if(!pn.isConnected()) {
Logger.minor(this, "Not connected: "+pn);
return;
}
@@ -272,7 +272,7 @@
locs = new double[connectedPeers.length];
int x = 0;
for(int i=0;i<conns.length;i++) {
- if(conns[i].isReallyConnected())
+ if(conns[i].isConnected())
locs[x++] = conns[i].getLocation().getValue();
}
// Wipe out any information contained in the order
@@ -294,7 +294,7 @@
for(int i=0;i<5;i++) {
PeerNode pn =
connectedPeers[node.random.nextInt(connectedPeers.length)];
if(pn == exclude) continue;
- if(pn.isReallyConnected()) return pn;
+ if(pn.isConnected()) return pn;
}
// None of them worked
// Move the un-connected ones out
@@ -304,14 +304,14 @@
for(int i=0;i<myPeers.length;i++) {
PeerNode pn = myPeers[i];
if(pn == exclude) continue;
- if(pn.isReallyConnected()) {
+ if(pn.isConnected()) {
v.add(pn);
} else {
Logger.minor(this, "Excluding "+pn+" because is disconnected");
}
}
int lengthWithoutExcluded = v.size();
- if(exclude != null && exclude.isReallyConnected())
+ if(exclude != null && exclude.isConnected())
v.add(exclude);
PeerNode[] newConnectedPeers = new PeerNode[v.size()];
newConnectedPeers = (PeerNode[]) v.toArray(newConnectedPeers);
@@ -348,7 +348,7 @@
PeerNode best = null;
for(int i=0;i<peers.length;i++) {
PeerNode p = peers[i];
- if(!p.isReallyConnected()) continue;
+ if(!p.isConnected()) continue;
double diff = distance(p, loc);
if(diff < bestDiff) {
best = p;
@@ -423,7 +423,7 @@
Logger.minor(this, "Skipping (req came from): "+p.getPeer());
continue;
}
- if(!p.isReallyConnected()) {
+ if(!p.isConnected()) {
Logger.minor(this, "Skipping (not connected): "+p.getPeer());
continue;
}
@@ -580,7 +580,7 @@
public boolean anyConnectedPeers() {
PeerNode[] conns = connectedPeers;
for(int i=0;i<conns.length;i++) {
- if(conns[i].isReallyConnected()) return true;
+ if(conns[i].isConnected()) return true;
}
return false;
}
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-07-08 20:00:29 UTC
(rev 9513)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-07-08 20:25:22 UTC
(rev 9514)
@@ -680,18 +680,9 @@
* Note possible deadlocks! PeerManager calls this, we call
* PeerManager in e.g. verified.
*/
- public boolean isReallyConnected() {
+ public boolean isConnected() {
return isConnected;
}
-
- /**
- * the node has established the session link : doesn't mean we can route
to it!
- * check isReallyConnected() insteed.
- */
- public boolean isConnected() {
- // maybe we should check the protocol versions too
- return (isConnected || (hasCompletedHandshake() &&
(isVerifiedIncompatibleNewerVersion() ||
isVerifiedIncompatibleOlderVersion())));
- }
/**
* Send a message, off-thread, to this node.
@@ -703,7 +694,7 @@
*/
public void sendAsync(Message msg, AsyncMessageCallback cb, int
alreadyReportedBytes, ByteCounter ctr) throws NotConnectedException {
Logger.minor(this, "Sending async: "+msg+" : "+cb+" on "+this);
- if(!isConnected()) throw new NotConnectedException();
+ if(!isConnected) throw new NotConnectedException();
MessageItem item = new MessageItem(msg, cb == null ? null : new
AsyncMessageCallback[] {cb}, alreadyReportedBytes, ctr);
synchronized(routingBackoffSync) {
reportBackoffStatus(System.currentTimeMillis());
@@ -741,7 +732,6 @@
synchronized(this) {
// Force renegotiation.
isConnected = false;
- completedHandshake = false;
setPeerNodeStatus(now);
// Prevent sending packets to the node until that happens.
if(currentTracker != null)
@@ -1123,20 +1113,24 @@
Logger.normal(this, "Not connecting to "+this+" -
reverse invalid version "+Version.getVersionString()+" for peer's
lastGoodversion: "+lastGoodVersion);
verifiedIncompatibleNewerVersion = true;
isConnected = false;
+ setPeerNodeStatus(now);
+ node.peers.disconnected(this);
+ return false;
} else {
- verifiedIncompatibleNewerVersion = false;
+ verifiedIncompatibleNewerVersion = false;
+ setPeerNodeStatus(now);
}
-
-
if(invalidVersion()) {
Logger.normal(this, "Not connecting to "+this+" -
invalid version "+version);
verifiedIncompatibleOlderVersion = true;
isConnected = false;
+ setPeerNodeStatus(now);
+ node.peers.disconnected(this);
+ return false;
} else {
verifiedIncompatibleOlderVersion = false;
+ setPeerNodeStatus(now);
}
- setPeerNodeStatus(now);
-
KeyTracker newTracker = new KeyTracker(this, encCipher, encKey);
changedIP(replyTo);
if(thisBootID != this.bootID) {
@@ -1170,12 +1164,13 @@
unverifiedTracker = null;
if(previousTracker != null)
previousTracker.deprecated();
+ isConnected = true;
neverConnected = false;
peerAddedTime = 0; // don't store anymore
setPeerNodeStatus(now);
ctx = null;
}
- if(!isConnected())
+ if(!isConnected)
node.peers.disconnected(this);
Logger.normal(this, "Completed handshake with "+this+" on
"+replyTo+" - current: "+currentTracker+" old: "+previousTracker+" unverified:
"+unverifiedTracker+" bootID: "+thisBootID+" myName: "+myName);
try {
@@ -1201,8 +1196,7 @@
else return;
if(unverifiedTracker != null) return;
}
- if(isReallyConnected())
- sendInitialMessages();
+ sendInitialMessages();
}
/**
@@ -1213,7 +1207,7 @@
Message ipMsg = DMT.createFNPDetectedIPAddress(detectedPeer);
try {
- sendAsync(locMsg, null, 0, null);
+ sendAsync(locMsg, null, 0, null);
sendAsync(ipMsg, null, 0, null);
} catch (NotConnectedException e) {
Logger.error(this, "Completed handshake with "+getPeer()+" but
disconnected!!!", new Exception("error"));
@@ -1459,16 +1453,8 @@
}
public String getStatus() {
- String status;
- if(isReallyConnected())
- status = new String("CONNECTED");
- else if(isConnected())
- status = new String("INCOMPATIBLE");
- else
- status = new String("DISCONNECTED");
-
return
- status + " " + getPeer()+" "+myName+"
"+currentLocation.getValue()+" "+getVersion()+" backoff:
"+routingBackoffLength+" ("+(Math.max(routingBackedOffUntil -
System.currentTimeMillis(),0))+")";
+ (isConnected ? "CONNECTED " : "DISCONNECTED") + " " +
getPeer()+" "+myName+" "+currentLocation.getValue()+" "+getVersion()+" backoff:
"+routingBackoffLength+" ("+(Math.max(routingBackedOffUntil -
System.currentTimeMillis(),0))+")";
}
public String getTMCIPeerInfo() {
@@ -1788,8 +1774,7 @@
pingAverage.report(now - startTime);
Logger.minor(this, "Reporting ping time to "+this+" :
"+(now - startTime));
}
-
- if(isReallyConnected() && verifiedIncompatibleOlderVersion)
+ if(verifiedIncompatibleOlderVersion)
forceDisconnect();
}
@@ -2067,7 +2052,6 @@
* This will return true if our lastGoodBuild has changed due to a
timed mandatory.
*/
public synchronized boolean shouldDisconnectNow() {
- if(!isReallyConnected()) return false;
verifiedIncompatibleOlderVersion = invalidVersion();
return verifiedIncompatibleOlderVersion;
}
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-07-08 20:00:29 UTC (rev
9513)
+++ trunk/freenet/src/freenet/node/Version.java 2006-07-08 20:25:22 UTC (rev
9514)
@@ -18,7 +18,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 866;
+ private static final int buildNumber = 867;
/** Oldest build of Fred we will talk to */
private static final int oldLastGoodBuild = 844;
