Update of /cvsroot/freenet/freenet/src/freenet/message
In directory sc8-pr-cvs1:/tmp/cvs-serv16753/src/freenet/message
Modified Files:
Accepted.java AnnouncementComplete.java
AnnouncementExecute.java AnnouncementFailed.java
AnnouncementReply.java DataNotFound.java DataRequest.java
DataSend.java Identify.java InsertReply.java
NodeAnnouncement.java QueryAborted.java QueryRejected.java
QueryRestarted.java Request.java StoreData.java
VoidMessage.java
Log Message:
6224:
More debugging of PeerHandler and supporting microarchitectural changes.
- Splitfile fetch between 2 test nodes works again, rather than failing with RNFs.
- Fix totalDataSent i.e. fix OCM's report of total data sent on a conn
- Encrypt data at send time. Not in advance in packet.
- Locking changes.
- Add hasTrailer() to Message. Implement it on all Messages.
- Make a distinction between needsConnection as in can we route to it, or do we want a
new connection if possible.
- Keep separate queues for messages with and without trailers in PeerHandler.
- Messages without trailers take priority.
- needConnection(true) returns false if we have no messages queued and no trailers
sending and we are not in the RT.
- Remove closed conns from the PeerHandler when we find them. They will still be in
the OCM.
- SendData: Count size of padding sent the same way we count the non-padding - don't
add it on and therefore don't finish until after we have sent it.
Add a TODO about the data: protocol
- Cancel outwardSender callback in Pending after we get Accepted. We may have a bug
causing notifications to be lost.
- Fix possible NPE in FnpLink.encryptBytes.
Logging
Also some fixes and optimizations since 6223 by other people.
Index: Accepted.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Accepted.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Accepted.java 13 Jan 2002 05:24:37 -0000 1.1.1.1
+++ Accepted.java 8 Oct 2003 22:54:18 -0000 1.2
@@ -31,5 +31,7 @@
return messageName;
}
-
+ public final boolean hasTrailer() {
+ return false;
+ }
}
Index: AnnouncementComplete.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementComplete.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- AnnouncementComplete.java 13 Jan 2002 05:24:38 -0000 1.1.1.1
+++ AnnouncementComplete.java 8 Oct 2003 22:54:18 -0000 1.2
@@ -40,7 +40,11 @@
return raw;
}
-
+
+ public boolean hasTrailer() {
+ return keys.streamLength() != 0;
+ }
+
public String getMessageName() {
return messageName;
}
Index: AnnouncementExecute.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementExecute.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- AnnouncementExecute.java 13 Jan 2002 05:24:38 -0000 1.1.1.1
+++ AnnouncementExecute.java 8 Oct 2003 22:54:18 -0000 1.2
@@ -56,7 +56,11 @@
return raw;
}
-
+
+ public boolean hasTrailer() {
+ return vals.streamLength() != 0;
+ }
+
public String getMessageName() {
return messageName;
}
Index: AnnouncementFailed.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementFailed.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AnnouncementFailed.java 30 Jun 2003 14:30:16 -0000 1.4
+++ AnnouncementFailed.java 8 Oct 2003 22:54:18 -0000 1.5
@@ -68,7 +68,11 @@
return raw;
}
-
+
+ public boolean hasTrailer() {
+ return false;
+ }
+
public String getMessageName() {
return messageName;
}
Index: AnnouncementReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/AnnouncementReply.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- AnnouncementReply.java 13 Jan 2002 05:24:38 -0000 1.1.1.1
+++ AnnouncementReply.java 8 Oct 2003 22:54:18 -0000 1.2
@@ -43,7 +43,11 @@
raw.fs.add("ReturnValue",Fields.bytesToHex(returnVal));
return raw;
}
-
+
+ public boolean hasTrailer() {
+ return false;
+ }
+
public String getMessageName() {
return messageName;
}
Index: DataNotFound.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataNotFound.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DataNotFound.java 1 Apr 2002 21:51:14 -0000 1.2
+++ DataNotFound.java 8 Oct 2003 22:54:18 -0000 1.3
@@ -49,7 +49,11 @@
Fields.longToHex(System.currentTimeMillis() - timeOfQuery));
return raw;
}
-
+
+ public boolean hasTrailer() {
+ return false;
+ }
+
public String getMessageName() {
return messageName;
}
Index: DataRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DataRequest.java 8 Sep 2003 17:03:04 -0000 1.4
+++ DataRequest.java 8 Oct 2003 22:54:18 -0000 1.5
@@ -42,7 +42,11 @@
//raw.messageType="DataRequest";
return raw;
}
-
+
+ public final boolean hasTrailer() {
+ return false;
+ }
+
public String getMessageName() {
return messageName;
}
Index: DataSend.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/DataSend.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DataSend.java 18 Sep 2003 17:48:08 -0000 1.6
+++ DataSend.java 8 Oct 2003 22:54:18 -0000 1.7
@@ -55,7 +55,11 @@
+ "be specified");
logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
}
-
+
+ public boolean hasTrailer() {
+ return length != 0;
+ }
+
public RawMessage toRawMessage(Presentation t) {
RawMessage raw=super.toRawMessage(t);
Index: Identify.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Identify.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Identify.java 15 Aug 2003 00:12:05 -0000 1.1
+++ Identify.java 8 Oct 2003 22:54:18 -0000 1.2
@@ -39,6 +39,10 @@
return raw;
}
+ public final boolean hasTrailer() {
+ return false;
+ }
+
public String getMessageName() {
return messageName;
}
Index: InsertReply.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/InsertReply.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- InsertReply.java 13 Jan 2002 05:24:38 -0000 1.1.1.1
+++ InsertReply.java 8 Oct 2003 22:54:18 -0000 1.2
@@ -22,7 +22,11 @@
// //raw.messageType="InsertReply";
return raw;
}
-
+
+ public final boolean hasTrailer() {
+ return false;
+ }
+
public String getMessageName() {
return messageName;
}
Index: NodeAnnouncement.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/NodeAnnouncement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NodeAnnouncement.java 2 Jul 2002 07:42:55 -0000 1.3
+++ NodeAnnouncement.java 8 Oct 2003 22:54:18 -0000 1.4
@@ -96,7 +96,11 @@
return raw;
}
-
+
+ public final boolean hasTrailer() {
+ return false;
+ }
+
public String getMessageName() {
return messageName;
}
Index: QueryAborted.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryAborted.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- QueryAborted.java 13 Jan 2002 05:24:39 -0000 1.1.1.1
+++ QueryAborted.java 8 Oct 2003 22:54:18 -0000 1.2
@@ -23,7 +23,11 @@
//raw.messageType=messageName;
return raw;
}
-
+
+ public final boolean hasTrailer() {
+ return false;
+ }
+
public String getMessageName() {
return messageName;
}
Index: QueryRejected.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryRejected.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- QueryRejected.java 22 Jul 2003 02:11:21 -0000 1.6
+++ QueryRejected.java 8 Oct 2003 22:54:18 -0000 1.7
@@ -116,7 +116,11 @@
//raw.messageType=messageName;
return raw;
}
-
+
+ public boolean hasTrailer() {
+ return false;
+ }
+
public int hopsToLive() {
return (int) hopsToLive;
}
Index: QueryRestarted.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/QueryRestarted.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- QueryRestarted.java 13 Jan 2002 05:24:39 -0000 1.1.1.1
+++ QueryRestarted.java 8 Oct 2003 22:54:18 -0000 1.2
@@ -33,7 +33,11 @@
raw.trailingFieldName="EndMessage";
return raw;
}
-
+
+ public boolean hasTrailer() {
+ return false;
+ }
+
public String getMessageName() {
return messageName;
}
Index: Request.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/Request.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Request.java 15 Aug 2003 00:21:49 -0000 1.7
+++ Request.java 8 Oct 2003 22:54:18 -0000 1.8
@@ -75,6 +75,10 @@
return raw;
}
+ public boolean hasTrailer() {
+ return false;
+ }
+
public int hopsToLive() {
return (int) hopsToLive;
}
Index: StoreData.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/StoreData.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StoreData.java 19 Apr 2003 20:20:13 -0000 1.7
+++ StoreData.java 8 Oct 2003 22:54:18 -0000 1.8
@@ -84,6 +84,10 @@
return raw;
}
+ public final boolean hasTrailer() {
+ return false;
+ }
+
public int hopsSinceReset() {
return hopsSinceReset;
}
Index: VoidMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/VoidMessage.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- VoidMessage.java 13 Jan 2002 05:24:39 -0000 1.1.1.1
+++ VoidMessage.java 8 Oct 2003 22:54:18 -0000 1.2
@@ -69,7 +69,11 @@
}
return r;
}
-
+
+ public boolean hasTrailer() {
+ return dataLength > 0;
+ }
+
public String getMessageName() {
return messageName;
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
