Update of /cvsroot/freenet/freenet/src/freenet/message
In directory sc8-pr-cvs1:/tmp/cvs-serv9444/src/freenet/message
Modified Files:
NodeAnnouncement.java NodeMessage.java QueryRejected.java
Request.java Identify.java StoreData.java DataNotFound.java
AnnouncementExecute.java AnnouncementReply.java
AnnouncementFailed.java
Log Message:
some completely trivial code housekeeping
Index: NodeAnnouncement.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/NodeAnnouncement.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- NodeAnnouncement.java 24 Oct 2003 02:24:58 -0000 1.7
+++ NodeAnnouncement.java 30 Oct 2003 15:27:38 -0000 1.8
@@ -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.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- NodeMessage.java 30 Oct 2003 01:34:01 -0000 1.10
+++ NodeMessage.java 30 Oct 2003 15:27:38 -0000 1.11
@@ -121,7 +121,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)) {
Index: QueryRejected.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryRejected.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- QueryRejected.java 30 Oct 2003 01:34:02 -0000 1.11
+++ QueryRejected.java 30 Oct 2003 15:27:38 -0000 1.12
@@ -113,10 +113,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: Request.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Request.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- Request.java 30 Oct 2003 01:34:02 -0000 1.18
+++ Request.java 30 Oct 2003 15:27:38 -0000 1.19
@@ -84,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 {
@@ -94,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: Identify.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Identify.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- Identify.java 30 Oct 2003 01:34:01 -0000 1.8
+++ Identify.java 30 Oct 2003 15:27:38 -0000 1.9
@@ -42,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: StoreData.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/StoreData.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- StoreData.java 30 Oct 2003 01:34:01 -0000 1.12
+++ StoreData.java 30 Oct 2003 15:27:38 -0000 1.13
@@ -80,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: DataNotFound.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataNotFound.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- DataNotFound.java 30 Oct 2003 01:34:01 -0000 1.6
+++ DataNotFound.java 30 Oct 2003 15:27:38 -0000 1.7
@@ -47,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: AnnouncementExecute.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementExecute.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- AnnouncementExecute.java 30 Oct 2003 01:34:02 -0000 1.5
+++ AnnouncementExecute.java 30 Oct 2003 15:27:38 -0000 1.6
@@ -53,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: AnnouncementReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementReply.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- AnnouncementReply.java 24 Oct 2003 02:24:58 -0000 1.4
+++ AnnouncementReply.java 30 Oct 2003 15:27:38 -0000 1.5
@@ -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: AnnouncementFailed.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementFailed.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- AnnouncementFailed.java 24 Oct 2003 02:24:57 -0000 1.8
+++ AnnouncementFailed.java 30 Oct 2003 15:27:38 -0000 1.9
@@ -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;
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
