echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

propagate from branch 'i2p.i2p' (head cbfe85d22c4d0b05c901db3fa751b57889d9b2d6)

Browse Source 
to branch 'i2p.i2p.str4d.cleanup' (head 94fe1764f50b459da18222434034ad46d604c7a1)
This commit is contained in:
str4d
2013-11-28 11:12:41 +00:00
parent ed2feb3ff7 707f616498
commit f112baac48
22 changed files with 35 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
View File

@ -70,8 +70,7 @@ public class TCPtoI2P implements Runnable {
* @throws IOException
*/
private static String lnRead(InputStream in) throws IOException {
String S = "";
StringBuilder builder = new StringBuilder();
StringBuilder builder = new StringBuilder();
int b;
char c;
@ -86,7 +85,7 @@ public class TCPtoI2P implements Runnable {
break;
}
c = (char) (b & 0x7f); // We only care about ASCII
builder.append(c);
builder.append(c);
}
return builder.toString();
}

7
apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
View File

@ -5,7 +5,6 @@ import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -216,10 +215,8 @@ public class I2PSnarkUtil {
_log.debug("Connecting to I2P", new Exception("I did it"));
Properties opts = _context.getProperties();
if (_opts != null) {
for (Iterator<String> iter = _opts.keySet().iterator(); iter.hasNext(); ) {
String key = iter.next();
opts.setProperty(key, _opts.get(key).toString());
}
for (Map.Entry<String, String> entry : _opts.entrySet() )
opts.setProperty(entry.getKey(), entry.getValue());
}
if (opts.getProperty("inbound.nickname") == null)
opts.setProperty("inbound.nickname", _baseName.replace("i2psnark", "I2PSnark"));

4
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
View File

@ -14,7 +14,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -1687,8 +1686,7 @@ public class SnarkManager implements CompleteListener {
// Don't remove magnet torrents that don't have a torrent file yet
existingNames.removeAll(_magnets);
// now lets see which ones have been removed...
for (Iterator<String> iter = existingNames.iterator(); iter.hasNext(); ) {
String name = iter.next();
for (String name : existingNames) {
if (foundNames.contains(name)) {
// known and still there. noop
} else {

2
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
View File

@ -204,7 +204,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
if (_log.shouldLog(Log.WARN))
_log.warn("Refusing POST since peer is throttled: " + peerHash.toBase64());
try {
// Send a 503, so the user doesn't get an HTTP Proxy error message
// Send a 403, so the user doesn't get an HTTP Proxy error message
// and blame his router or the network.
socket.getOutputStream().write(ERR_DENIED);
} catch (IOException ioe) {}

5
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
View File

@ -7,7 +7,6 @@ import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import net.i2p.I2PAppContext;
@ -137,10 +136,8 @@ public class I2Ping extends I2PTunnelTask implements Runnable {
reportTimes = false;
}
br.close();
for (Iterator<PingHandler> it = pingHandlers.iterator(); it.hasNext();) {
Thread t = (Thread) it.next();
for (Thread t : pingHandlers)
t.join();
}
return;
} else {
Thread t = new PingHandler(cmd);

4
apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
View File

@ -1,7 +1,6 @@
package net.i2p.router.web;
import java.io.File;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@ -58,8 +57,7 @@ public class ConfigUIHelper extends HelperBase {
}
// user themes
Set<String> props = _context.getPropertyNames();
for (Iterator<String> iter = props.iterator(); iter.hasNext(); ) {
String prop = iter.next();
for (String prop : props) {
if (prop.startsWith(PROP_THEME_PFX) && prop.length() > PROP_THEME_PFX.length())
rv.add(prop.substring(PROP_THEME_PFX.length()));
}

7
apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
View File

@ -4,7 +4,6 @@ import java.io.IOException;
import java.io.Writer;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -144,8 +143,7 @@ public class GraphHelper extends FormHandler {
// go to some trouble to see if we have the data for the combined bw graph
boolean hasTx = false;
boolean hasRx = false;
for (Iterator<SummaryListener> iter = ordered.iterator(); iter.hasNext(); ) {
SummaryListener lsnr = iter.next();
for (SummaryListener lsnr : ordered) {
String title = lsnr.getRate().getRateStat().getName();
if (title.equals("bw.sendRate")) hasTx = true;
else if (title.equals("bw.recvRate")) hasRx = true;
@ -166,8 +164,7 @@ public class GraphHelper extends FormHandler {
+ "\" alt=\"" + title + "\" title=\"" + title + "\"></a>\n");
}
for (Iterator<SummaryListener> iter = ordered.iterator(); iter.hasNext(); ) {
SummaryListener lsnr = iter.next();
for (SummaryListener lsnr : ordered) {
Rate r = lsnr.getRate();
// e.g. "statname for 60m"
String title = _("{0} for {1}", r.getRateStat().getName(), DataHelper.formatDuration2(_periodCount * r.getPeriod()));

2
apps/streaming/java/src/net/i2p/client/streaming/Connection.java
View File

@ -609,7 +609,7 @@ class Connection {
_inputStream.streamErrorOccurred(ioe);
_connectionError = "Connection reset";
synchronized (_connectLock) { _connectLock.notifyAll(); }
// RFC 793 end of setion 3.4: We are completely done.
// RFC 793 end of section 3.4: We are completely done.
disconnectComplete();
}

7
apps/susimail/src/src/i2p/susi/webmail/RequestWrapper.java
View File

@ -28,6 +28,7 @@ import java.io.InputStream;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Locale;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@ -135,10 +136,10 @@ public class RequestWrapper {
String result = null;
if( multiPartRequest != null ) {
Hashtable<String, String> params = multiPartRequest.getParams( partName );
for( Enumeration<String> e = params.keys(); e.hasMoreElements(); ) {
String key = e.nextElement();
for( Map.Entry<String, String> e : params.entrySet() ) {
String key = e.getKey();
if( key.toLowerCase(Locale.US).compareToIgnoreCase( "content-type") == 0 ) {
String value = (String)params.get( key );
String value = e.getValue();
int i = value.indexOf( ";" );
if( i != -1 )
result = value.substring( 0, i );

2
core/java/src/com/nettgryppa/security/HashCash.java
View File

@ -338,7 +338,7 @@ private static long bytesToLong(byte[] b) {
boolean first = true;
for(Map.Entry<String, List<String>> entry: extensions.entrySet()) {
String key = entry.getKey();
String key = entry.getKey();
if(key.contains(":") || key.contains(";") || key.contains("="))
throw new IllegalArgumentException("Extension key contains an illegal character. " + key);
if(!first)

4
core/java/src/net/i2p/client/I2PSessionImpl2.java
View File

@ -523,10 +523,8 @@ class I2PSessionImpl2 extends I2PSessionImpl {
if (_sendingStates == null) // only null if overridden by I2PSimpleSession
return;
synchronized (_sendingStates) {
for (Iterator<MessageState> iter = _sendingStates.iterator(); iter.hasNext();) {
MessageState state = iter.next();
for (MessageState state : _sendingStates)
state.cancel();
}
if (_log.shouldLog(Log.INFO)) _log.info(getPrefix() + "Disconnecting " + _sendingStates.size() + " states");
_sendingStates.clear();
}

7
core/java/src/net/i2p/client/MessageState.java
View File

@ -1,7 +1,6 @@
package net.i2p.client;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
@ -150,8 +149,7 @@ class MessageState {
if (_log.shouldLog(Log.DEBUG))
_log.debug(_prefix + "isSuccess(" + wantedStatus + "): " + _receivedStatus);
for (Iterator<Integer> iter = _receivedStatus.iterator(); iter.hasNext();) {
Integer val = iter.next();
for (Integer val : _receivedStatus) {
int recv = val.intValue();
switch (recv) {
case MessageStatusMessage.STATUS_SEND_BEST_EFFORT_FAILURE:
@ -210,8 +208,7 @@ class MessageState {
if (_log.shouldLog(Log.DEBUG))
_log.debug(_prefix + "isFailure(" + wantedStatus + "): " + _receivedStatus);
for (Iterator<Integer> iter = _receivedStatus.iterator(); iter.hasNext();) {
Integer val = iter.next();
for (Integer val : _receivedStatus) {
int recv = val.intValue();
switch (recv) {
case MessageStatusMessage.STATUS_SEND_BEST_EFFORT_FAILURE:

4
core/java/src/net/i2p/crypto/ElGamalAESEngine.java
View File

@ -12,7 +12,6 @@ package net.i2p.crypto;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@ -656,8 +655,7 @@ public class ElGamalAESEngine {
int cur = prefixBytes;
DataHelper.toLong(aesData, cur, 2, tagsForDelivery.size());
cur += 2;
for (Iterator<SessionTag> iter = tagsForDelivery.iterator(); iter.hasNext();) {
SessionTag tag = iter.next();
for (SessionTag tag : tagsForDelivery) {
System.arraycopy(tag.getData(), 0, aesData, cur, SessionTag.BYTE_LENGTH);
cur += SessionTag.BYTE_LENGTH;
}

4
core/java/src/net/i2p/crypto/KeyStoreUtil.java
View File

@ -266,7 +266,7 @@ public class KeyStoreUtil {
* @param keyPW the key password, must be at least 6 characters
*
* @return success
* @since 0.8.3, consolidated from RouterConsoleRUnner and SSLClientListenerRunner in 0.9.9
* @since 0.8.3, consolidated from RouterConsoleRunner and SSLClientListenerRunner in 0.9.9
*/
public static boolean createKeys(File ks, String alias, String cname, String ou,
String keyPW) {
@ -290,7 +290,7 @@ public class KeyStoreUtil {
* @param keyPW the key password, must be at least 6 characters
*
* @return success
* @since 0.8.3, consolidated from RouterConsoleRUnner and SSLClientListenerRunner in 0.9.9
* @since 0.8.3, consolidated from RouterConsoleRunner and SSLClientListenerRunner in 0.9.9
*/
public static boolean createKeys(File ks, String ksPW, String alias, String cname, String ou,
int validDays, String keyAlg, int keySize, String keyPW) {

9
core/java/src/net/i2p/data/LeaseSet.java
View File

@ -15,7 +15,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import net.i2p.I2PAppContext;
@ -290,10 +289,8 @@ public class LeaseSet extends DatabaseEntry {
_signingKey.writeBytes(out);
DataHelper.writeLong(out, 1, _leases.size());
//DataHelper.writeLong(out, 4, _version);
for (Iterator<Lease> iter = _leases.iterator(); iter.hasNext();) {
Lease lease = iter.next();
for (Lease lease : _leases)
lease.writeBytes(out);
}
} catch (IOException ioe) {
return null;
} catch (DataFormatException dfe) {
@ -339,10 +336,8 @@ public class LeaseSet extends DatabaseEntry {
_signingKey.writeBytes(out);
DataHelper.writeLong(out, 1, _leases.size());
//DataHelper.writeLong(out, 4, _version);
for (Iterator<Lease> iter = _leases.iterator(); iter.hasNext();) {
Lease lease = iter.next();
for (Lease lease : _leases)
lease.writeBytes(out);
}
_signature.writeBytes(out);
}

5
core/java/src/net/i2p/util/I2PAppThread.java
View File

@ -10,7 +10,6 @@ package net.i2p.util;
*/
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
@ -45,10 +44,8 @@ public class I2PAppThread extends I2PThread {
@Override
protected void fireOOM(OutOfMemoryError oom) {
for (Iterator<OOMEventListener> iter = _threadListeners.iterator(); iter.hasNext(); ) {
OOMEventListener listener = iter.next();
for (OOMEventListener listener : _threadListeners)
listener.outOfMemory(oom);
}
}
/** register a new component that wants notification of OOM events */

5
core/java/src/net/i2p/util/I2PThread.java
View File

@ -10,7 +10,6 @@ package net.i2p.util;
*/
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
@ -112,10 +111,8 @@ public class I2PThread extends Thread {
****/
protected void fireOOM(OutOfMemoryError oom) {
for (Iterator<OOMEventListener> iter = _listeners.iterator(); iter.hasNext(); ) {
OOMEventListener listener = iter.next();
for (OOMEventListener listener : _listeners)
listener.outOfMemory(oom);
}
}
/** register a new component that wants notification of OOM events */

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 34;
public final static long BUILD = 35;
/** for example "-test" */
public final static String EXTRA = "-rc";

4
router/java/src/net/i2p/router/networkdb/kademlia/ExploreKeySelectorJob.java
View File

@ -9,7 +9,6 @@ package net.i2p.router.networkdb.kademlia;
*/
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import net.i2p.data.Hash;
@ -62,8 +61,7 @@ class ExploreKeySelectorJob extends JobImpl {
KBucket bucket = _facade.getKBuckets().getBucket(i);
if (bucket.getKeyCount() < KBucketSet.BUCKET_SIZE) {
boolean already = false;
for (Iterator<Hash> iter = alreadyQueued.iterator(); iter.hasNext(); ) {
Hash key = iter.next();
for (Hash key : alreadyQueued) {
if (bucket.shouldContain(key)) {
already = true;
_log.debug("Bucket " + i + " is already queued for exploration \t" + key);

11
router/java/src/net/i2p/router/networkdb/kademlia/HarvesterJob.java
View File

@ -1,7 +1,6 @@
package net.i2p.router.networkdb.kademlia;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -58,10 +57,8 @@ class HarvesterJob extends JobImpl {
public void runJob() {
if (shouldHarvest()) {
List<Hash> peers = selectPeersToUpdate();
for (int i = 0; i < peers.size(); i++) {
Hash peer= peers.get(i);
for (Hash peer : peers)
harvest(peer);
}
}
requeue(REQUEUE_DELAY);
}
@ -79,8 +76,7 @@ class HarvesterJob extends JobImpl {
Map<Long, Hash> routersByAge = new TreeMap<Long, Hash>();
Set<Hash> peers = _facade.getAllRouters();
long now = getContext().clock().now();
for (Iterator<Hash> iter = peers.iterator(); iter.hasNext(); ) {
Hash peer = iter.next();
for (Hash peer : peers) {
RouterInfo info = _facade.lookupRouterInfoLocally(peer);
if (info != null) {
long when = info.getPublished();
@ -96,8 +92,7 @@ class HarvesterJob extends JobImpl {
// ignoring peers that are new, so lets grab the oldest MAX_PER_RUN
// entries
List<Hash> rv = new ArrayList<Hash>();
for (Iterator<Hash> iter = routersByAge.values().iterator(); iter.hasNext(); ) {
Hash peer = iter.next();
for (Hash peer : routersByAge.values()) {
rv.add(peer);
if (rv.size() >= MAX_PER_RUN)
break;

7
router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
View File

@ -10,7 +10,6 @@ package net.i2p.router.networkdb.kademlia;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@ -290,8 +289,7 @@ class SearchJob extends JobImpl {
return;
} else {
attempted.addAll(closestHashes);
for (Iterator<Hash> iter = closestHashes.iterator(); iter.hasNext(); ) {
Hash peer = iter.next();
for (Hash peer : closestHashes) {
DatabaseEntry ds = _facade.getDataStore().get(peer);
if (ds == null) {
if (_log.shouldLog(Log.INFO))
@ -630,8 +628,7 @@ class SearchJob extends JobImpl {
Set<Hash> sendTo = _state.getRepliedPeers(); // _state.getFailed();
sendTo.addAll(_state.getPending());
int numSent = 0;
for (Iterator<Hash> iter = sendTo.iterator(); iter.hasNext(); ) {
Hash peer = iter.next();
for (Hash peer : sendTo) {
RouterInfo peerInfo = _facade.lookupRouterInfoLocally(peer);
if (peerInfo == null) continue;
if (resend(peerInfo, (LeaseSet)ds))

7
router/java/src/net/i2p/router/peermanager/PeerTestJob.java
View File

@ -1,7 +1,6 @@
package net.i2p.router.peermanager;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@ -73,8 +72,7 @@ public class PeerTestJob extends JobImpl {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Testing " + peers.size() + " peers");
for (Iterator<RouterInfo> iter = peers.iterator(); iter.hasNext(); ) {
RouterInfo peer = iter.next();
for (RouterInfo peer : peers) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Testing peer " + peer.getIdentity().getHash().toBase64());
testPeer(peer);
@ -98,8 +96,7 @@ public class PeerTestJob extends JobImpl {
_log.debug("Peer selection found " + peerHashes.size() + " peers");
Set<RouterInfo> peers = new HashSet<RouterInfo>(peerHashes.size());
for (Iterator<Hash> iter = peerHashes.iterator(); iter.hasNext(); ) {
Hash peer = iter.next();
for (Hash peer : peerHashes) {
RouterInfo peerInfo = getContext().netDb().lookupRouterInfoLocally(peer);
if (peerInfo != null) {
peers.add(peerInfo);