Update of /cvsroot/freenet/freenet/src/freenet/message/client
In directory sc8-pr-cvs1:/tmp/cvs-serv25857/src/freenet/message/client
Modified Files:
Tag: stable
ClientGet.java ClientHello.java ClientInfo.java
ClientMessage.java ClientPut.java DataChunk.java
GenerateCHK.java GenerateSHA1.java GenerateSVKPair.java
GetDiagnostics.java GetSize.java Illegal.java
InvertPrivateKey.java
Log Message:
5029: Merge from unstable after months of work. MASSIVE changes.
Highlights:
* Next Generation Routing, massive related changes
* Major changes to handling of messages and connections (PeerHandler and related
changes)
* Even more non-blocking I/O
* Documentation improvements
* Lots of new diagnostics and config options
* Lots of bug fixes and performance tweaking
* Probably lots of new bugs too!
Index: ClientGet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/ClientGet.java,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -w -r1.2 -r1.2.6.1
--- ClientGet.java 26 Jul 2002 23:26:11 -0000 1.2
+++ ClientGet.java 28 Oct 2003 20:20:35 -0000 1.2.6.1
@@ -40,8 +40,8 @@
public State getInitialState() {
return formatError
- ? (State) new NewIllegal(id, source, "Error parsing ClientGet message.")
- : (State) new NewClientGet(id, source, metadataHint, uri, timeSec);
+ ? (State) new NewIllegal(id, source.getPeerHandler(), "Error parsing
ClientGet message.")
+ : (State) new NewClientGet(id, source.getPeerHandler(), metadataHint,
uri, timeSec);
}
public String getMessageName() {
Index: ClientHello.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/ClientHello.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -w -r1.1.1.1 -r1.1.1.1.6.1
--- ClientHello.java 13 Jan 2002 05:24:39 -0000 1.1.1.1
+++ ClientHello.java 28 Oct 2003 20:20:35 -0000 1.1.1.1.6.1
@@ -16,8 +16,8 @@
public State getInitialState() {
return formatError
- ? (State) new NewIllegal(id, source, "Error parsing ClientHello message.")
- : (State) new NewHello(id, source);
+ ? (State) new NewIllegal(id, source.getPeerHandler(), "Error parsing
ClientHello message.")
+ : (State) new NewHello(id, source.getPeerHandler());
}
public String getMessageName() {
Index: ClientInfo.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/ClientInfo.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -w -r1.1.2.1 -r1.1.2.1.2.1
--- ClientInfo.java 28 Jan 2003 22:58:00 -0000 1.1.2.1
+++ ClientInfo.java 28 Oct 2003 20:20:35 -0000 1.1.2.1.2.1
@@ -16,8 +16,8 @@
public State getInitialState() {
return formatError
- ? (State) new NewIllegal(id, source, "Error parsing ClientInfo message.")
- : (State) new NewInfo(id, source);
+ ? (State) new NewIllegal(id, source.getPeerHandler(), "Error parsing
ClientInfo message.")
+ : (State) new NewInfo(id, source.getPeerHandler());
}
public String getMessageName() {
Index: ClientMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/ClientMessage.java,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -w -r1.2 -r1.2.6.1
--- ClientMessage.java 9 Aug 2002 03:01:46 -0000 1.2
+++ ClientMessage.java 28 Oct 2003 20:20:35 -0000 1.2.6.1
@@ -16,18 +16,21 @@
protected long dataLength = 0, metaLength = 0;
protected InputStream data;
- protected boolean formatError = false, close = true;
+ protected boolean formatError = false;
public ClientMessage(long id) {
super(id, null);
+ close=true;
}
public ClientMessage(long id, FieldSet fs) {
super(id, fs);
+ close=true;
}
public ClientMessage(long id, String reason) {
super(id, new FieldSet());
+ close=true;
if (reason != null) otherFields.put("Reason", reason);
}
@@ -36,14 +39,14 @@
}
public ClientMessage(ConnectionHandler source, RawMessage raw, boolean getData) {
- super(source, Core.randSource.nextLong(), raw);
+ super(source, Core.getRandSource().nextLong(), raw);
try {
if (getData && "Data".equals(raw.trailingFieldName)
&& raw.trailingFieldLength != 0) {
dataLength = raw.trailingFieldLength;
data = raw.trailingFieldStream;
String metas = otherFields.get("MetadataLength");
- metaLength = metas == null ? 0 : Fields.stringToLong(metas);
+ metaLength = metas == null ? 0 : Fields.hexToLong(metas);
otherFields.remove("MetadataLength");
}
else {
@@ -61,10 +64,11 @@
}
public String toString() {
- return "freenet.Message: " + getMessageName() + " @" + Long.toHexString(id);
+ return "freenet.Message: "+Integer.toHexString(super.hashCode())+
+ ": " + getMessageName() + " @" + Long.toHexString(id);
}
- public RawMessage toRawMessage(Presentation t) {
+ public RawMessage toRawMessage(Presentation t, PeerHandler ph) {
RawMessage raw = t.newMessage( getMessageName(), close, true,
otherFields, 0, "EndMessage", null );
if (dataLength > 0) {
@@ -74,6 +78,14 @@
return raw;
}
+ public boolean hasTrailer() {
+ return dataLength > 0;
+ }
+
+ public final long trailerLength() {
+ return getDataLength();
+ }
+
public long getDataLength() {
return dataLength;
}
Index: ClientPut.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/ClientPut.java,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -w -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- ClientPut.java 15 Feb 2003 04:13:00 -0000 1.1.1.1.4.1
+++ ClientPut.java 28 Oct 2003 20:20:35 -0000 1.1.1.1.4.1.2.1
@@ -19,11 +19,11 @@
public State getInitialState() {
if (!Node.fcpInserts)
- return (State) new NewIllegal(id, source,
+ return (State) new NewIllegal(id, source.getPeerHandler(),
"FCP inserts have been disabled with the fcpInserts option.");
return formatError
- ? (State) new NewIllegal(id, source, "Error parsing ClientPut message.")
- : (State) new NewClientPut(id, source);
+ ? (State) new NewIllegal(id, source.getPeerHandler(), "Error parsing
ClientPut message.")
+ : (State) new NewClientPut(id, source.getPeerHandler());
}
public String getMessageName() {
Index: DataChunk.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/DataChunk.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -w -r1.1.1.1 -r1.1.1.1.6.1
--- DataChunk.java 13 Jan 2002 05:24:39 -0000 1.1.1.1
+++ DataChunk.java 28 Oct 2003 20:20:35 -0000 1.1.1.1.6.1
@@ -14,6 +14,9 @@
super(id);
dataLength = chunkSize;
this.close = close;
+ Core.logger.log(this, "Creating "+this+" ("+Long.toHexString(id)+
+ ","+chunkSize+","+close+")", new Exception("debug"),
+ Core.logger.MINOR);
}
public String getMessageName() {
Index: GenerateCHK.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/GenerateCHK.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -w -r1.1.1.1 -r1.1.1.1.6.1
--- GenerateCHK.java 13 Jan 2002 05:24:39 -0000 1.1.1.1
+++ GenerateCHK.java 28 Oct 2003 20:20:35 -0000 1.1.1.1.6.1
@@ -17,8 +17,8 @@
public State getInitialState() {
return formatError
- ? (State) new NewIllegal(id, source, "Error parsing GenerateCHK message.")
- : (State) new NewGenerateCHK(id, source);
+ ? (State) new NewIllegal(id, source.getPeerHandler(), "Error parsing
GenerateCHK message.")
+ : (State) new NewGenerateCHK(id, source.getPeerHandler());
}
public String getMessageName() {
Index: GenerateSHA1.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/GenerateSHA1.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -w -r1.1.2.1 -r1.1.2.1.2.1
--- GenerateSHA1.java 24 Jan 2003 23:49:52 -0000 1.1.2.1
+++ GenerateSHA1.java 28 Oct 2003 20:20:35 -0000 1.1.2.1.2.1
@@ -17,8 +17,8 @@
public State getInitialState() {
return formatError
- ? (State) new NewIllegal(id, source, "Error parsing GenerateSHA1
message.")
- : (State) new NewGenerateSHA1(id, source);
+ ? (State) new NewIllegal(id, source.getPeerHandler(), "Error parsing
GenerateSHA1 message.")
+ : (State) new NewGenerateSHA1(id, source.getPeerHandler());
}
public String getMessageName() {
Index: GenerateSVKPair.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/GenerateSVKPair.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -w -r1.1.1.1 -r1.1.1.1.6.1
--- GenerateSVKPair.java 13 Jan 2002 05:24:39 -0000 1.1.1.1
+++ GenerateSVKPair.java 28 Oct 2003 20:20:35 -0000 1.1.1.1.6.1
@@ -16,8 +16,8 @@
public State getInitialState() {
return formatError
- ? (State) new NewIllegal(id, source, "Error parsing GenerateSVKPair
message.")
- : (State) new NewGenerateSVKPair(id, source);
+ ? (State) new NewIllegal(id, source.getPeerHandler(), "Error parsing
GenerateSVKPair message.")
+ : (State) new NewGenerateSVKPair(id, source.getPeerHandler());
}
public String getMessageName() {
Index: GetDiagnostics.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/GetDiagnostics.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -w -r1.1.1.1 -r1.1.1.1.6.1
--- GetDiagnostics.java 13 Jan 2002 05:24:39 -0000 1.1.1.1
+++ GetDiagnostics.java 28 Oct 2003 20:20:35 -0000 1.1.1.1.6.1
@@ -19,11 +19,11 @@
public State getInitialState() {
return (formatError ?
- (State) new NewIllegal(id, source,
+ (State) new NewIllegal(id, source.getPeerHandler(),
"Error parsing GetDiagnostics message."):
(isAuthorized() ?
- (State) new ReturnDiagnostics(id, source) :
- (State) new NewIllegal(id, source,
+ (State) new ReturnDiagnostics(id, source.getPeerHandler()) :
+ (State) new NewIllegal(id, source.getPeerHandler(),
"Authorization failed")));
}
Index: GetSize.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/GetSize.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -r1.1.2.1 -r1.1.2.2
--- GetSize.java 23 Jul 2003 01:56:51 -0000 1.1.2.1
+++ GetSize.java 28 Oct 2003 20:20:35 -0000 1.1.2.2
@@ -16,9 +16,9 @@
public State getInitialState() {
return formatError ?
- (State) new NewIllegal(id, source,
+ (State) new NewIllegal(id, source.getPeerHandler(),
"Error parsing GetSize message.") :
- (State) new NewGetSize(id, source);
+ (State) new NewGetSize(id, source.getPeerHandler());
}
public String getMessageName() {
Index: Illegal.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/Illegal.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -w -r1.1.1.1 -r1.1.1.1.6.1
--- Illegal.java 13 Jan 2002 05:24:39 -0000 1.1.1.1
+++ Illegal.java 28 Oct 2003 20:20:35 -0000 1.1.1.1.6.1
@@ -14,7 +14,7 @@
}
public State getInitialState() throws BadStateException {
- return new NewIllegal(id, source);
+ return new NewIllegal(id, source.getPeerHandler());
}
public String getMessageName() {
Index: InvertPrivateKey.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/message/client/InvertPrivateKey.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -r1.1.2.1 -r1.1.2.2
--- InvertPrivateKey.java 11 Apr 2003 00:01:35 -0000 1.1.2.1
+++ InvertPrivateKey.java 28 Oct 2003 20:20:35 -0000 1.1.2.2
@@ -33,8 +33,8 @@
public State getInitialState() {
return formatError
- ? (State) new NewIllegal(id, source, "Error parsing InvertPrivateKey
message.")
- : (State) new NewInvertPrivateKey(id, source);
+ ? (State) new NewIllegal(id, source.getPeerHandler(), "Error parsing
InvertPrivateKey message.")
+ : (State) new NewInvertPrivateKey(id, source.getPeerHandler());
}
public String getMessageName() {
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
