Update of /cvsroot/freenet/freenet/src/freenet/node/states/FCP
In directory sc8-pr-cvs1:/tmp/cvs-serv11501/src/freenet/node/states/FCP
Modified Files:
ClientGetToken.java ClientPutToken.java FCPFeedbackToken.java
NewClientGet.java NewClientPut.java NewClientRequest.java
NewFECDecodeSegment.java NewFECEncodeSegment.java
NewFECMakeMetadata.java NewFECSegmentFile.java
NewFECSegmentSplitFile.java NewGenerateCHK.java
NewGenerateSHA1.java NewGenerateSVKPair.java NewGetSize.java
NewHello.java NewIllegal.java NewInfo.java
NewInvertPrivateKey.java ReturnDiagnostics.java
Log Message:
6217:
Implement PeerHandler. Web interface works. FCP does not work. Probably has
significant bugs. This is unstable after all... and others may want to look at it.
Index: ClientGetToken.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/ClientGetToken.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ClientGetToken.java 19 Sep 2003 02:20:22 -0000 1.10
+++ ClientGetToken.java 4 Oct 2003 01:16:58 -0000 1.11
@@ -31,7 +31,7 @@
// FIXME: convert to fully async
- ClientGetToken(long id, ConnectionHandler source, ClientKey ckey,
+ ClientGetToken(long id, PeerHandler source, ClientKey ckey,
boolean sendHint, FreenetURI uri, long timeSec,
BucketFactory bf) {
super(id, source);
Index: ClientPutToken.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/ClientPutToken.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClientPutToken.java 18 Sep 2003 17:48:10 -0000 1.5
+++ ClientPutToken.java 4 Oct 2003 01:16:59 -0000 1.6
@@ -14,11 +14,11 @@
private String uri, priv, pub;
private boolean keyCollision = false;
- ClientPutToken(long id, ConnectionHandler source, String uri) {
+ ClientPutToken(long id, PeerHandler source, String uri) {
this(id, source, uri, null, null);
}
- ClientPutToken(long id, ConnectionHandler source,
+ ClientPutToken(long id, PeerHandler source,
String uri, String priv, String pub) {
super(id, source);
this.uri = uri;
Index: FCPFeedbackToken.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/FCPFeedbackToken.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FCPFeedbackToken.java 18 Sep 2003 17:48:10 -0000 1.6
+++ FCPFeedbackToken.java 4 Oct 2003 01:17:00 -0000 1.7
@@ -13,12 +13,12 @@
// the id of the associated state chain
long id;
- // the active connection
- protected ConnectionHandler source;
+ // the active connection (message queue)
+ protected PeerHandler source;
protected boolean waiting = true;
- FCPFeedbackToken(long id, ConnectionHandler source) {
+ FCPFeedbackToken(long id, PeerHandler source) {
this.id = id;
this.source = source;
}
Index: NewClientGet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewClientGet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NewClientGet.java 4 Apr 2003 02:11:04 -0000 1.8
+++ NewClientGet.java 4 Oct 2003 01:17:00 -0000 1.9
@@ -18,7 +18,7 @@
private FreenetURI uri = null;
private long timeSec = -1;
- public NewClientGet(long id, ConnectionHandler source,
+ public NewClientGet(long id, PeerHandler source,
boolean sendHint, FreenetURI uri,
long timeSec) {
super(id, source);
Index: NewClientPut.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewClientPut.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NewClientPut.java 19 Jun 2003 13:31:20 -0000 1.8
+++ NewClientPut.java 4 Oct 2003 01:17:00 -0000 1.9
@@ -18,7 +18,7 @@
public class NewClientPut extends NewClientRequest {
- public NewClientPut(long id, ConnectionHandler source) {
+ public NewClientPut(long id, PeerHandler source) {
super(id, source);
}
Index: NewClientRequest.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewClientRequest.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- NewClientRequest.java 13 Jan 2002 05:24:47 -0000 1.1.1.1
+++ NewClientRequest.java 4 Oct 2003 01:17:01 -0000 1.2
@@ -8,9 +8,9 @@
public abstract class NewClientRequest extends State {
- protected ConnectionHandler source;
+ protected PeerHandler source;
- protected NewClientRequest(long id, ConnectionHandler source) {
+ protected NewClientRequest(long id, PeerHandler source) {
super(id);
this.source = source;
}
Index: NewFECDecodeSegment.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECDecodeSegment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NewFECDecodeSegment.java 4 Jul 2003 06:15:39 -0000 1.4
+++ NewFECDecodeSegment.java 4 Oct 2003 01:17:01 -0000 1.5
@@ -14,7 +14,7 @@
public class NewFECDecodeSegment extends NewClientRequest {
- public NewFECDecodeSegment(long id, ConnectionHandler source) {
+ public NewFECDecodeSegment(long id, PeerHandler source) {
super(id, source);
}
Index: NewFECEncodeSegment.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECEncodeSegment.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NewFECEncodeSegment.java 18 Sep 2003 17:48:10 -0000 1.6
+++ NewFECEncodeSegment.java 4 Oct 2003 01:17:02 -0000 1.7
@@ -16,7 +16,7 @@
public class NewFECEncodeSegment extends NewClientRequest {
- public NewFECEncodeSegment(long id, ConnectionHandler source) {
+ public NewFECEncodeSegment(long id, PeerHandler source) {
super(id, source);
}
@@ -211,7 +211,7 @@
// REDFLAG: test!
// REDFLAG: move
- protected static void sendDataChunks(ConnectionHandler source, long id,
+ protected static void sendDataChunks(PeerHandler source, long id,
Bucket[] data, long length, int chunkSize)
throws IOException {
@@ -267,7 +267,7 @@
}
}
- protected static void sendChunk(ConnectionHandler source, long id,
+ protected static void sendChunk(PeerHandler source, long id,
byte[] buffer, long size, boolean close)
throws IOException {
Index: NewFECMakeMetadata.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECMakeMetadata.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NewFECMakeMetadata.java 19 Jan 2003 07:37:26 -0000 1.3
+++ NewFECMakeMetadata.java 4 Oct 2003 01:17:02 -0000 1.4
@@ -13,7 +13,7 @@
public class NewFECMakeMetadata extends NewClientRequest {
- public NewFECMakeMetadata(long id, ConnectionHandler source) {
+ public NewFECMakeMetadata(long id, PeerHandler source) {
super(id, source);
}
Index: NewFECSegmentFile.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECSegmentFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewFECSegmentFile.java 14 Sep 2002 22:42:18 -0000 1.1
+++ NewFECSegmentFile.java 4 Oct 2003 01:17:02 -0000 1.2
@@ -7,7 +7,7 @@
public class NewFECSegmentFile extends NewClientRequest {
- public NewFECSegmentFile(long id, ConnectionHandler source) {
+ public NewFECSegmentFile(long id, PeerHandler source) {
super(id, source);
}
Index: NewFECSegmentSplitFile.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewFECSegmentSplitFile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewFECSegmentSplitFile.java 2 Dec 2002 03:06:10 -0000 1.2
+++ NewFECSegmentSplitFile.java 4 Oct 2003 01:17:02 -0000 1.3
@@ -13,7 +13,7 @@
public class NewFECSegmentSplitFile extends NewClientRequest {
- public NewFECSegmentSplitFile(long id, ConnectionHandler source) {
+ public NewFECSegmentSplitFile(long id, PeerHandler source) {
super(id, source);
}
Index: NewGenerateCHK.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGenerateCHK.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewGenerateCHK.java 22 Jul 2003 03:17:29 -0000 1.2
+++ NewGenerateCHK.java 4 Oct 2003 01:17:03 -0000 1.3
@@ -10,7 +10,7 @@
public class NewGenerateCHK extends NewClientRequest {
- public NewGenerateCHK(long id, ConnectionHandler source) {
+ public NewGenerateCHK(long id, PeerHandler source) {
super(id, source);
}
Index: NewGenerateSHA1.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGenerateSHA1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewGenerateSHA1.java 21 May 2003 17:06:27 -0000 1.2
+++ NewGenerateSHA1.java 4 Oct 2003 01:17:03 -0000 1.3
@@ -10,7 +10,7 @@
public class NewGenerateSHA1 extends NewClientRequest {
- public NewGenerateSHA1(long id, ConnectionHandler source) {
+ public NewGenerateSHA1(long id, PeerHandler source) {
super(id, source);
}
Index: NewGenerateSVKPair.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGenerateSVKPair.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NewGenerateSVKPair.java 22 Jul 2003 03:17:29 -0000 1.3
+++ NewGenerateSVKPair.java 4 Oct 2003 01:17:03 -0000 1.4
@@ -8,7 +8,7 @@
public class NewGenerateSVKPair extends NewClientRequest {
- public NewGenerateSVKPair(long id, ConnectionHandler source) {
+ public NewGenerateSVKPair(long id, PeerHandler source) {
super(id, source);
}
Index: NewGetSize.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGetSize.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewGetSize.java 22 Jul 2003 03:17:29 -0000 1.1
+++ NewGetSize.java 4 Oct 2003 01:17:03 -0000 1.2
@@ -17,7 +17,7 @@
public class NewGetSize extends NewClientRequest {
- public NewGetSize(long id, ConnectionHandler source) {
+ public NewGetSize(long id, PeerHandler source) {
super(id, source);
}
Index: NewHello.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewHello.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NewHello.java 18 Mar 2003 02:13:45 -0000 1.4
+++ NewHello.java 4 Oct 2003 01:17:04 -0000 1.5
@@ -8,7 +8,7 @@
public class NewHello extends NewClientRequest {
- public NewHello(long id, ConnectionHandler source) {
+ public NewHello(long id, PeerHandler source) {
super(id, source);
}
Index: NewIllegal.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewIllegal.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- NewIllegal.java 13 Jan 2002 05:24:47 -0000 1.1.1.1
+++ NewIllegal.java 4 Oct 2003 01:17:04 -0000 1.2
@@ -8,11 +8,11 @@
private String reason;
- public NewIllegal(long id, ConnectionHandler source) {
+ public NewIllegal(long id, PeerHandler source) {
super(id, source);
}
- public NewIllegal(long id, ConnectionHandler source, String reason) {
+ public NewIllegal(long id, PeerHandler source, String reason) {
super(id, source);
this.reason = reason;
}
Index: NewInfo.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewInfo.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NewInfo.java 21 May 2003 17:03:23 -0000 1.7
+++ NewInfo.java 4 Oct 2003 01:17:04 -0000 1.8
@@ -15,7 +15,7 @@
public class NewInfo extends NewClientRequest {
- public NewInfo(long id, ConnectionHandler source) {
+ public NewInfo(long id, PeerHandler source) {
super(id, source);
}
Index: NewInvertPrivateKey.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewInvertPrivateKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewInvertPrivateKey.java 9 Apr 2003 23:00:58 -0000 1.1
+++ NewInvertPrivateKey.java 4 Oct 2003 01:17:05 -0000 1.2
@@ -14,7 +14,7 @@
*/
public class NewInvertPrivateKey extends NewClientRequest {
- public NewInvertPrivateKey(long id, ConnectionHandler source) {
+ public NewInvertPrivateKey(long id, PeerHandler source) {
super(id, source);
}
Index: ReturnDiagnostics.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/ReturnDiagnostics.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReturnDiagnostics.java 18 Sep 2003 17:48:10 -0000 1.3
+++ ReturnDiagnostics.java 4 Oct 2003 01:17:05 -0000 1.4
@@ -16,7 +16,7 @@
public class ReturnDiagnostics extends NewClientRequest {
- public ReturnDiagnostics(long id, ConnectionHandler source) {
+ public ReturnDiagnostics(long id, PeerHandler source) {
super(id, source);
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
