Update of /cvsroot/freenet/freenet/src/freenet/message
In directory sc8-pr-cvs1:/tmp/cvs-serv8807/src/freenet/message
Modified Files:
Tag: stable
AnnouncementComplete.java AnnouncementExecute.java
AnnouncementFailed.java AnnouncementReply.java DataInsert.java
DataNotFound.java DataReply.java DataSend.java Identify.java
InsertReply.java InsertRequest.java NodeAnnouncement.java
NodeMessage.java QueryRejected.java QueryRestarted.java
Request.java StoreData.java VoidMessage.java
Log Message:
5030: Merge minor(ish) changes from unstable:
Open Connections infolet
Minor implementation changes on normal mode
Show total bytes transmitted/received so far
Much new information on the PeerHandler mode
Fixed tons of eclipse warnings (almost all are style issues, not functional changes -
relating to logger and imports mostly). Remove deprecated FieldSet.add(String,String).
Update TestLocalNIOInterface to current API
Make 5029 mandatory (it can't connect to us anyway, only vice versa).
If incoming HTL is 25, 50% chance of not decrementing it, so we have some plausible
deniability when we send out an HTL 25 request (the client level HTL perturb mechanism
is insufficient although useful).
Don't use seednodes with no physical address.
Use our own URLEncoder/URLDecoder's, catch the exceptions. We were using java's, which
are deprecated.
Add support for deprecated options. These will be read form config file and handled,
but will not be written to it by --config. Currently bandwidthLimit and
averageBandwidthLimit are in this category. Separate code logs an error when these are
set.
Change the way bandwidthLimit set but others not set, to prevent it from constantly
getting 100% load due to bandwidth limit (0!) exceeded.
Set priority of entropy thread to MIN.
Remove old datastore code, GOOD RIDDENS!
Add a memory usage test for the Failure Table
Increase size of failure table to 20,000 (from 2,000).
Don't show the key request form in simple mode on the default infolet.
Major refactoring of HTML reporting, writing to disk, in NGRouting estimators.
Relative times in (for example) ?date= in fproxy: ?date=-1year gives the edition of a
DBR one year ago.
NIO refactoring (ASL.ChannelAttachmentPairQueue).
Logging.
Index: AnnouncementComplete.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementComplete.java,v
retrieving revision 1.1.1.1.6.1
retrieving revision 1.1.1.1.6.2
diff -u -w -r1.1.1.1.6.1 -r1.1.1.1.6.2
--- AnnouncementComplete.java 28 Oct 2003 20:20:33 -0000 1.1.1.1.6.1
+++ AnnouncementComplete.java 1 Nov 2003 16:55:33 -0000 1.1.1.1.6.2
@@ -1,8 +1,13 @@
package freenet.message;
-import freenet.*;
+import java.io.IOException;
+import java.io.InputStream;
+
+import freenet.ConnectionHandler;
+import freenet.InvalidMessageException;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
import freenet.support.KeyList;
-import freenet.node.Node;
-import java.io.*;
/**
* The final message in an AnnouncementChain (phew).
Index: AnnouncementExecute.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementExecute.java,v
retrieving revision 1.1.1.1.6.1
retrieving revision 1.1.1.1.6.2
diff -u -w -r1.1.1.1.6.1 -r1.1.1.1.6.2
--- AnnouncementExecute.java 28 Oct 2003 20:20:34 -0000 1.1.1.1.6.1
+++ AnnouncementExecute.java 1 Nov 2003 16:55:33 -0000 1.1.1.1.6.2
@@ -1,9 +1,13 @@
package freenet.message;
-import freenet.*;
-import freenet.node.*;
-import freenet.support.Fields;
+import java.io.IOException;
+import java.io.InputStream;
+
+import freenet.ConnectionHandler;
+import freenet.InvalidMessageException;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
import freenet.support.KeyList;
-import java.io.*;
/**
* The third message in a complete announcement chain. This message
@@ -49,7 +53,7 @@
public RawMessage toRawMessage(Presentation p, PeerHandler ph) {
RawMessage raw = super.toRawMessage(p,ph);
////raw.messageType = messageName;
- raw.fs.add("RefSignature", refSignature);
+ raw.fs.put("RefSignature", refSignature);
raw.trailingFieldName = "Values";
raw.trailingFieldLength = vals.streamLength();
//raw.trailingFieldStream = vals.getStream();
Index: AnnouncementFailed.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementFailed.java,v
retrieving revision 1.2.4.1.2.2
retrieving revision 1.2.4.1.2.3
diff -u -w -r1.2.4.1.2.2 -r1.2.4.1.2.3
--- AnnouncementFailed.java 28 Oct 2003 20:20:34 -0000 1.2.4.1.2.2
+++ AnnouncementFailed.java 1 Nov 2003 16:55:33 -0000 1.2.4.1.2.3
@@ -64,7 +64,7 @@
public RawMessage toRawMessage(Presentation p, PeerHandler ph) {
RawMessage raw = super.toRawMessage(p,ph);
//raw.messageType = messageName;
- raw.fs.add("Reason",Fields.longToHex(reason));
+ raw.fs.put("Reason",Fields.longToHex(reason));
return raw;
}
Index: AnnouncementReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementReply.java,v
retrieving revision 1.1.1.1.6.1
retrieving revision 1.1.1.1.6.2
diff -u -w -r1.1.1.1.6.1 -r1.1.1.1.6.2
--- AnnouncementReply.java 28 Oct 2003 20:20:34 -0000 1.1.1.1.6.1
+++ AnnouncementReply.java 1 Nov 2003 16:55:33 -0000 1.1.1.1.6.2
@@ -40,7 +40,7 @@
public RawMessage toRawMessage(Presentation p, PeerHandler ph) {
RawMessage raw = super.toRawMessage(p,ph);
//raw.messageType = messageName;
- raw.fs.add("ReturnValue",Fields.bytesToHex(returnVal));
+ raw.fs.put("ReturnValue",Fields.bytesToHex(returnVal));
return raw;
}
Index: DataInsert.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataInsert.java,v
retrieving revision 1.1.1.1.6.2
retrieving revision 1.1.1.1.6.3
diff -u -w -r1.1.1.1.6.2 -r1.1.1.1.6.3
--- DataInsert.java 28 Oct 2003 20:20:34 -0000 1.1.1.1.6.2
+++ DataInsert.java 1 Nov 2003 16:55:33 -0000 1.1.1.1.6.3
@@ -17,13 +17,14 @@
package freenet.message;
-import java.io.*;
-import freenet.*;
-import freenet.node.*;
-import freenet.node.ds.KeyCollisionException;
-import freenet.node.states.data.ReceiveData;
-import freenet.support.*;
-import freenet.support.io.*;
+import freenet.BadAddressException;
+import freenet.ConnectionHandler;
+import freenet.FieldSet;
+import freenet.InvalidMessageException;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
+import freenet.support.io.DiscontinueInputStream;
public class DataInsert extends DataSend {
Index: DataNotFound.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataNotFound.java,v
retrieving revision 1.2.6.1
retrieving revision 1.2.6.2
diff -u -w -r1.2.6.1 -r1.2.6.2
--- DataNotFound.java 28 Oct 2003 20:20:34 -0000 1.2.6.1
+++ DataNotFound.java 1 Nov 2003 16:55:33 -0000 1.2.6.2
@@ -1,7 +1,9 @@
package freenet.message;
-import freenet.*;
-import freenet.node.*;
-import freenet.support.Logger;
+import freenet.ConnectionHandler;
+import freenet.InvalidMessageException;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
import freenet.support.Fields;
/**
* The message sent when a DataRequest runs out of htl without finding the
@@ -45,7 +47,7 @@
public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
RawMessage raw=super.toRawMessage(t,ph);
- raw.fs.add("TimeSinceQuery",
+ raw.fs.put("TimeSinceQuery",
Fields.longToHex(System.currentTimeMillis() - timeOfQuery));
return raw;
}
Index: DataReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataReply.java,v
retrieving revision 1.1.1.1.6.2
retrieving revision 1.1.1.1.6.3
diff -u -w -r1.1.1.1.6.2 -r1.1.1.1.6.3
--- DataReply.java 28 Oct 2003 20:20:34 -0000 1.1.1.1.6.2
+++ DataReply.java 1 Nov 2003 16:55:33 -0000 1.1.1.1.6.3
@@ -1,12 +1,15 @@
package freenet.message;
-import java.io.*;
-import java.net.*;
-import freenet.*;
-import freenet.node.*;
-import freenet.node.ds.KeyCollisionException;
-import freenet.node.states.data.ReceiveData;
-import freenet.support.*;
-import freenet.support.io.DataNotValidIOException;
+import java.net.UnknownHostException;
+
+import freenet.BadAddressException;
+import freenet.ConnectionHandler;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.InvalidMessageException;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
+import freenet.support.Logger;
/*
This code is part of the Java Adaptive Network Client by Ian Clarke.
It is distributed under the GNU Public Licence (GPL) version 2. See
@@ -32,7 +35,7 @@
FieldSet fs, long length) throws UnknownHostException {
super(idnum, fs, null, length);
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
initException = new Exception("new DataReply (a)");
else initException = null;
}
@@ -48,7 +51,7 @@
throws InvalidMessageException, BadAddressException {
super(source, raw);
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
initException = new Exception("new DataReply (b)");
else initException = null;
}
Index: DataSend.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataSend.java,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -u -w -r1.2.6.2 -r1.2.6.3
--- DataSend.java 28 Oct 2003 20:20:34 -0000 1.2.6.2
+++ DataSend.java 1 Nov 2003 16:55:33 -0000 1.2.6.3
@@ -1,13 +1,28 @@
package freenet.message;
-import java.io.*;
-import java.util.*;
-import freenet.*;
-import freenet.node.*;
-import freenet.node.ds.*;
-import freenet.node.states.data.*;
-import freenet.support.*;
-import freenet.support.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+
+import freenet.BadAddressException;
+import freenet.ConnectionHandler;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.InvalidMessageException;
+import freenet.Key;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
+import freenet.Storables;
+import freenet.node.Node;
+import freenet.node.ds.KeyCollisionException;
+import freenet.node.ds.KeyOutputStream;
+import freenet.node.ds.StoreIOException;
+import freenet.node.states.data.EatData;
+import freenet.node.states.data.ReceiveData;
+import freenet.support.Logger;
+import freenet.support.io.DataNotValidIOException;
+import freenet.support.io.DiscontinueInputStream;
+import freenet.support.io.VerifyingInputStream;
/**
* This is the DataSend message
@@ -134,7 +149,7 @@
VerifyingInputStream vis = searchKey.verifyStream(in, storables, length);
if(logDEBUG)
Core.logger.log(this, "Trying to cache data: "+searchKey+":"+length+
- ":"+in, Core.logger.DEBUG);
+ ":"+in, Logger.DEBUG);
KeyOutputStream out;
try {
out = n.ds.putData(searchKey, length, storables);
@@ -142,7 +157,7 @@
if(e instanceof StoreIOException) throw e;
else throw new StoreIOException(e);
}
- return new ReceiveData(n.getRandSource().nextLong(), this.id, vis, out,
length);
+ return new ReceiveData(Core.getRandSource().nextLong(), this.id, vis, out,
length);
}
/** Used to swallow a DataInsert.
@@ -153,7 +168,7 @@
Storables storables = getStorables();
if (storables == null) throw new IOException();
VerifyingInputStream vin = new VerifyingInputStream(in, length);
- (new EatData(n.getRandSource().nextLong(), vin, length)).schedule(n);
+ (new EatData(Core.getRandSource().nextLong(), vin, length)).schedule(n);
// FIXME -- should use ControlInputStream but i haven't made
// sure it will work yet
}
Index: Identify.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Identify.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -w -r1.1.2.2 -r1.1.2.3
--- Identify.java 28 Oct 2003 20:20:34 -0000 1.1.2.2
+++ Identify.java 1 Nov 2003 16:55:33 -0000 1.1.2.3
@@ -1,10 +1,14 @@
package freenet.message;
-import freenet.*;
-import freenet.node.*;
+import freenet.ConnectionHandler;
+import freenet.FieldSet;
+import freenet.InvalidMessageException;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
+import freenet.node.BadReferenceException;
+import freenet.node.NodeReference;
+import freenet.node.State;
import freenet.node.states.FNP.NewIdentify;
-import freenet.support.*;
-import java.util.*;
-import freenet.node.states.request.*;
public class Identify extends NodeMessage {
@@ -38,7 +42,7 @@
public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
RawMessage raw=super.toRawMessage(t, ph);
- raw.fs.add("Source", sourceRef.getFieldSet(false));
+ raw.fs.put("Source", sourceRef.getFieldSet(false));
return raw;
}
Index: InsertReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/InsertReply.java,v
retrieving revision 1.1.1.1.6.1
retrieving revision 1.1.1.1.6.2
diff -u -w -r1.1.1.1.6.1 -r1.1.1.1.6.2
--- InsertReply.java 28 Oct 2003 20:20:34 -0000 1.1.1.1.6.1
+++ InsertReply.java 1 Nov 2003 16:55:33 -0000 1.1.1.1.6.2
@@ -1,8 +1,9 @@
package freenet.message;
-import freenet.*;
-import freenet.node.*;
-import freenet.support.Logger;
-import java.io.*;
+import freenet.ConnectionHandler;
+import freenet.InvalidMessageException;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
public class InsertReply extends NodeMessage {
Index: InsertRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/InsertRequest.java,v
retrieving revision 1.1.1.1.4.1.2.1
retrieving revision 1.1.1.1.4.1.2.2
diff -u -w -r1.1.1.1.4.1.2.1 -r1.1.1.1.4.1.2.2
--- InsertRequest.java 28 Oct 2003 20:20:34 -0000 1.1.1.1.4.1.2.1
+++ InsertRequest.java 1 Nov 2003 16:55:33 -0000 1.1.1.1.4.1.2.2
@@ -1,10 +1,16 @@
package freenet.message;
-import java.io.*;
-import freenet.*;
-import freenet.node.*;
-import freenet.support.*;
+import freenet.ConnectionHandler;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.InvalidMessageException;
+import freenet.Key;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
+import freenet.node.NodeReference;
+import freenet.node.State;
import freenet.node.states.FNP.NewInsertRequest;
/**
Index: NodeAnnouncement.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/NodeAnnouncement.java,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -w -r1.3.6.1 -r1.3.6.2
--- NodeAnnouncement.java 28 Oct 2003 20:20:34 -0000 1.3.6.1
+++ NodeAnnouncement.java 1 Nov 2003 16:55:33 -0000 1.3.6.2
@@ -88,11 +88,11 @@
public RawMessage toRawMessage(Presentation p, PeerHandler ph) {
RawMessage raw = super.toRawMessage(p,ph);
//raw.messageType = messageName;
- raw.fs.add("HopsToLive",Fields.longToHex(hopsToLive));
- raw.fs.add("Depth", Fields.longToHex(depth));
- raw.fs.add("Announcee", announcee.getFieldSet());
- raw.fs.add("CommitValue", Fields.bytesToHex(commitVal));
- raw.fs.add("Source", anSource.getFieldSet(false));
+ raw.fs.put("HopsToLive",Fields.longToHex(hopsToLive));
+ raw.fs.put("Depth", Fields.longToHex(depth));
+ raw.fs.put("Announcee", announcee.getFieldSet());
+ raw.fs.put("CommitValue", Fields.bytesToHex(commitVal));
+ raw.fs.put("Source", anSource.getFieldSet(false));
return raw;
}
Index: NodeMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/NodeMessage.java,v
retrieving revision 1.1.1.1.4.4.2.2
retrieving revision 1.1.1.1.4.4.2.3
diff -u -w -r1.1.1.1.4.4.2.2 -r1.1.1.1.4.4.2.3
--- NodeMessage.java 28 Oct 2003 20:20:34 -0000 1.1.1.1.4.4.2.2
+++ NodeMessage.java 1 Nov 2003 16:55:33 -0000 1.1.1.1.4.4.2.3
@@ -1,9 +1,16 @@
package freenet.message;
-import freenet.*;
-import freenet.node.Node;
-import freenet.support.Fields;
+import freenet.ConnectionHandler;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.InvalidMessageException;
+import freenet.Message;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
+import freenet.Version;
import freenet.crypt.EntropySource;
-import java.io.OutputStream;
+import freenet.support.Fields;
+import freenet.support.Logger;
/**
* Superclass for messages that are sent between nodes (basically those
@@ -30,7 +37,7 @@
" LIST! (TYPE "+s+": "+Fields.longToHex(id)+
details+")";
Exception e = new Exception("heisenbug debug");
- Core.logger.log(this, o, e, Core.logger.ERROR);
+ Core.logger.log(this, o, e, Logger.ERROR);
System.err.println(o);
e.printStackTrace(System.err);
}
@@ -42,10 +49,10 @@
super(id);
if(id == 0) {
Core.logger.log(this, "Creating NodeMessage with 0 ID",
- new Exception("debug"), Core.logger.DEBUG);
+ new Exception("debug"), Logger.DEBUG);
} else if (id == -1) {
Core.logger.log(this, "Creating NodeMessage with -1 ID",
- new Exception("debug"), Core.logger.DEBUG);
+ new Exception("debug"), Logger.DEBUG);
} else if (((id>>>32) & 0xffffffffL) == (id & 0xffffffffL)) {
logHeisenbug("A", id);
}
@@ -61,10 +68,10 @@
super(id, otherFields);
if(id == 0) {
Core.logger.log(this, "Creating NodeMessage with 0 ID",
- Core.logger.DEBUG);
+ Logger.DEBUG);
} else if (id == -1) {
Core.logger.log(this, "Creating NodeMessage with -1 ID",
- Core.logger.DEBUG);
+ Logger.DEBUG);
} else if (((id>>>32) & 0xffffffffL) == (id & 0xffffffffL)) {
logHeisenbug("B", id);
}
@@ -115,7 +122,7 @@
*/
public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
RawMessage r = super.toRawMessage(t,ph);
- r.fs.add("UniqueID", Fields.longToHex(id));
+ r.fs.put("UniqueID", Fields.longToHex(id));
// do heisenbug testing
long test = Fields.hexToLong(Fields.longToHex(id));
if(((id >>> 32) & 0xffffffffL) == (id & 0xffffffffL)) {
@@ -124,7 +131,7 @@
System.err.println(s);
Exception e = new Exception();
e.printStackTrace();
- Core.logger.log(NodeMessage.class, s, e, Core.logger.ERROR);
+ Core.logger.log(NodeMessage.class, s, e, Logger.ERROR);
}
return r;
}
Index: QueryRejected.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryRejected.java,v
retrieving revision 1.4.6.3
retrieving revision 1.4.6.4
diff -u -w -r1.4.6.3 -r1.4.6.4
--- QueryRejected.java 28 Oct 2003 20:20:35 -0000 1.4.6.3
+++ QueryRejected.java 1 Nov 2003 16:55:33 -0000 1.4.6.4
@@ -1,8 +1,13 @@
package freenet.message;
-import freenet.*;
-import freenet.node.*;
-import freenet.support.*;
-import java.lang.reflect.*;
+import freenet.ConnectionHandler;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.InvalidMessageException;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
+import freenet.support.Fields;
+import freenet.support.Logger;
/*
This code is part of the Java Adaptive Network Client by Ian Clarke.
It is distributed under the GNU General Public Licence (GPL)
@@ -68,7 +73,7 @@
otherFields.remove("HopsToLive");
otherFields.remove("Reason");
otherFields.remove("Attenuation");
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
initException = new Exception("debug:QR:a");
else initException = null;
}
@@ -77,7 +82,7 @@
super(idnum ,otherfields);
hopsToLive = htl;
this.attenuation = 0;
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
initException = new Exception("debug:QR:b");
else initException = null;
}
@@ -88,7 +93,7 @@
hopsToLive = htl;
this.attenuation = 0;
this.reason = reason;
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
initException = new Exception("debug:QR:c");
else initException = null;
}
@@ -99,7 +104,7 @@
hopsToLive = htl;
this.attenuation = attenuation;
this.reason = reason;
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
initException = new Exception("debug:QR:d");
else initException = null;
}
@@ -109,10 +114,10 @@
public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
RawMessage raw=super.toRawMessage(t,ph);
- raw.fs.add("HopsToLive",Fields.longToHex(hopsToLive));
- raw.fs.add("Attenuation",Fields.longToHex(attenuation));
+ raw.fs.put("HopsToLive",Fields.longToHex(hopsToLive));
+ raw.fs.put("Attenuation",Fields.longToHex(attenuation));
if (reason != null)
- raw.fs.add("Reason",reason);
+ raw.fs.put("Reason",reason);
//raw.messageType=messageName;
return raw;
}
Index: QueryRestarted.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryRestarted.java,v
retrieving revision 1.1.1.1.6.1
retrieving revision 1.1.1.1.6.2
diff -u -w -r1.1.1.1.6.1 -r1.1.1.1.6.2
--- QueryRestarted.java 28 Oct 2003 20:20:35 -0000 1.1.1.1.6.1
+++ QueryRestarted.java 1 Nov 2003 16:55:33 -0000 1.1.1.1.6.2
@@ -1,7 +1,9 @@
package freenet.message;
-import freenet.*;
-import freenet.node.*;
-import freenet.support.*;
+import freenet.ConnectionHandler;
+import freenet.InvalidMessageException;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
/**
* QueryRestarted messages are sent when the Query is restarted do to no
Index: Request.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Request.java,v
retrieving revision 1.3.4.2.2.2
retrieving revision 1.3.4.2.2.3
diff -u -w -r1.3.4.2.2.2 -r1.3.4.2.2.3
--- Request.java 28 Oct 2003 20:20:35 -0000 1.3.4.2.2.2
+++ Request.java 1 Nov 2003 16:55:33 -0000 1.3.4.2.2.3
@@ -1,9 +1,17 @@
package freenet.message;
-import freenet.*;
-import freenet.node.*;
-import freenet.support.*;
-import java.util.*;
-import freenet.node.states.request.*;
+import freenet.ConnectionHandler;
+import freenet.Core;
+import freenet.FieldSet;
+import freenet.InvalidMessageException;
+import freenet.Key;
+import freenet.KeyException;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
+import freenet.node.BadReferenceException;
+import freenet.node.NodeReference;
+import freenet.support.Fields;
+import freenet.support.Logger;
public abstract class Request extends NodeMessage implements HTLMessage {
@@ -76,8 +84,8 @@
public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
RawMessage raw=super.toRawMessage(t,ph);
- raw.fs.add("SearchKey", searchKey.toString());
- raw.fs.add("HopsToLive", Fields.longToHex(hopsToLive));
+ raw.fs.put("SearchKey", searchKey.toString());
+ raw.fs.put("HopsToLive", Fields.longToHex(hopsToLive));
if(ph != null && ph.getReference() != null) {
// We have received Identify from them, so they will have ours too
} else {
@@ -86,7 +94,7 @@
requestSource+":"+
requestSource.getFieldSet(false),
new Exception("debug"), Logger.MINOR);
- raw.fs.add("Source", requestSource.getFieldSet(false));
+ raw.fs.put("Source", requestSource.getFieldSet(false));
}
return raw;
}
Index: StoreData.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/StoreData.java,v
retrieving revision 1.3.6.4
retrieving revision 1.3.6.5
diff -u -w -r1.3.6.4 -r1.3.6.5
--- StoreData.java 28 Oct 2003 20:20:35 -0000 1.3.6.4
+++ StoreData.java 1 Nov 2003 16:55:33 -0000 1.3.6.5
@@ -1,8 +1,13 @@
package freenet.message;
-import freenet.*;
-import freenet.node.*;
+import freenet.ConnectionHandler;
+import freenet.FieldSet;
+import freenet.InvalidMessageException;
+import freenet.PeerHandler;
+import freenet.Presentation;
+import freenet.RawMessage;
import freenet.crypt.RandomSource;
-import freenet.support.Logger;
+import freenet.node.BadReferenceException;
+import freenet.node.NodeReference;
import freenet.support.Fields;
/**
@@ -75,12 +80,12 @@
public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
RawMessage raw = super.toRawMessage(t,ph);
if (dataSource != null) {
- raw.fs.add("DataSource", dataSource.getFieldSet());
+ raw.fs.put("DataSource", dataSource.getFieldSet());
}
if (requestsPerHour != -1) {
- raw.fs.add("RequestRate",Fields.longToHex(requestsPerHour));
+ raw.fs.put("RequestRate",Fields.longToHex(requestsPerHour));
}
- raw.fs.add("HopsSinceReset", Fields.intToHex(hopsSinceReset));
+ raw.fs.put("HopsSinceReset", Fields.intToHex(hopsSinceReset));
return raw;
}
Index: VoidMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/VoidMessage.java,v
retrieving revision 1.1.1.1.6.1
retrieving revision 1.1.1.1.6.2
diff -u -w -r1.1.1.1.6.1 -r1.1.1.1.6.2
--- VoidMessage.java 28 Oct 2003 20:20:35 -0000 1.1.1.1.6.1
+++ VoidMessage.java 1 Nov 2003 16:55:33 -0000 1.1.1.1.6.2
@@ -4,6 +4,8 @@
import freenet.node.*;
import java.io.InputStream;
import java.io.IOException;
+
+import freenet.support.Logger;
import freenet.support.io.ZeroInputStream;
/**
@@ -103,8 +105,8 @@
if (data != null)
data.close();
} catch (IOException e) {
- n.logger.log(this, "Closing dropped DataSend threw exception :"
- + e, n.logger.DEBUGGING);
+ Core.logger.log(this, "Closing dropped DataSend threw exception :"
+ + e, Logger.DEBUGGING);
}
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
