Update of /cvsroot/freenet/freenet/src/freenet/message
In directory sc8-pr-cvs1:/tmp/cvs-serv2447/src/freenet/message
Modified Files:
Accepted.java AnnouncementComplete.java
AnnouncementExecute.java AnnouncementFailed.java
AnnouncementReply.java DataInsert.java DataNotFound.java
DataReply.java DataRequest.java DataSend.java Identify.java
InsertReply.java InsertRequest.java NodeAnnouncement.java
NodeMessage.java QueryAborted.java QueryRejected.java
QueryRestarted.java Request.java StoreData.java
VoidMessage.java
Log Message:
6276:
Fix major bug in 6275; make Message.toRawMessage(Presentation,PeerHandler) be the one
and only toRawMessage method, to prevent horrible confusion problems we had. Change
all messages to implement it, all uses to use it.
Logging.
Index: Accepted.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Accepted.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- Accepted.java 9 Oct 2003 00:23:39 -0000 1.3
+++ Accepted.java 24 Oct 2003 02:24:57 -0000 1.4
@@ -21,8 +21,8 @@
super(source, raw);
}
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw = super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage raw = super.toRawMessage(t,ph);
//raw.messageType=messageName;
return raw;
}
Index: AnnouncementComplete.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementComplete.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AnnouncementComplete.java 9 Oct 2003 00:23:39 -0000 1.3
+++ AnnouncementComplete.java 24 Oct 2003 02:24:57 -0000 1.4
@@ -30,8 +30,8 @@
in = (raw.trailingFieldLength == 0 ? null : raw.trailingFieldStream);
}
- public RawMessage toRawMessage(Presentation p) {
- RawMessage raw = super.toRawMessage(p);
+ public RawMessage toRawMessage(Presentation p, PeerHandler ph) {
+ RawMessage raw = super.toRawMessage(p,ph);
//raw.messageType = messageName;
raw.trailingFieldName = "Keys";
raw.trailingFieldLength = keys.streamLength();
Index: AnnouncementExecute.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementExecute.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AnnouncementExecute.java 9 Oct 2003 00:23:39 -0000 1.3
+++ AnnouncementExecute.java 24 Oct 2003 02:24:57 -0000 1.4
@@ -46,8 +46,8 @@
in = raw.trailingFieldStream;
}
- public RawMessage toRawMessage(Presentation p) {
- RawMessage raw = super.toRawMessage(p);
+ public RawMessage toRawMessage(Presentation p, PeerHandler ph) {
+ RawMessage raw = super.toRawMessage(p,ph);
////raw.messageType = messageName;
raw.fs.add("RefSignature", refSignature);
raw.trailingFieldName = "Values";
Index: AnnouncementFailed.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementFailed.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- AnnouncementFailed.java 18 Oct 2003 00:17:56 -0000 1.7
+++ AnnouncementFailed.java 24 Oct 2003 02:24:57 -0000 1.8
@@ -61,8 +61,8 @@
}
}
- public RawMessage toRawMessage(Presentation p) {
- RawMessage raw = super.toRawMessage(p);
+ public RawMessage toRawMessage(Presentation p, PeerHandler ph) {
+ RawMessage raw = super.toRawMessage(p,ph);
//raw.messageType = messageName;
raw.fs.add("Reason",Fields.longToHex(reason));
Index: AnnouncementReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementReply.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AnnouncementReply.java 9 Oct 2003 00:23:39 -0000 1.3
+++ AnnouncementReply.java 24 Oct 2003 02:24:58 -0000 1.4
@@ -37,8 +37,8 @@
}
}
- public RawMessage toRawMessage(Presentation p) {
- RawMessage raw = super.toRawMessage(p);
+ public RawMessage toRawMessage(Presentation p, PeerHandler ph) {
+ RawMessage raw = super.toRawMessage(p,ph);
//raw.messageType = messageName;
raw.fs.add("ReturnValue",Fields.bytesToHex(returnVal));
return raw;
Index: DataInsert.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataInsert.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- DataInsert.java 4 Jul 2003 06:33:00 -0000 1.2
+++ DataInsert.java 24 Oct 2003 02:24:58 -0000 1.3
@@ -46,8 +46,8 @@
super(source, raw);
}
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw=super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage raw=super.toRawMessage(t,ph);
//raw.messageType="DataInsert";
// System.out.println(raw.toString());
return raw;
Index: DataNotFound.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataNotFound.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- DataNotFound.java 9 Oct 2003 00:23:39 -0000 1.4
+++ DataNotFound.java 24 Oct 2003 02:24:58 -0000 1.5
@@ -43,8 +43,8 @@
}
}
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw=super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage raw=super.toRawMessage(t,ph);
raw.fs.add("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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- DataReply.java 4 Jul 2003 06:39:34 -0000 1.4
+++ DataReply.java 24 Oct 2003 02:24:58 -0000 1.5
@@ -53,8 +53,8 @@
else initException = null;
}
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw=super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage raw=super.toRawMessage(t,ph);
//raw.messageType="DataReply";
return raw;
}
Index: DataRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataRequest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- DataRequest.java 17 Oct 2003 23:01:59 -0000 1.7
+++ DataRequest.java 24 Oct 2003 02:24:58 -0000 1.8
@@ -37,8 +37,8 @@
super(source, raw);
}
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw=super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage raw=super.toRawMessage(t,ph);
//raw.messageType="DataRequest";
return raw;
}
Index: DataSend.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataSend.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- DataSend.java 9 Oct 2003 00:23:40 -0000 1.8
+++ DataSend.java 24 Oct 2003 02:24:58 -0000 1.9
@@ -64,8 +64,8 @@
return length;
}
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw=super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage raw=super.toRawMessage(t,ph);
// this was screwing the sending of DataReply because
// the trailing field length wasn't getting filled in
Index: Identify.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Identify.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- Identify.java 23 Oct 2003 18:47:55 -0000 1.5
+++ Identify.java 24 Oct 2003 02:24:58 -0000 1.6
@@ -33,8 +33,8 @@
otherFields.remove("Source");
}
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw=super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage raw=super.toRawMessage(t, ph);
raw.fs.add("Source", sourceRef.getFieldSet(false));
return raw;
}
Index: InsertReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/InsertReply.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- InsertReply.java 9 Oct 2003 00:23:40 -0000 1.3
+++ InsertReply.java 24 Oct 2003 02:24:58 -0000 1.4
@@ -17,8 +17,8 @@
super(source, raw);
}
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw=super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage raw=super.toRawMessage(t,ph);
// //raw.messageType="InsertReply";
return raw;
}
Index: InsertRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/InsertRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- InsertRequest.java 17 Oct 2003 23:01:59 -0000 1.3
+++ InsertRequest.java 24 Oct 2003 02:24:58 -0000 1.4
@@ -40,8 +40,8 @@
return new NewInsertRequest(id);
}
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw=super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage raw=super.toRawMessage(t,ph);
//raw.messageType="InsertRequest";
return raw;
}
Index: NodeAnnouncement.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/NodeAnnouncement.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- NodeAnnouncement.java 18 Oct 2003 00:17:56 -0000 1.6
+++ NodeAnnouncement.java 24 Oct 2003 02:24:58 -0000 1.7
@@ -85,8 +85,8 @@
otherFields.remove("CommitValue");
}
- public RawMessage toRawMessage(Presentation p) {
- RawMessage raw = super.toRawMessage(p);
+ 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));
Index: NodeMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/NodeMessage.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- NodeMessage.java 18 Oct 2003 00:17:56 -0000 1.7
+++ NodeMessage.java 24 Oct 2003 02:24:58 -0000 1.8
@@ -113,8 +113,8 @@
/** Converts this message to something that can be sent over the wire,
* using the given Presentation.
*/
- public RawMessage toRawMessage(Presentation t) {
- RawMessage r = super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage r = super.toRawMessage(t,ph);
r.fs.add("UniqueID", Fields.longToHex(id));
// do heisenbug testing
long test = Fields.hexToLong(Fields.longToHex(id));
Index: QueryAborted.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryAborted.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- QueryAborted.java 9 Oct 2003 00:23:40 -0000 1.3
+++ QueryAborted.java 24 Oct 2003 02:24:58 -0000 1.4
@@ -18,8 +18,8 @@
// keepAlive = false;
}
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw=super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage raw=super.toRawMessage(t,ph);
//raw.messageType=messageName;
return raw;
}
Index: QueryRejected.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryRejected.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- QueryRejected.java 18 Oct 2003 00:17:56 -0000 1.9
+++ QueryRejected.java 24 Oct 2003 02:24:58 -0000 1.10
@@ -107,8 +107,8 @@
// Public Methods
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw=super.toRawMessage(t);
+ 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));
if (reason != null)
Index: QueryRestarted.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryRestarted.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- QueryRestarted.java 9 Oct 2003 00:23:40 -0000 1.3
+++ QueryRestarted.java 24 Oct 2003 02:24:58 -0000 1.4
@@ -27,8 +27,8 @@
}
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw=super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage raw=super.toRawMessage(t,ph);
//raw.messageType="QueryRestarted";
raw.trailingFieldName="EndMessage";
return raw;
Index: Request.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Request.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- Request.java 23 Oct 2003 18:47:55 -0000 1.15
+++ Request.java 24 Oct 2003 02:24:58 -0000 1.16
@@ -73,19 +73,17 @@
otherFields.remove("Source");
}
- public RawMessage toRawMessage(Presentation t, ConnectionHandler ch) {
- return toRawMessage(t, ch, null);
- }
-
- public RawMessage toRawMessage(Presentation t, ConnectionHandler ch, PeerHandler
ph) {
- RawMessage raw=super.toRawMessage(t,ch);
+ 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));
- if(ch != null && ph != null && ph.getReference() != null) {
+ if(ph != null && ph.getReference() != null) {
// We have received Identify from them, so they will have ours too
} else {
Core.logger.log(this, "Putting Source on message: "+this+
- " in toRawMessage("+t+","+ch+")",
+ " in toRawMessage("+t+","+ph+"): "+
+ requestSource+":"+
+ requestSource.getFieldSet(false),
new Exception("debug"), Logger.MINOR);
raw.fs.add("Source", requestSource.getFieldSet(false));
}
Index: StoreData.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/StoreData.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- StoreData.java 18 Oct 2003 00:17:56 -0000 1.10
+++ StoreData.java 24 Oct 2003 02:24:58 -0000 1.11
@@ -72,8 +72,8 @@
}
}
- public RawMessage toRawMessage(Presentation t) {
- RawMessage raw = super.toRawMessage(t);
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
+ RawMessage raw = super.toRawMessage(t,ph);
if (dataSource != null) {
raw.fs.add("DataSource", dataSource.getFieldSet());
}
Index: VoidMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/VoidMessage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- VoidMessage.java 9 Oct 2003 00:23:40 -0000 1.3
+++ VoidMessage.java 24 Oct 2003 02:24:58 -0000 1.4
@@ -58,8 +58,8 @@
}
}
- public RawMessage toRawMessage(Presentation p) {
- RawMessage r = super.toRawMessage(p);
+ public RawMessage toRawMessage(Presentation p, PeerHandler ph) {
+ RawMessage r = super.toRawMessage(p,ph);
r.messageType = messageName;
r.close = close;
r.sustain = sustain;
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
