Author: zothar
Date: 2006-07-02 20:57:57 +0000 (Sun, 02 Jul 2006)
New Revision: 9434
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
Log:
Rename and move TextModeClientInterface.getPeer() to Node.getPeerNode()
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-07-02 20:48:39 UTC (rev
9433)
+++ trunk/freenet/src/freenet/node/Node.java 2006-07-02 20:57:57 UTC (rev
9434)
@@ -3315,6 +3315,7 @@
nextPeerManagerUserAlertStatsUpdateTime = now +
peerManagerUserAlertStatsUpdateInterval;
}
}
+
public PeerNode[] getPeerNodes() {
PeerManager pm = peers;
return pm.myPeers;
@@ -3323,6 +3324,27 @@
public void registerIPDetectorPlugin(FredPluginIPDetector detector) {
// FIXME do something
// TODO Auto-generated method stub
-
}
+
+ /**
+ * Return a peer of the node given its ip and port, name or identity,
as a String
+ */
+ public PeerNode getPeerNode(String nodeIdentifier) {
+ PeerNode[] pn = peers.myPeers;
+ for(int i=0;i<pn.length;i++)
+ {
+ Peer peer = pn[i].getDetectedPeer();
+ String nodeIpAndPort = "";
+ if(peer != null) {
+ nodeIpAndPort = peer.toString();
+ }
+ String name = pn[i].myName;
+ String identity = pn[i].getIdentityString();
+ if(identity.equals(nodeIdentifier) ||
nodeIpAndPort.equals(nodeIdentifier) || name.equals(nodeIdentifier))
+ {
+ return pn[i];
+ }
+ }
+ return null;
+ }
}
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-07-02
20:48:39 UTC (rev 9433)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-07-02
20:57:57 UTC (rev 9434)
@@ -648,7 +648,12 @@
out.flush();
return false;
}
- PeerNode pn = getPeer(nodeIdentifier);
+ PeerNode pn = n.getPeerNode(nodeIdentifier);
+ if(pn == null) {
+ out.write(("n.getPeerNode() failed to get peer details
for "+nodeIdentifier+"\r\n\r\n").getBytes());
+ out.flush();
+ return false;
+ }
pn.setListenOnly(true);
outsb.append("set ListenOnly suceeded for
"+nodeIdentifier+"\r\n");
} else if(uline.startsWith("UNSETPEERLISTENONLY:")) {
@@ -658,7 +663,12 @@
out.flush();
return false;
}
- PeerNode pn = getPeer(nodeIdentifier);
+ PeerNode pn = n.getPeerNode(nodeIdentifier);
+ if(pn == null) {
+ out.write(("n.getPeerNode() failed to get peer details
for "+nodeIdentifier+"\r\n\r\n").getBytes());
+ out.flush();
+ return false;
+ }
pn.setListenOnly(false);
outsb.append("unset ListenOnly suceeded for
"+nodeIdentifier+"\r\n");
} else if(uline.startsWith("HAVEPEER:")) {
@@ -689,9 +699,9 @@
out.flush();
return false;
}
- PeerNode pn = getPeer(nodeIdentifier);
+ PeerNode pn = n.getPeerNode(nodeIdentifier);
if(pn == null) {
- out.write(("getPeer() failed to get peer details for
"+nodeIdentifier+"\r\n\r\n").getBytes());
+ out.write(("n.getPeerNode() failed to get peer details
for "+nodeIdentifier+"\r\n\r\n").getBytes());
out.flush();
return false;
}
@@ -704,9 +714,9 @@
out.flush();
return false;
}
- PeerNode pn = getPeer(nodeIdentifier);
+ PeerNode pn = n.getPeerNode(nodeIdentifier);
if(pn == null) {
- out.write(("getPeer() failed to get peer details for
"+nodeIdentifier+"\r\n\r\n").getBytes());
+ out.write(("n.getPeerNode() failed to get peer details
for "+nodeIdentifier+"\r\n\r\n").getBytes());
out.flush();
return false;
}
@@ -886,28 +896,6 @@
System.out.println("Added peer: "+pn);
n.peers.writePeers();
}
-
- /**
- * Return a peer of the node given its ip and port, name or identity, as a
String
- */
- private PeerNode getPeer(String nodeIdentifier) {
- PeerNode[] pn = n.peers.myPeers;
- for(int i=0;i<pn.length;i++)
- {
- Peer peer = pn[i].getDetectedPeer();
- String nodeIpAndPort = "";
- if(peer != null) {
- nodeIpAndPort = peer.toString();
- }
- String name = pn[i].myName;
- String identity = pn[i].getIdentityString();
- if(identity.equals(nodeIdentifier) ||
nodeIpAndPort.equals(nodeIdentifier) || name.equals(nodeIdentifier))
- {
- return pn[i];
- }
- }
- return null;
- }
/**
* Disable connecting to a peer given its ip and port, name or
identity, as a String
