Update of /cvsroot/freenet/freenet/src/freenet/node
In directory sc8-pr-cvs1:/tmp/cvs-serv29317/src/freenet/node
Modified Files:
Node.java
Log Message:
6342:
Disable QueryReject because of bandwidth.
Impose a maximum file size of 1MB plus storables.
Reset datasource when send file from store. We were setting the datasource to the node
we would have routed to, which is now typically a new node with naive estimators. This
is bad. And we still have _some_ plausible deniability.
Logging.
Index: Node.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/Node.java,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -w -r1.251 -r1.252
--- Node.java 18 Nov 2003 13:36:49 -0000 1.251
+++ Node.java 19 Nov 2003 19:13:56 -0000 1.252
@@ -126,6 +126,7 @@
config.addOption("cacheProbPerHop", 1, 0.8F, 1412);
config.addOption("minStoreFullPCache", 1, 0.9F, 1413);
config.addOption("minRTFullPRef", 1, 0.3F, 1414);
+ config.addOption("maxLog2DataSize", 1, 20, 1415);
// network resource limiting options
config.addOption("bandwidthLimit", 1, 0, 1200);
@@ -269,11 +270,11 @@
config.addOption("requestSendTimeCutoff", 1, 1000, 3256);
config.addOption("successfulSendTimeCutoff", 1, 4000, 3257);
config.addOption("doOutLimitCutoff",1,true,3258);
- config.addOption("outLimitCutoff",1, 0.8F,3259);
+ config.addOption("outLimitCutoff",1, 2.0F,3259);
config.addOption("doOutLimitConnectCutoff",1,true,3260);
- config.addOption("outLimitConnectCutoff",1,2.0F,3261);
+ config.addOption("outLimitConnectCutoff",1,3.0F,3261);
config.addOption("lowLevelBWLimitFudgeFactor",1,3F/4F,3262);
- config.addOption("lowLevelBWLimitMultiplier",1,1.3F,3263);
+ config.addOption("lowLevelBWLimitMultiplier",1,1.0F,3263);
config.addOption("doLowLevelOutputLimiting",1,true,3264);
config.addOption("doLowLevelInputLimiting",1,true,3265);
// Commented out because of limited use and potential political problems i.e.
not cross platform
@@ -480,6 +481,13 @@
"if it is found to be in excess."
);
+ // maxLog2DataSize
+ config.setExpert ("maxLog2DataSize", true);
+ config.argDesc ("maxLog2DataSize", "<integer>");
+ config.shortDesc ("maxLog2DataSize", "maximum file data size (log to
base 2)");
+ config.longDesc ("maxLog2DataSize", "The logarithm to the base
2 of the maximum file data+metadata size ",
+ "that the node will accept. 20 means 1 megabyte, which is
reasonable.");
+
// probIncHopsSinceReset
config.setExpert ("probIncHopsSinceReset", true);
config.argDesc ("probIncHopsSinceReset", "<number between 0 and 1>");
@@ -1931,6 +1939,8 @@
static public int configUpdateInterval;
static public boolean badAddress = false;
static public boolean logOutputBytes;
+ public static int maxLog2DataSize = 20;
+
//static public int maxForwardTries;
@@ -2064,6 +2074,7 @@
// set network parameters
routeConnectTimeout = params.getInt("routeConnectTimeout");
maxHopsToLive = params.getInt("maxHopsToLive");
+ maxLog2DataSize = params.getInt("maxLog2DataSize");
probIncHopsSinceReset = params.getFloat("probIncHopsSinceReset");
cacheProbPerHop = params.getFloat("cacheProbPerHop");
minStoreFullPCache = params.getFloat("minStoreFullPCache");
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
