Author: j16sdiz
Date: 2009-04-21 09:17:25 +0000 (Tue, 21 Apr 2009)
New Revision: 27142
Modified:
trunk/freenet/src/freenet/node/FailureTable.java
trunk/freenet/src/freenet/node/RequestHandler.java
trunk/freenet/src/freenet/node/SSKInsertSender.java
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
Log:
Remove SEND_OLD_FORMAT_SSK code (see also r18601)
This code have been disabled since Mar 2008 (r18866).
Modified: trunk/freenet/src/freenet/node/FailureTable.java
===================================================================
--- trunk/freenet/src/freenet/node/FailureTable.java 2009-04-21 09:17:00 UTC
(rev 27141)
+++ trunk/freenet/src/freenet/node/FailureTable.java 2009-04-21 09:17:25 UTC
(rev 27142)
@@ -449,10 +449,6 @@
}, "Send offered SSK");
- if(RequestHandler.SEND_OLD_FORMAT_SSK) {
- Message df = DMT.createFNPSSKDataFound(uid,
block.getRawHeaders(), block.getRawData());
- source.sendAsync(df, null, senderCounter);
- }
if(needPubKey) {
Message pk = DMT.createFNPSSKPubKey(uid,
block.getPubKey());
source.sendAsync(pk, null, senderCounter);
Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java 2009-04-21 09:17:00 UTC
(rev 27141)
+++ trunk/freenet/src/freenet/node/RequestHandler.java 2009-04-21 09:17:25 UTC
(rev 27142)
@@ -370,7 +370,6 @@
unregisterRequestHandlerWithNode();
}
}
- public static boolean SEND_OLD_FORMAT_SSK = false;
private void sendSSK(byte[] headers, final byte[] data, boolean
needsPubKey2, DSAPublicKey pubKey) throws NotConnectedException {
// SUCCESS requires that BOTH the pubkey AND the data/headers
have been received.
@@ -401,12 +400,6 @@
}
}, "Send throttled SSK data for " + RequestHandler.this);
- if(SEND_OLD_FORMAT_SSK) {
- Message df = DMT.createFNPSSKDataFound(uid, headers,
data);
- source.sendAsync(df, null, this);
- // Not throttled, so report payload here.
- sentPayload(data.length);
- }
if(needsPubKey) {
Message pk = DMT.createFNPSSKPubKey(uid, pubKey);
source.sendAsync(pk, null, this);
@@ -426,12 +419,6 @@
throw new Error(e);
}
- if(SEND_OLD_FORMAT_SSK) {
- Message df = DMT.createFNPSSKDataFound(uid, headers,
data);
- source.sendAsync(df, null, ctr);
- // Not throttled, so report payload here.
- ctr.sentPayload(data.length);
- }
if(needsPubKey) {
Message pk = DMT.createFNPSSKPubKey(uid, pubKey);
source.sendAsync(pk, null, ctr);
Modified: trunk/freenet/src/freenet/node/SSKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertSender.java 2009-04-21 09:17:00 UTC
(rev 27141)
+++ trunk/freenet/src/freenet/node/SSKInsertSender.java 2009-04-21 09:17:25 UTC
(rev 27142)
@@ -174,11 +174,6 @@
try {
next.sendAsync(request, null, this);
- if(RequestHandler.SEND_OLD_FORMAT_SSK) {
- next.sendAsync(req, null, this);
- // Not throttled, so report here.
- sentPayload(data.length);
- }
} catch (NotConnectedException e1) {
if(logMINOR) Logger.minor(this, "Not connected
to "+next);
continue;
Modified:
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2009-04-21 09:17:00 UTC (rev 27141)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2009-04-21 09:17:25 UTC (rev 27142)
@@ -59,7 +59,6 @@
System.exit(EXIT_CANNOT_DELETE_OLD_DATA);
}
wd.mkdir();
- freenet.node.RequestHandler.SEND_OLD_FORMAT_SSK = false;
//NOTE: globalTestInit returns in ignored random source
//NodeStarter.globalTestInit(name, false, Logger.ERROR,
"freenet.node.Location:normal,freenet.node.simulator.RealNode:minor,freenet.node.Insert:MINOR,freenet.node.Request:MINOR,freenet.node.Node:MINOR");
//NodeStarter.globalTestInit(name, false, Logger.ERROR,
"freenet.node.Location:MINOR,freenet.io.comm:MINOR,freenet.node.NodeDispatcher:MINOR,freenet.node.simulator:MINOR,freenet.node.PeerManager:MINOR,freenet.node.RequestSender:MINOR");
Modified: trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
2009-04-21 09:17:00 UTC (rev 27141)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
2009-04-21 09:17:25 UTC (rev 27142)
@@ -72,7 +72,6 @@
static final boolean ENABLE_FOAF = true;
public static void main(String[] args) throws FSParseException,
PeerParseException, CHKEncodeException, InvalidThresholdException,
NodeInitException, ReferenceSignatureVerificationException,
KeyCollisionException, SSKEncodeException, IOException, InterruptedException,
SSKVerifyException {
- freenet.node.RequestHandler.SEND_OLD_FORMAT_SSK = false;
System.err.println("ULPR test");
System.err.println();
String testName = "realNodeULPRTest";
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
