Author: nextgens
Date: 2006-08-18 18:26:53 +0000 (Fri, 18 Aug 2006)
New Revision: 10198
Modified:
trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java
trunk/freenet/src/freenet/node/fcp/Peer.java
trunk/freenet/src/freenet/tools/AddRef.java
Log:
freenet.tools.AddRef ought to work now
Modified: trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java 2006-08-18
16:56:21 UTC (rev 10197)
+++ trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java 2006-08-18
18:26:53 UTC (rev 10198)
@@ -61,7 +61,7 @@
sfs.put("FCPVersion", "2.0");
sfs.put("Node", "Fred");
sfs.put("Version", Version.getVersionString());
- sfs.put("Testnet", Boolean.toString(node.isTestnetEnabled()));
+ sfs.put("Testnet", Boolean.toString(node == null ? false :
node.isTestnetEnabled()));
sfs.put("CompressionCodecs",
Integer.toString(Compressor.countCompressAlgorithms()));
return sfs;
}
Modified: trunk/freenet/src/freenet/node/fcp/Peer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/Peer.java 2006-08-18 16:56:21 UTC
(rev 10197)
+++ trunk/freenet/src/freenet/node/fcp/Peer.java 2006-08-18 18:26:53 UTC
(rev 10198)
@@ -5,7 +5,6 @@
import freenet.support.SimpleFieldSet;
public class Peer extends FCPMessage {
-
static final String name = "Peer";
final PeerNode pn;
@@ -17,7 +16,7 @@
this.withMetadata = withMetadata;
this.withVolatile = withVolatile;
}
-
+
public SimpleFieldSet getFieldSet() {
SimpleFieldSet fs = pn.exportFieldSet();
if(withMetadata) {
Modified: trunk/freenet/src/freenet/tools/AddRef.java
===================================================================
--- trunk/freenet/src/freenet/tools/AddRef.java 2006-08-18 16:56:21 UTC (rev
10197)
+++ trunk/freenet/src/freenet/tools/AddRef.java 2006-08-18 18:26:53 UTC (rev
10198)
@@ -12,6 +12,7 @@
import freenet.node.fcp.FCPServer;
import freenet.node.fcp.MessageInvalidException;
import freenet.node.fcp.NodeHelloMessage;
+import freenet.node.fcp.Peer;
import freenet.support.SimpleFieldSet;
import freenet.support.io.LineReadingInputStream;
@@ -43,7 +44,7 @@
SimpleFieldSet sfs = new SimpleFieldSet();
try{
- fcpSocket = new Socket("127.0.0.1",
FCPServer.DEFAULT_FCP_PORT);
+ fcpSocket = new Socket("127.0.0.1", 9482);
fcpSocket.setSoTimeout(2000);
InputStream is = fcpSocket.getInputStream();
@@ -61,11 +62,10 @@
sfs = getMessage(lis);
fcpm = FCPMessage.create(messageName, sfs);
if((fcpm == null) || !(fcpm instanceof
NodeHelloMessage)){
- System.err.println("Not a valid node!");
+ System.err.println("Not a valid FRED
node!");
System.exit(1);
}else{
fcpm = (NodeHelloMessage) fcpm;
- System.out.println(fcpm.getFieldSet());
}
} catch(MessageInvalidException me){
me.printStackTrace();
@@ -77,12 +77,16 @@
fcpm.send(os);
os.flush();
- //ACK ?
+ // TODO: We ought to do stricter checking!
+ // FIXME: some checks even
} catch(MessageInvalidException me){
System.err.println("Invalid reference
file!"+me);
me.printStackTrace();
}
+ lis.close();
+ is.close();
+ os.close();
fcpSocket.close();
System.out.println("That reference has been added");
}catch (SocketException se){
