Author: zothar
Date: 2006-07-09 20:57:02 +0000 (Sun, 09 Jul 2006)
New Revision: 9525
Modified:
trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
trunk/freenet/src/freenet/crypt/DSAPrivateKey.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/RequestSender.java
trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
trunk/freenet/src/freenet/node/fcp/ClientPut.java
trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java
trunk/freenet/src/freenet/node/updater/NodeUpdater.java
trunk/freenet/src/freenet/support/FileLoggerHook.java
trunk/freenet/src/freenet/support/PaddedEphemerallyEncryptedBucket.java
Log:
Silenced a few 'local variable name shadows' warnings given by lint4j, which
may have pointed out a bug in NodeUpdater, which is hopefully now working
better. Added a comment about an unclear 'key' variable use in
client/async/SingleFileFetcher
Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
2006-07-09 17:44:36 UTC (rev 9524)
+++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
2006-07-09 20:57:02 UTC (rev 9525)
@@ -313,6 +313,7 @@
metaStrings.addFirst(o);
}
+ // **FIXME** Is key in the call to
SingleFileFetcher here supposed to be this.key or the same key used in the try
block above? MultiLevelMetadataCallback.onSuccess() below uses this.key, thus
the question
SingleFileFetcher f = new
SingleFileFetcher((ClientGetter)parent, rcb, clientMetadata, key, metaStrings,
ctx, actx, maxRetries, recursionLevel, false, null, true, returnBucket);
if(metadata.isCompressed()) {
Compressor codec =
Compressor.getCompressionAlgorithmByMetadataID(metadata.getCompressionCodec());
Modified: trunk/freenet/src/freenet/crypt/DSAPrivateKey.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAPrivateKey.java 2006-07-09 17:44:36 UTC
(rev 9524)
+++ trunk/freenet/src/freenet/crypt/DSAPrivateKey.java 2006-07-09 20:57:02 UTC
(rev 9525)
@@ -27,11 +27,11 @@
//}
public DSAPrivateKey(DSAGroup g, Random r) {
- BigInteger x;
+ BigInteger tempX;
do {
- x = new NativeBigInteger(256, r);
- } while (x.compareTo(g.getQ()) > -1);
- this.x = x;
+ tempX = new NativeBigInteger(256, r);
+ } while (tempX.compareTo(g.getQ()) > -1);
+ this.x = tempX;
}
public String keyType() {
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-07-09 17:44:36 UTC
(rev 9524)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-07-09 20:57:02 UTC
(rev 9525)
@@ -1524,9 +1524,9 @@
fs.put("idle", Long.toString(idle));
}
fs.put("lastRoutingBackoffReason", getLastBackoffReason());
- long peerAddedTime = getPeerAddedTime();
- if(peerAddedTime > 1) {
- fs.put("peerAddedTime", Long.toString(peerAddedTime));
+ long tempPeerAddedTime = getPeerAddedTime();
+ if(tempPeerAddedTime > 1) {
+ fs.put("peerAddedTime",
Long.toString(tempPeerAddedTime));
}
fs.put("routingBackoffPercent",
Double.toString(backedOffPercent.currentValue() * 100));
fs.put("routingBackoff",
Long.toString((Math.max(routingBackedOffUntil - now, 0))));
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2006-07-09 17:44:36 UTC
(rev 9524)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2006-07-09 20:57:02 UTC
(rev 9525)
@@ -425,12 +425,10 @@
private void verifyAndCommit(byte[] data) throws KeyVerifyException {
if(key instanceof NodeCHK) {
- CHKBlock block = new CHKBlock(data, headers, (NodeCHK)key);
- node.store(block);
+ node.store(new CHKBlock(data, headers, (NodeCHK)key));
} else if (key instanceof NodeSSK) {
- SSKBlock block = new SSKBlock(data, headers, (NodeSSK)key,
false);
try {
- node.store(block);
+ node.store(new SSKBlock(data, headers,
(NodeSSK)key, false));
} catch (KeyCollisionException e) {
Logger.normal(this, "Collision on "+this);
}
Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2006-07-09 17:44:36 UTC (rev 9524)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2006-07-09 20:57:02 UTC (rev 9525)
@@ -206,11 +206,11 @@
public void run() {
while(true) {
int curPort = port;
- String bindTo = this.bindTo;
+ String tempBindTo = this.bindTo;
try {
- networkInterface = new NetworkInterface(curPort,
bindTo, allowedHosts);
+ networkInterface = new NetworkInterface(curPort,
tempBindTo, allowedHosts);
} catch (IOException e) {
- Logger.error(this, "Could not bind to TMCI port:
"+bindTo+":"+port);
+ Logger.error(this, "Could not bind to TMCI port:
"+tempBindTo+":"+port);
System.exit(-1);
return;
}
@@ -225,7 +225,7 @@
while(isEnabled) {
// Maybe something has changed?
if(port != curPort) break;
- if(!(this.bindTo.equals(bindTo))) break;
+ if(!(this.bindTo.equals(tempBindTo))) break;
try {
Socket s = networkInterface.accept();
InputStream in = s.getInputStream();
Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java 2006-07-09 17:44:36 UTC
(rev 9524)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java 2006-07-09 20:57:02 UTC
(rev 9525)
@@ -41,10 +41,10 @@
clientToken = message.clientToken;
if(persistenceType != PERSIST_CONNECTION)
client.register(this);
- Bucket data = message.bucket;
+ Bucket tempData = message.bucket;
ClientMetadata cm = new ClientMetadata(mimeType);
boolean isMetadata = false;
- Logger.minor(this, "data = "+data+", uploadFrom =
"+ClientPutMessage.uploadFromString(uploadFrom));
+ Logger.minor(this, "data = "+tempData+", uploadFrom =
"+ClientPutMessage.uploadFromString(uploadFrom));
if(uploadFrom == ClientPutMessage.UPLOAD_FROM_REDIRECT) {
this.targetURI = message.redirectTarget;
Metadata m = new Metadata(Metadata.SIMPLE_REDIRECT,
targetURI, cm);
@@ -61,11 +61,11 @@
inserter = null;
return;
}
- data = new SimpleReadOnlyArrayBucket(d);
+ tempData = new SimpleReadOnlyArrayBucket(d);
isMetadata = true;
} else
targetURI = null;
- this.data = data;
+ this.data = tempData;
this.clientMetadata = cm;
Logger.minor(this, "data = "+data+", uploadFrom =
"+ClientPutMessage.uploadFromString(uploadFrom));
inserter = new ClientPutter(this, data, uri, cm,
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
2006-07-09 17:44:36 UTC (rev 9524)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
2006-07-09 20:57:02 UTC (rev 9525)
@@ -58,8 +58,7 @@
if(files == null)
throw new
MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "Missing Files
section", identifier);
for(int i=0;;i++) {
- String name = Integer.toString(i);
- SimpleFieldSet subset = files.subset(name);
+ SimpleFieldSet subset =
files.subset(Integer.toString(i));
if(subset == null) break;
DirPutFile f = DirPutFile.create(subset, identifier,
(persistenceType == ClientRequest.PERSIST_FOREVER) ? bfPersistent : bfTemp);
addFile(f);
@@ -150,17 +149,17 @@
private void convertFilesByNameToManifestElements(HashMap filesByName,
HashMap manifestElements) {
Iterator i = filesByName.keySet().iterator();
while(i.hasNext()) {
- String name = (String) (i.next());
- Object val = filesByName.get(name);
+ String tempName = (String) (i.next());
+ Object val = filesByName.get(tempName);
if(val instanceof HashMap) {
HashMap h = (HashMap) val;
HashMap manifests = new HashMap();
- manifestElements.put(name, manifests);
+ manifestElements.put(tempName, manifests);
convertFilesByNameToManifestElements(h,
manifests);
} else {
DirPutFile f = (DirPutFile) val;
ManifestElement e = f.getElement();
- manifestElements.put(name, e);
+ manifestElements.put(tempName, e);
}
}
}
Modified: trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java 2006-07-09
17:44:36 UTC (rev 9524)
+++ trunk/freenet/src/freenet/node/fcp/DataCarryingMessage.java 2006-07-09
20:57:02 UTC (rev 9525)
@@ -31,15 +31,15 @@
if(len < 0)
throw new IllegalArgumentException("Invalid length:
"+len);
if(len == 0) return;
- Bucket bucket;
+ Bucket tempBucket;
try {
- bucket = createBucket(bf, len, server);
+ tempBucket = createBucket(bf, len, server);
} catch (IOException e) {
Logger.error(this, "Bucket error: "+e, e);
throw new
MessageInvalidException(ProtocolErrorMessage.INTERNAL_ERROR, e.toString(),
getIdentifier());
}
- BucketTools.copyFrom(bucket, is, len);
- this.bucket = bucket;
+ BucketTools.copyFrom(tempBucket, is, len);
+ this.bucket = tempBucket;
}
protected void writeData(OutputStream os) throws IOException {
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2006-07-09 17:44:36 UTC
(rev 9524)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2006-07-09 20:57:02 UTC
(rev 9525)
@@ -108,15 +108,15 @@
Logger.normal(this, "Starting FCP server on
"+bindTo+":"+port+".");
System.out.println("Starting FCP server on
"+bindTo+":"+port+".");
- NetworkInterface networkInterface = null;
+ NetworkInterface tempNetworkInterface = null;
try {
- networkInterface = new NetworkInterface(port,
bindTo, allowedHosts);
+ tempNetworkInterface = new
NetworkInterface(port, bindTo, allowedHosts);
} catch (BindException be) {
Logger.error(this, "Couldn't bind to FCP Port
"+bindTo+":"+port+". FCP Server not started.");
System.out.println("Couldn't bind to FCP Port
"+bindTo+":"+port+". FCP Server not started.");
}
- this.networkInterface = networkInterface;
+ this.networkInterface = tempNetworkInterface;
if (this.networkInterface != null) {
Thread t = new Thread(this, "FCP server");
Modified: trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java 2006-07-09
17:44:36 UTC (rev 9524)
+++ trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java 2006-07-09
20:57:02 UTC (rev 9525)
@@ -54,14 +54,13 @@
for(int i=0;i<elements.length;i++) {
String num = Integer.toString(i);
ManifestElement e = elements[i];
- String name = e.getName();
String mimeOverride = e.getMimeTypeOverride();
SimpleFieldSet subset = new SimpleFieldSet(true);
- FreenetURI uri = e.getTargetURI();
- subset.put("Name", name);
- if(uri != null) {
+ FreenetURI tempURI = e.getTargetURI();
+ subset.put("Name", e.getName());
+ if(tempURI != null) {
subset.put("UploadFrom", "redirect");
- subset.put("TargetURI", uri.toString());
+ subset.put("TargetURI", tempURI.toString());
} else {
Bucket data = e.getData();
subset.put("DataLength",
Long.toString(e.getSize()));
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-07-09
17:44:36 UTC (rev 9524)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-07-09
20:57:02 UTC (rev 9525)
@@ -80,10 +80,10 @@
alert.isValid(false);
node.alerts.register(alert);
- FetcherContext ctx =
n.makeClient((short)0).getFetcherContext();
- ctx.allowSplitfiles = true;
- ctx.dontEnterImplicitArchives = false;
- this.ctx = ctx;
+ FetcherContext tempContext =
n.makeClient((short)0).getFetcherContext();
+ tempContext.allowSplitfiles = true;
+ tempContext.dontEnterImplicitArchives = false;
+ this.ctx = tempContext;
ctxRevocation = n.makeClient((short)0).getFetcherContext();
ctxRevocation.allowSplitfiles = false;
@@ -97,10 +97,10 @@
try{
USK
myUsk=USK.create(URI.setSuggestedEdition(currentVersion));
- ctx.uskManager.subscribe(myUsk, this, true);
+ ctx.uskManager.subscribe(myUsk, this, true);
ctx.uskManager.startTemporaryBackgroundFetcher(myUsk);
- ClientGetter cg = new ClientGetter(this,
node.chkFetchScheduler, node.sskFetchScheduler, revocationURI, ctxRevocation,
RequestStarter.UPDATE_PRIORITY_CLASS, this, null);
+ this.cg = new ClientGetter(this,
node.chkFetchScheduler, node.sskFetchScheduler, revocationURI, ctxRevocation,
RequestStarter.UPDATE_PRIORITY_CLASS, this, null);
cg.start();
}catch(MalformedURLException e){
Modified: trunk/freenet/src/freenet/support/FileLoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/FileLoggerHook.java 2006-07-09
17:44:36 UTC (rev 9524)
+++ trunk/freenet/src/freenet/support/FileLoggerHook.java 2006-07-09
20:57:02 UTC (rev 9525)
@@ -890,11 +890,11 @@
synchronized(logFiles) {
oldLogFiles = (OldLogFile[]) logFiles.toArray(new
OldLogFile[logFiles.size()]);
}
- DateFormat df =
DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT,
Locale.ENGLISH);
- df.setTimeZone(TimeZone.getTimeZone("GMT"));
+ DateFormat tempDF =
DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT,
Locale.ENGLISH);
+ tempDF.setTimeZone(TimeZone.getTimeZone("GMT"));
for(int i=0;i<oldLogFiles.length;i++) {
OldLogFile olf = oldLogFiles[i];
- writer.write(olf.filename.getName()+" : "+df.format(new
Date(olf.start))+" to "+df.format(new Date(olf.end))+ " - "+olf.size+"
bytes\n");
+ writer.write(olf.filename.getName()+" :
"+tempDF.format(new Date(olf.start))+" to "+tempDF.format(new Date(olf.end))+ "
- "+olf.size+" bytes\n");
}
}
Modified:
trunk/freenet/src/freenet/support/PaddedEphemerallyEncryptedBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/PaddedEphemerallyEncryptedBucket.java
2006-07-09 17:44:36 UTC (rev 9524)
+++ trunk/freenet/src/freenet/support/PaddedEphemerallyEncryptedBucket.java
2006-07-09 20:57:02 UTC (rev 9525)
@@ -45,15 +45,15 @@
} catch (UnsupportedCipherException e) {
throw new Error(e);
}
- byte[] key = new byte[32];
- origRandom.nextBytes(key);
- aes.initialize(key);
+ byte[] tempKey = new byte[32];
+ origRandom.nextBytes(tempKey);
+ aes.initialize(tempKey);
if(forgetKey) {
// Might as well blank it
- for(int i=0;i<key.length;i++) key[i] = 0;
+ for(int i=0;i<tempKey.length;i++) tempKey[i] = 0;
this.key = null;
} else {
- this.key = key;
+ this.key = tempKey;
}
this.minPaddedSize = minSize;
readOnly = false;
