Author: nextgens
Date: 2006-01-18 00:45:46 +0000 (Wed, 18 Jan 2006)
New Revision: 7871
Modified:
trunk/freenet/src/freenet/io/comm/DummyPeerContext.java
trunk/freenet/src/freenet/io/comm/Peer.java
trunk/freenet/src/freenet/io/comm/PeerContext.java
trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
trunk/freenet/src/freenet/node/CHKInsertSender.java
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/KeyTracker.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/NodePinger.java
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/SSKInsertSender.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/Version.java
Log:
reverting changes
Modified: trunk/freenet/src/freenet/io/comm/DummyPeerContext.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/DummyPeerContext.java 2006-01-18
00:01:15 UTC (rev 7870)
+++ trunk/freenet/src/freenet/io/comm/DummyPeerContext.java 2006-01-18
00:45:46 UTC (rev 7871)
@@ -10,7 +10,7 @@
private final Peer peer;
- public Peer getDetectedPeer() {
+ public Peer getPeer() {
return peer;
}
Modified: trunk/freenet/src/freenet/io/comm/Peer.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Peer.java 2006-01-18 00:01:15 UTC (rev
7870)
+++ trunk/freenet/src/freenet/io/comm/Peer.java 2006-01-18 00:45:46 UTC (rev
7871)
@@ -35,7 +35,6 @@
public static final String VERSION = "$Id: Peer.java,v 1.4 2005/08/25
17:28:19 amphibian Exp $";
private final InetAddress _address;
- private final InetAddress _nominal_address;
private final int _port;
// Create a null peer
@@ -48,13 +47,11 @@
dis.readFully(ba);
_address = InetAddress.getByAddress(ba);
_port = dis.readInt();
- _nominal_address=_address;
}
public Peer(InetAddress address, int port) {
_address = address;
_port = port;
- _nominal_address=_address;
}
/**
@@ -75,34 +72,7 @@
} catch (NumberFormatException e) {
throw new PeerParseException(e);
}
- _nominal_address=_address;
}
-
- /**
- * @param physicaln,hostname
- */
- public Peer(String physical, String hostname) throws PeerParseException {
- int offset = physical.lastIndexOf(':'); // ipv6
- if(offset < 0) throw new PeerParseException();
- String before = physical.substring(0, offset);
- String after = physical.substring(offset+1);
- try {
- _address = InetAddress.getByName(before);
- } catch (UnknownHostException e) {
- throw new PeerParseException(e);
- }
- try {
- _port = Integer.parseInt(after);
- } catch (NumberFormatException e) {
- throw new PeerParseException(e);
- }
-
- try {
- _nominal_address = InetAddress.getByName(hostname);
- } catch (UnknownHostException e) {
- throw new PeerParseException(e);
- }
- }
public boolean isNull() {
return _port == 0;
@@ -124,21 +94,13 @@
if (!_address.equals(peer._address)) {
return false;
}
-
- if (!_nominal_address.equals(peer._nominal_address)) {
- return false;
- }
return true;
}
public InetAddress getAddress() {
return _address;
}
-
- public InetAddress getHostname() {
- return _nominal_address;
- }
-
+
public int hashCode() {
return _address.hashCode() + _port;
}
Modified: trunk/freenet/src/freenet/io/comm/PeerContext.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/PeerContext.java 2006-01-18 00:01:15 UTC
(rev 7870)
+++ trunk/freenet/src/freenet/io/comm/PeerContext.java 2006-01-18 00:45:46 UTC
(rev 7871)
@@ -8,7 +8,7 @@
*/
public interface PeerContext {
// Largely opaque interface for now
- Peer getDetectedPeer();
+ Peer getPeer();
/** Force the peer to disconnect */
void forceDisconnect();
Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2006-01-18
00:01:15 UTC (rev 7870)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2006-01-18
00:45:46 UTC (rev 7871)
@@ -104,7 +104,7 @@
Logger.error(this, "Aborted during setup");
// Will throw on running
}
- throttle =
PacketThrottle.getThrottle(_destination.getDetectedPeer(), _prb._packetSize);
+ throttle = PacketThrottle.getThrottle(_destination.getPeer(),
_prb._packetSize);
_senderThread = new Thread("_senderThread for "+_uid) {
public void run() {
Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2006-01-18 00:01:15 UTC
(rev 7870)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2006-01-18 00:45:46 UTC
(rev 7871)
@@ -43,7 +43,7 @@
this.pn = pn;
bt = new BlockTransmitter(node.usm, pn, uid, prb);
Sender s = new Sender(this);
- Thread senderThread = new Thread(s, "Sender for "+uid+" to
"+pn.getDetectedPeer());
+ Thread senderThread = new Thread(s, "Sender for "+uid+" to
"+pn.getPeer());
senderThread.setDaemon(true);
senderThread.start();
}
@@ -637,7 +637,7 @@
mf = m;
else
mf = m.or(mf);
- Logger.minor(this, "Waiting for
"+awc.pn.getDetectedPeer());
+ Logger.minor(this, "Waiting for
"+awc.pn.getPeer());
}
}
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-01-18
00:01:15 UTC (rev 7870)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-01-18
00:45:46 UTC (rev 7871)
@@ -941,7 +941,7 @@
* @throws WouldBlockException
*/
public void processOutgoing(byte[] buf, int offset, int length,
PeerContext peer) throws NotConnectedException, PacketSequenceException,
WouldBlockException {
- Logger.minor(this, "processOutgoing(buf, "+offset+", "+length+",
"+peer.getDetectedPeer());
+ Logger.minor(this, "processOutgoing(buf, "+offset+", "+length+",
"+peer.getPeer());
if(!(peer instanceof PeerNode))
throw new IllegalArgumentException();
PeerNode pn = (PeerNode)peer;
@@ -981,7 +981,7 @@
void processOutgoingPreformatted(byte[] buf, int offset, int length,
PeerNode peer, int k, AsyncMessageCallback[] callbacks) throws
NotConnectedException, PacketSequenceException, WouldBlockException {
while(true) {
try {
- Logger.minor(this, "At beginning of processOutgoingPreformatted
loop for "+peer.getDetectedPeer());
+ Logger.minor(this, "At beginning of processOutgoingPreformatted
loop for "+peer.getPeer());
KeyTracker tracker = peer.getCurrentKeyTracker();
if(tracker == null) {
Logger.normal(this, "Dropping packet: Not connected yet");
@@ -1092,7 +1092,7 @@
seqNumber =
tracker.allocateOutgoingPacketNumberNeverBlock();
}
- Logger.minor(this, "Sequence number (sending): "+seqNumber+"
("+packetNumber+") to "+tracker.pn.getDetectedPeer());
+ Logger.minor(this, "Sequence number (sending): "+seqNumber+"
("+packetNumber+") to "+tracker.pn.getPeer());
/** The last sent sequence number, so that we can refer to packets
* sent after this packet was originally sent (it may be a resend) */
@@ -1152,7 +1152,7 @@
int offsetSeq = otherSideSeqNumber - ackSeq;
if(offsetSeq > 255 || offsetSeq < 0)
throw new PacketSequenceException("bad ack offset "+offsetSeq+
- " - seqNumber="+otherSideSeqNumber+",
ackNumber="+ackSeq+" talking to "+tracker.pn.getDetectedPeer());
+ " - seqNumber="+otherSideSeqNumber+",
ackNumber="+ackSeq+" talking to "+tracker.pn.getPeer());
plaintext[ptr++] = (byte)offsetSeq;
}
@@ -1163,7 +1163,7 @@
int offsetSeq = otherSideSeqNumber - reqSeq;
if(offsetSeq > 255 || offsetSeq < 0)
throw new PacketSequenceException("bad resend request offset
"+offsetSeq+
- " - reqSeq="+reqSeq+",
otherSideSeqNumber="+otherSideSeqNumber+" talking to
"+tracker.pn.getDetectedPeer());
+ " - reqSeq="+reqSeq+",
otherSideSeqNumber="+otherSideSeqNumber+" talking to "+tracker.pn.getPeer());
plaintext[ptr++] = (byte)offsetSeq;
}
@@ -1177,7 +1177,7 @@
int offsetSeq = realSeqNumber - ackReqSeq;
if(offsetSeq > 255 || offsetSeq < 0)
throw new PacketSequenceException("bad ack requests offset:
"+offsetSeq+
- " - ackReqSeq="+ackReqSeq+",
packetNumber="+realSeqNumber+" talking to "+tracker.pn.getDetectedPeer());
+ " - ackReqSeq="+ackReqSeq+",
packetNumber="+realSeqNumber+" talking to "+tracker.pn.getPeer());
plaintext[ptr++] = (byte)offsetSeq;
}
@@ -1262,7 +1262,7 @@
Logger.minor(this,"Sending packet of length "+output.length+" to
"+kt.pn);
- usm.sendPacket(output, kt.pn.getDetectedPeer());
+ usm.sendPacket(output, kt.pn.getPeer());
kt.pn.sentPacket();
}
@@ -1281,8 +1281,7 @@
pn.setDHContext(ctx);
}
}
- for(int i=0;i<pn.getHandshakeIPs().length;i++)
- sendFirstHalfDHPacket(0, ctx.getOurExponential(), pn,
pn.getHandshakeIPs()[i]);
+ sendFirstHalfDHPacket(0, ctx.getOurExponential(), pn, pn.getPeer());
pn.sentHandshake();
}
Modified: trunk/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyTracker.java 2006-01-18 00:01:15 UTC
(rev 7870)
+++ trunk/freenet/src/freenet/node/KeyTracker.java 2006-01-18 00:45:46 UTC
(rev 7871)
@@ -483,7 +483,7 @@
}
private PacketThrottle getThrottle() {
- return PacketThrottle.getThrottle(pn.getDetectedPeer(),
Node.PACKET_SIZE);
+ return PacketThrottle.getThrottle(pn.getPeer(), Node.PACKET_SIZE);
}
/**
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-01-18 00:01:15 UTC (rev
7870)
+++ trunk/freenet/src/freenet/node/Node.java 2006-01-18 00:45:46 UTC (rev
7871)
@@ -150,7 +150,7 @@
byte[] identityHash;
/** Hash of hash of identity i.e. hash of setup key. */
byte[] identityHashHash;
- String myName, myFQDN;
+ String myName;
final LocationManager lm;
final PeerManager peers; // my peers
final RandomSource random; // strong RNG
@@ -210,10 +210,9 @@
br.close();
// Read contents
String physical = fs.get("physical.udp");
- myFQDN = fs.get("hostname");
Peer myOldPeer;
try {
- myOldPeer = new Peer(physical, myFQDN);
+ myOldPeer = new Peer(physical);
} catch (PeerParseException e) {
IOException e1 = new IOException();
e1.initCause(e);
@@ -327,8 +326,6 @@
}
DiffieHellman.init(yarrow);
Node n = new Node(port, yarrow, overrideIP, "", 1000 /
packetsPerSecond, true, logger, 16384);
- if(args.length > 1)
- n.setFQDN(args[1]);
n.start(new StaticSwapRequestInterval(2000));
new TextModeClientInterface(n);
Thread t = new Thread(new MemoryChecker(), "Memory checker");
@@ -915,7 +912,6 @@
public SimpleFieldSet exportFieldSet() {
SimpleFieldSet fs = new SimpleFieldSet();
fs.put("physical.udp",
getPrimaryIPAddress().getHostAddress()+":"+portNumber);
- fs.put("hostname", myFQDN );
fs.put("identity", HexUtil.bytesToHex(myIdentity));
fs.put("location", Double.toString(lm.getLocation().getValue()));
fs.put("version", Version.getVersionString());
@@ -927,11 +923,6 @@
Logger.minor(this, "My reference: "+fs);
return fs;
}
-
- public void setFQDN(String name){
- if(name!=null)
- myFQDN=name;
- }
InetAddress overrideIPAddress;
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2006-01-18 00:01:15 UTC
(rev 7870)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2006-01-18 00:45:46 UTC
(rev 7871)
@@ -308,7 +308,7 @@
PeerNode next = node.peers.closerPeer(pn, ctx.routedTo,
ctx.notIgnored, target, true);
Logger.minor(this, "Next: "+next+" message: "+m);
if(next != null) {
- Logger.minor(this, "Forwarding "+m.getSpec()+" to
"+next.getDetectedPeer().getPort());
+ Logger.minor(this, "Forwarding "+m.getSpec()+" to
"+next.getPeer().getPort());
ctx.addSent(next);
try {
next.sendAsync(m, null);
Modified: trunk/freenet/src/freenet/node/NodePinger.java
===================================================================
--- trunk/freenet/src/freenet/node/NodePinger.java 2006-01-18 00:01:15 UTC
(rev 7870)
+++ trunk/freenet/src/freenet/node/NodePinger.java 2006-01-18 00:45:46 UTC
(rev 7871)
@@ -51,7 +51,7 @@
double avgPingTime = peer.averagePingTime();
double avgThrottledPacketSendTime =
peer.throttledPacketSendAverage.currentValue();
double value = Math.max(avgPingTime,
avgThrottledPacketSendTime);
- Logger.minor(this, "Peer: "+peer.getDetectedPeer()+",
avgPingTime: "+avgPingTime+", avg throttled send time:
"+avgThrottledPacketSendTime);
+ Logger.minor(this, "Peer: "+peer.getPeer()+",
avgPingTime: "+avgPingTime+", avg throttled send time:
"+avgThrottledPacketSendTime);
total *= value;
}
if(peerCount > 0) {
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2006-01-18 00:01:15 UTC
(rev 7870)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2006-01-18 00:45:46 UTC
(rev 7871)
@@ -191,7 +191,7 @@
*/
public PeerNode getByPeer(Peer peer) {
for(int i=0;i<myPeers.length;i++) {
- if(myPeers[i].getDetectedPeer().equals(peer))
+ if(myPeers[i].getPeer().equals(peer))
return myPeers[i];
}
return null;
@@ -347,25 +347,25 @@
for(int i=0;i<peers.length;i++) {
PeerNode p = peers[i];
if(routedTo.contains(p)) {
- Logger.minor(this, "Skipping (already routed to):
"+p.getDetectedPeer());
+ Logger.minor(this, "Skipping (already routed to):
"+p.getPeer());
continue;
}
if(p == pn) {
- Logger.minor(this, "Skipping (req came from):
"+p.getDetectedPeer());
+ Logger.minor(this, "Skipping (req came from): "+p.getPeer());
continue;
}
if(!p.isConnected()) {
- Logger.minor(this, "Skipping (not connected):
"+p.getDetectedPeer());
+ Logger.minor(this, "Skipping (not connected): "+p.getPeer());
continue;
}
if(p.isBackedOff()) {
- Logger.minor(this, "Skipping (backed off):
"+p.getDetectedPeer());
+ Logger.minor(this, "Skipping (backed off): "+p.getPeer());
continue;
}
count++;
any = p;
double diff = distance(p, loc);
- Logger.minor(this, "p.loc="+p.getLocation().getValue()+",
loc="+loc+", d="+distance(p.getLocation().getValue(), loc)+" usedD="+diff+" for
"+p.getDetectedPeer());
+ Logger.minor(this, "p.loc="+p.getLocation().getValue()+",
loc="+loc+", d="+distance(p.getLocation().getValue(), loc)+" usedD="+diff+" for
"+p.getPeer());
if((!ignoreSelf) && diff > maxDiff) continue;
if(diff < bestDiff) {
best = p;
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-01-18 00:01:15 UTC
(rev 7870)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-01-18 00:45:46 UTC
(rev 7871)
@@ -52,11 +52,8 @@
static boolean disableProbabilisticHTLs = false;
/** My low-level address for SocketManager purposes */
- private Peer detectedPeer;
+ private Peer peer;
- /** The advertised address */
- private Peer nominalPeer;
-
/** Is this a testnet node? */
public final boolean testnetEnabled;
@@ -196,17 +193,14 @@
currentLocation = new Location(locationString);
String physical = fs.get("physical.udp");
if(physical == null) throw new FSParseException("No physical.udp");
- detectedPeer = new Peer(physical);
- String nominal = fs.get("hostname");
- if(nominal == null) throw new FSParseException("No hostname");
- nominalPeer = new Peer(nominal);
+ peer = new Peer(physical);
String name = fs.get("myName");
if(name == null) throw new FSParseException("No name");
myName = name;
String testnet = fs.get("testnet");
testnetEnabled = testnet == null ? false :
(testnet.equalsIgnoreCase("true") || testnet.equalsIgnoreCase("yes"));
if(testnetEnabled != node.testnetEnabled) {
- String err = "Ignoring incompatible node "+detectedPeer+" -
peer.testnet="+testnetEnabled+"("+testnet+") but
node.testnet="+node.testnetEnabled;
+ String err = "Ignoring incompatible node "+peer+" -
peer.testnet="+testnetEnabled+"("+testnet+") but
node.testnet="+node.testnetEnabled;
Logger.error(this, err);
throw new PeerParseException(err);
}
@@ -273,28 +267,11 @@
/**
* Get my low-level address
*/
- public Peer getDetectedPeer() {
- return detectedPeer;
+ public Peer getPeer() {
+ return peer;
}
/**
- * Get my advertised address
- */
- public Peer getNominalPeer() {
- return nominalPeer;
- }
-
- /**
- * Returns an array with the advertised address and the nominal one
- */
- public Peer[] getHandshakeIPs(){
- Peer[] p = new Peer[2];
- p[0]=nominalPeer;
- if(detectedPeer!=null) p[1]=detectedPeer;
- return p;
- }
-
- /**
* What is my current keyspace location?
*/
public Location getLocation() {
@@ -541,7 +518,7 @@
* @param newPeer The new address of the peer.
*/
public void changedIP(Peer newPeer) {
- this.detectedPeer = newPeer;
+ this.peer = newPeer;
}
/**
@@ -573,7 +550,7 @@
* @return short version of toString()
*/
public String shortToString() {
- return
super.toString()+"@"+detectedPeer.toString()+"@"+HexUtil.bytesToHex(identity);
+ return
super.toString()+"@"+peer.toString()+"@"+HexUtil.bytesToHex(identity);
}
public String toString() {
@@ -818,8 +795,8 @@
if(physical == null) throw new FSParseException("No physical.udp");
try {
Peer p = new Peer(physical);
- if(!p.equals(detectedPeer)) changedAnything = true;
- detectedPeer = p;
+ if(!p.equals(peer)) changedAnything = true;
+ peer = p;
} catch (PeerParseException e1) {
throw new FSParseException(e1);
}
@@ -878,7 +855,7 @@
public String getStatus() {
return
- (isConnected ? "CONNECTED " : "DISCONNECTED") + " " +
getDetectedPeer().toString()+" "+myName+" "+currentLocation.getValue()+"
"+getVersion()+" backoff: "+backoffLength+" ("+(Math.max(backedOffUntil -
System.currentTimeMillis(),0))+")";
+ (isConnected ? "CONNECTED " : "DISCONNECTED") + " " +
getPeer().toString()+" "+myName+" "+currentLocation.getValue()+"
"+getVersion()+" backoff: "+backoffLength+" ("+(Math.max(backedOffUntil -
System.currentTimeMillis(),0))+")";
}
public String getFreevizOutput() {
@@ -902,8 +879,7 @@
*/
private SimpleFieldSet exportFieldSet() {
SimpleFieldSet fs = new SimpleFieldSet();
- fs.put("hostname", nominalPeer.toString());
- fs.put("physical.udp", detectedPeer.toString());
+ fs.put("physical.udp", peer.toString());
fs.put("identity", HexUtil.bytesToHex(identity));
fs.put("location", Double.toString(currentLocation.getValue()));
fs.put("testnet", Boolean.toString(testnetEnabled));
@@ -1008,9 +984,9 @@
backoffLength = MAX_BACKOFF_LENGTH;
int x = node.random.nextInt(backoffLength);
backedOffUntil = now + x;
- Logger.minor(this, "Backing off:
backoffLength="+backoffLength+", until "+x+"ms on "+getDetectedPeer());
+ Logger.minor(this, "Backing off:
backoffLength="+backoffLength+", until "+x+"ms on "+getPeer());
} else {
- Logger.minor(this, "Ignoring
localRejectedOverload: "+(backedOffUntil-now)+"ms remaining on backoff on
"+getDetectedPeer());
+ Logger.minor(this, "Ignoring
localRejectedOverload: "+(backedOffUntil-now)+"ms remaining on backoff on
"+getPeer());
}
}
}
@@ -1026,9 +1002,9 @@
// Don't un-backoff if still backed off
if(now > backedOffUntil) {
backoffLength = INITIAL_BACKOFF_LENGTH;
- Logger.minor(this, "Resetting backoff on
"+getDetectedPeer());
+ Logger.minor(this, "Resetting backoff on
"+getPeer());
} else {
- Logger.minor(this, "Ignoring
successNotOverload: "+(backedOffUntil-now)+"ms remaining on backoff on
"+getDetectedPeer());
+ Logger.minor(this, "Ignoring
successNotOverload: "+(backedOffUntil-now)+"ms remaining on backoff on
"+getPeer());
}
}
}
@@ -1093,7 +1069,7 @@
public void reportThrottledPacketSendTime(long timeDiff) {
throttledPacketSendAverage.report(timeDiff);
- Logger.minor(this, "Reporting throttled packet send time:
"+timeDiff+" to "+getDetectedPeer());
+ Logger.minor(this, "Reporting throttled packet send time:
"+timeDiff+" to "+getPeer());
}
}
Modified: trunk/freenet/src/freenet/node/SSKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertSender.java 2006-01-18 00:01:15 UTC
(rev 7870)
+++ trunk/freenet/src/freenet/node/SSKInsertSender.java 2006-01-18 00:45:46 UTC
(rev 7871)
@@ -377,7 +377,7 @@
*
* For now, accept the "old" i.e.
preexisting data.
*/
- Logger.normal(this, "Got collision on
"+myKey+" ("+uid+") sending to "+next.getDetectedPeer());
+ Logger.normal(this, "Got collision on
"+myKey+" ("+uid+") sending to "+next.getPeer());
// FNPSSKDataFound == FNPInsertRequest
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-01-18
00:01:15 UTC (rev 7870)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-01-18
00:45:46 UTC (rev 7871)
@@ -107,7 +107,6 @@
System.out.println("CONNECT:<filename> - connect to a node from its
ref in a file.");
System.out.println("CONNECT:\n<noderef including an End on a line by
itself> - enter a noderef directly.");
System.out.println("DISCONNECT:<ip:port> - disconnect from a node by
providing it's ip+port");
- System.out.println("HOSTNAME:<new node fqdn> - change the node's
fqdn.");
System.out.println("NAME:<new node name> - change the node's name.");
// System.out.println("SUBFILE:<filename> - append all data received
from subscriptions to a file, rather than sending it to stdout.");
// System.out.println("SAY:<text> - send text to the last
created/pushed stream");
@@ -473,15 +472,6 @@
key = key.substring(0, key.length()-2);
System.out.println("New name: "+key);
n.setName(key);
- } else if(uline.startsWith("HOSTNAME:")) {
- System.out.println("Node name currently: "+n.myFQDN);
- String key = line.substring("HOSTNAME:".length());
- while(key.length() > 0 && key.charAt(0) == ' ')
- key = key.substring(1);
- while(key.length() > 0 && key.charAt(key.length()-1) == ' ')
- key = key.substring(0, key.length()-2);
- System.out.println("New name: "+key);
- n.setFQDN(key);
} else if(uline.startsWith("DISCONNECT:")) {
String ipAndPort = line.substring("DISCONNECT:".length());
disconnect(ipAndPort.trim());
@@ -728,7 +718,7 @@
PeerNode[] pn = n.peers.myPeers;
for(int i=0;i<pn.length;i++)
{
- String nodeIpAndPort =
pn[i].getDetectedPeer().getAddress().getHostAddress()+":"+pn[i].getDetectedPeer().getPort();
+ String nodeIpAndPort =
pn[i].getPeer().getAddress().getHostAddress()+":"+pn[i].getPeer().getPort();
if(nodeIpAndPort.equals(ipAndPort))
{
n.peers.disconnect(pn[i]);
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-18 00:01:15 UTC (rev
7870)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-18 00:45:46 UTC (rev
7871)
@@ -20,10 +20,10 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 360;
+ public static final int buildNumber = 359;
/** Oldest build of Fred we will talk to */
- public static final int lastGoodBuild = 360;
+ public static final int lastGoodBuild = 359;
/** The highest reported build of fred */
public static int highestSeenBuild = buildNumber;
