Author: toad
Date: 2008-01-15 16:49:45 +0000 (Tue, 15 Jan 2008)
New Revision: 17060
Modified:
trunk/freenet/src/freenet/node/DarknetPeerNode.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/OpennetPeerNode.java
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/PeerNodeStatus.java
trunk/freenet/src/freenet/node/SeedClientPeerNode.java
trunk/freenet/src/freenet/node/SeedServerPeerNode.java
Log:
isSearchable -> isRealConnection
Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-01-15 16:44:19 UTC
(rev 17059)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-01-15 16:49:45 UTC
(rev 17060)
@@ -1507,7 +1507,7 @@
// FIXME is there anything we should do?
}
- public boolean isSearchable() {
+ public boolean isRealConnection() {
return true;
}
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-01-15 16:44:19 UTC
(rev 17059)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-01-15 16:49:45 UTC
(rev 17060)
@@ -91,17 +91,17 @@
} else if(spec == DMT.nodeToNodeMessage) {
node.receivedNodeToNodeMessage(m, source);
return true;
- } else if(spec == DMT.UOMAnnounce && source.isSearchable()) {
+ } else if(spec == DMT.UOMAnnounce && source.isRealConnection())
{
return node.nodeUpdater.uom.handleAnnounce(m, source);
- } else if(spec == DMT.UOMRequestRevocation &&
source.isSearchable()) {
+ } else if(spec == DMT.UOMRequestRevocation &&
source.isRealConnection()) {
return node.nodeUpdater.uom.handleRequestRevocation(m,
source);
- } else if(spec == DMT.UOMSendingRevocation &&
source.isSearchable()) {
+ } else if(spec == DMT.UOMSendingRevocation &&
source.isRealConnection()) {
return node.nodeUpdater.uom.handleSendingRevocation(m,
source);
- } else if(spec == DMT.UOMRequestMain && source.isSearchable()) {
+ } else if(spec == DMT.UOMRequestMain &&
source.isRealConnection()) {
return node.nodeUpdater.uom.handleRequestMain(m,
source);
- } else if(spec == DMT.UOMSendingMain && source.isSearchable()) {
+ } else if(spec == DMT.UOMSendingMain &&
source.isRealConnection()) {
return node.nodeUpdater.uom.handleSendingMain(m,
source);
- } else if(spec == DMT.FNPOpennetAnnounceRequest &&
source.isSearchable()) {
+ } else if(spec == DMT.FNPOpennetAnnounceRequest &&
source.isRealConnection()) {
return handleAnnounceRequest(m, source);
} else if(spec == DMT.FNPRoutingStatus) {
if(source instanceof DarknetPeerNode) {
Modified: trunk/freenet/src/freenet/node/OpennetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetPeerNode.java 2008-01-15 16:44:19 UTC
(rev 17059)
+++ trunk/freenet/src/freenet/node/OpennetPeerNode.java 2008-01-15 16:49:45 UTC
(rev 17060)
@@ -77,7 +77,7 @@
return true;
}
- public boolean isSearchable() {
+ public boolean isRealConnection() {
return true;
}
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2008-01-15 16:44:19 UTC
(rev 17059)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2008-01-15 16:49:45 UTC
(rev 17060)
@@ -416,7 +416,7 @@
*/
public PeerNode getByPeer(Peer peer) {
for(int i=0;i<myPeers.length;i++) {
- if(!myPeers[i].isSearchable())
+ if(!myPeers[i].isRealConnection())
continue;
if(peer.equals(myPeers[i].getPeer()))
return myPeers[i];
@@ -1424,7 +1424,7 @@
for(int i=0;i<peers.length;i++) {
if(peers[i] == pn) continue;
if(!peers[i].isConnected()) continue;
- if(!peers[i].isSearchable()) continue; // Ignore
non-searchable peers i.e. bootstrapping peers
+ if(!peers[i].isRealConnection()) continue; // Ignore
non-searchable peers i.e. bootstrapping peers
if(peers[i].getPeer().getFreenetAddress().equals(addr))
return true;
}
return false;
@@ -1493,7 +1493,7 @@
PeerNode[] peers = myPeers;
int count = 0;
for(int i=0;i<peers.length;i++) {
- if(!peers[i].isSearchable()) continue;
+ if(!peers[i].isRealConnection()) continue;
if(peers[i].isDisabled()) continue;
count++;
}
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-01-15 16:44:19 UTC
(rev 17059)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-01-15 16:49:45 UTC
(rev 17060)
@@ -3407,8 +3407,9 @@
return timeLastDisconnect;
}
- /** Does this peernode want to be returned by for example
PeerManager.getByPeer() ? */
- public abstract boolean isSearchable();
+ /** Does this peernode want to be returned by for example
PeerManager.getByPeer() ?
+ * False = seednode etc, never going to be routable. */
+ public abstract boolean isRealConnection();
/** Can we accept announcements from this node? */
public boolean canAcceptAnnouncements() {
Modified: trunk/freenet/src/freenet/node/PeerNodeStatus.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNodeStatus.java 2008-01-15 16:44:19 UTC
(rev 17059)
+++ trunk/freenet/src/freenet/node/PeerNodeStatus.java 2008-01-15 16:49:45 UTC
(rev 17060)
@@ -134,7 +134,7 @@
this.recordStatus = peerNode.recordStatus();
this.isSeedClient = peerNode instanceof SeedClientPeerNode;
this.isSeedServer = peerNode instanceof SeedServerPeerNode;
- this.isSearchable = peerNode.isSearchable();
+ this.isSearchable = peerNode.isRealConnection();
}
/**
Modified: trunk/freenet/src/freenet/node/SeedClientPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/SeedClientPeerNode.java 2008-01-15
16:44:19 UTC (rev 17059)
+++ trunk/freenet/src/freenet/node/SeedClientPeerNode.java 2008-01-15
16:49:45 UTC (rev 17060)
@@ -29,7 +29,7 @@
return false; // Not exactly
}
- public boolean isSearchable() {
+ public boolean isRealConnection() {
return false; // We may be connected to the same node as a seed
and as a regular connection.
}
Modified: trunk/freenet/src/freenet/node/SeedServerPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/SeedServerPeerNode.java 2008-01-15
16:44:19 UTC (rev 17059)
+++ trunk/freenet/src/freenet/node/SeedServerPeerNode.java 2008-01-15
16:49:45 UTC (rev 17060)
@@ -34,7 +34,7 @@
return false;
}
- public boolean isSearchable() {
+ public boolean isRealConnection() {
return false;
}
