diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java index c43651610..3dcb535cb 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java @@ -1202,22 +1202,23 @@ class PeerCoordinator implements PeerListener boolean skipped = false; for(Piece piece : wantedPieces) { if (piece.getId() == savedPiece) { - if (peer.isCompleted() && piece.getPeerCount() > 1) { + if (peer.isCompleted() && piece.getPeerCount() > 1 && + wantedPieces.size() > 2*END_GAME_THRESHOLD) { // Try to preserve rarest-first - // by not requesting a partial piece that non-seeders also have + // by not requesting a partial piece that at least two non-seeders also have // from a seeder - boolean nonSeeds = false; + int nonSeeds = 0; for (Peer pr : peers) { PeerState state = pr.state; if (state == null) continue; BitField bf = state.bitfield; if (bf == null) continue; if (bf.get(savedPiece) && !pr.isCompleted()) { - nonSeeds = true; - break; + if (++nonSeeds > 1) + break; } } - if (nonSeeds) { + if (nonSeeds > 1) { skipped = true; break; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java index baad6df99..5d385024f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java @@ -671,9 +671,9 @@ public class PluginStarter implements Runnable { for(ClientAppConfig app : apps) { // If the client is a running ClientApp that we want to stop, // bypass all the logic below. - ClientApp ca = ctx.routerAppManager().getClientApp(app.className, LoadClientAppsJob.parseArgs(app.args)); - if (ca != null && ca.getState() == ClientAppState.RUNNING) { - if (action.equals("stop")) { + if (action.equals("stop")) { + ClientApp ca = ctx.routerAppManager().getClientApp(app.className, LoadClientAppsJob.parseArgs(app.args)); + if (ca != null && ca.getState() == ClientAppState.RUNNING) { try { ca.shutdown(LoadClientAppsJob.parseArgs(app.stopargs)); } catch (Throwable t) { diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java index 6a5bf7fa3..043baba68 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java @@ -391,7 +391,11 @@ class SAMv3Handler extends SAMv1Handler } else if (domain.equals("NAMING")) { canContinue = execNamingMessage(opcode, props); } else if (domain.equals("DATAGRAM")) { + // TODO not yet overridden, ID is ignored, most recent DATAGRAM session is used canContinue = execDatagramMessage(opcode, props); + } else if (domain.equals("RAW")) { + // TODO not yet overridden, ID is ignored, most recent RAW session is used + canContinue = execRawMessage(opcode, props); } else { if (_log.shouldLog(Log.DEBUG)) _log.debug("Unrecognized message domain: \"" @@ -694,10 +698,10 @@ class SAMv3Handler extends SAMv1Handler else { if (_log.shouldLog(Log.DEBUG)) - _log.debug ( "Unrecognized RAW message opcode: \"" + _log.debug ( "Unrecognized STREAM message opcode: \"" + opcode + "\"" ); try { - notifyStreamResult(true, "I2P_ERROR", "Unrecognized RAW message opcode: "+opcode ); + notifyStreamResult(true, "I2P_ERROR", "Unrecognized STREAM message opcode: "+opcode ); } catch (IOException e) {} return false; } @@ -716,9 +720,9 @@ class SAMv3Handler extends SAMv1Handler String dest = props.getProperty("DESTINATION"); if (dest == null) { - notifyStreamResult(verbose, "I2P_ERROR", "Destination not specified in RAW SEND message"); + notifyStreamResult(verbose, "I2P_ERROR", "Destination not specified in STREAM CONNECT message"); if (_log.shouldLog(Log.DEBUG)) - _log.debug("Destination not specified in RAW SEND message"); + _log.debug("Destination not specified in STREAM CONNECT message"); return false; } props.remove("DESTINATION"); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java index 1fdbb943f..102bfa6cc 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java @@ -44,6 +44,7 @@ class PacketQueue implements SendMessageStatusListener { private static final int FINAL_TAGS_TO_SEND = 4; private static final int FINAL_TAG_THRESHOLD = 2; private static final long REMOVE_EXPIRED_TIME = 67*1000; + private static final boolean ENABLE_STATUS_LISTEN = false; public PacketQueue(I2PAppContext context, I2PSession session, ConnectionManager mgr) { _context = context; @@ -134,7 +135,7 @@ class PacketQueue implements SendMessageStatusListener { if (con != null) { if (con.isInbound()) options.setSendLeaseSet(false); - else + else if (ENABLE_STATUS_LISTEN) listenForStatus = true; } options.setTagsToSend(INITIAL_TAGS_TO_SEND); diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index eee7e9fbc..12132726d 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -614,7 +614,7 @@ public class WebMail extends HttpServlet } catch (Exception e1) { showBody = false; - reason += _("Part ({0}) not shown, because of {1}", ident, e1.getClass().getName()) + br; + reason += _("Part ({0}) not shown, because of {1}", ident, e1.toString()) + br; } } if( html ) diff --git a/core/java/src/net/i2p/client/DomainSocketFactory.java b/core/java/src/net/i2p/client/DomainSocketFactory.java new file mode 100644 index 000000000..cf8908499 --- /dev/null +++ b/core/java/src/net/i2p/client/DomainSocketFactory.java @@ -0,0 +1,45 @@ +package net.i2p.client; + +import java.io.IOException; +import java.net.ServerSocket; +import java.net.Socket; + +import net.i2p.I2PAppContext; + +/** + * Bridge to Unix domain socket (or similar). + *

+ * This is a stub that does nothing. + * This class is replaced in the Android build. + * + * @author str4d + * @since 0.9.14 + */ +public class DomainSocketFactory { + public static String I2CP_SOCKET_ADDRESS = "net.i2p.client.i2cp"; + + /** + * @throws UnsupportedOperationException always + */ + public DomainSocketFactory(I2PAppContext context) { + throw new UnsupportedOperationException(); + } + + /** + * Override in Android. + * @throws IOException + * @throws UnsupportedOperationException always + */ + public Socket createSocket(String name) throws IOException { + throw new UnsupportedOperationException(); + } + + /** + * Override in Android. + * @throws IOException + * @throws UnsupportedOperationException always + */ + public ServerSocket createServerSocket(String name) throws IOException { + throw new UnsupportedOperationException(); + } +} diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index 20aa43550..d14672647 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -52,6 +52,7 @@ import net.i2p.util.LHMCache; import net.i2p.util.Log; import net.i2p.util.OrderedProperties; import net.i2p.util.SimpleTimer2; +import net.i2p.util.SystemVersion; import net.i2p.util.VersionComparator; /** @@ -157,6 +158,12 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa protected static final String PROP_USER = "i2cp.username"; protected static final String PROP_PW = "i2cp.password"; + /** + * Use Unix domain socket (or similar) to connect to a router + * @since 0.9.14 + */ + protected static final String PROP_DOMAIN_SOCKET = "i2cp.domainSocket"; + private static final long VERIFY_USAGE_TIME = 60*1000; private static final long MAX_SEND_WAIT = 10*1000; @@ -279,6 +286,10 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa if (_context.isRouterContext()) // just for logging return "[internal connection]"; + else if (SystemVersion.isAndroid() && + Boolean.parseBoolean(_options.getProperty(PROP_DOMAIN_SOCKET))) + // just for logging + return "[Domain socket connection]"; return _options.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1"); } @@ -287,7 +298,9 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa * @since 0.9.7 was in loadConfig() */ private int getPort() { - if (_context.isRouterContext()) + if (_context.isRouterContext() || + (SystemVersion.isAndroid() && + Boolean.parseBoolean(_options.getProperty(PROP_DOMAIN_SOCKET)))) // just for logging return 0; String portNum = _options.getProperty(I2PClient.PROP_TCP_PORT, LISTEN_PORT + ""); @@ -447,7 +460,7 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa try { // protect w/ closeSocket() synchronized(_stateLock) { - // If we are in the router JVM, connect using the interal queue + // If we are in the router JVM, connect using the internal queue if (_context.isRouterContext()) { // _socket and _writer remain null InternalClientManager mgr = _context.internalClientManager(); @@ -457,7 +470,11 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa _queue = mgr.connect(); _reader = new QueuedI2CPMessageReader(_queue, this); } else { - if (Boolean.parseBoolean(_options.getProperty(PROP_ENABLE_SSL))) { + if (SystemVersion.isAndroid() && + Boolean.parseBoolean(_options.getProperty(PROP_DOMAIN_SOCKET))) { + final DomainSocketFactory fact = new DomainSocketFactory(_context); + _socket = fact.createSocket(DomainSocketFactory.I2CP_SOCKET_ADDRESS); + } else if (Boolean.parseBoolean(_options.getProperty(PROP_ENABLE_SSL))) { try { I2PSSLSocketFactory fact = new I2PSSLSocketFactory(_context, false, "certificates/i2cp"); _socket = fact.createSocket(_hostname, _portNum); diff --git a/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java b/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java index d22bafd2e..246af5403 100644 --- a/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java +++ b/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java @@ -19,6 +19,7 @@ import net.i2p.data.DataFormatException; import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.Signature; +import net.i2p.data.SigningPublicKey; import net.i2p.util.Log; /** @@ -34,16 +35,11 @@ public final class I2PDatagramDissector { private final DSAEngine dsaEng = DSAEngine.getInstance(); private final SHA256Generator hashGen = SHA256Generator.getInstance(); - private Hash rxHash; - + private byte[] rxHash; private Signature rxSign; - private Destination rxDest; - private final byte[] rxPayload = new byte[DGRAM_BUFSIZE]; - private int rxPayloadLen; - private boolean valid; /** @@ -56,6 +52,17 @@ public final class I2PDatagramDissector { * Load an I2P repliable datagram into the dissector. * Does NOT verify the signature. * + * Format is: + *

    + *
  1. Destination (387+ bytes) + *
  2. Signature (40+ bytes, type and length as implied by signing key type in the Destination) + *
  3. Payload + *
+ * + * For DSA_SHA1 Destinations, the signature is of the SHA-256 Hash of the payload. + * + * As of 0.9.14, for non-DSA_SHA1 Destinations, the signature is of the payload itself. + * * @param dgram non-null I2P repliable datagram to be loaded * * @throws DataFormatException If there's an error in the datagram format @@ -79,14 +86,21 @@ public final class I2PDatagramDissector { rxPayloadLen = dgStream.read(rxPayload); // calculate the hash of the payload - this.rxHash = hashGen.calculateHash(rxPayload, 0, rxPayloadLen); - assert this.hashGen.calculateHash(this.extractPayload()).equals(this.rxHash); + if (type == SigType.DSA_SHA1) { + if (rxHash == null) + rxHash = new byte[Hash.HASH_LENGTH]; + // non-caching + hashGen.calculateHash(rxPayload, 0, rxPayloadLen, rxHash, 0); + //assert this.hashGen.calculateHash(this.extractPayload()).equals(this.rxHash); + } else { + rxHash = null; + } } catch (IOException e) { Log log = I2PAppContext.getGlobalContext().logManager().getLog(I2PDatagramDissector.class); log.error("Caught IOException - INCONSISTENT STATE!", e); - } catch(AssertionError e) { - Log log = I2PAppContext.getGlobalContext().logManager().getLog(I2PDatagramDissector.class); - log.error("Assertion failed!", e); + //} catch(AssertionError e) { + // Log log = I2PAppContext.getGlobalContext().logManager().getLog(I2PDatagramDissector.class); + // log.error("Assertion failed!", e); } //_log.debug("Datagram payload size: " + rxPayloadLen + "; content:\n" @@ -125,14 +139,16 @@ public final class I2PDatagramDissector { * Extract the hash of the payload of an I2P repliable datagram (previously * loaded with the loadI2PDatagram() method), verifying the datagram * signature. + * + * As of 0.9.14, for signature types other than DSA_SHA1, this returns null. + * * @return The hash of the payload of the I2P repliable datagram * @throws I2PInvalidDatagramException if the signature verification fails */ public Hash getHash() throws I2PInvalidDatagramException { // make sure it has a valid signature this.verifySignature(); - - return this.extractHash(); + return extractHash(); } /** @@ -178,10 +194,18 @@ public final class I2PDatagramDissector { * Extract the hash of the payload of an I2P repliable datagram (previously * loaded with the loadI2PDatagram() method), without verifying the datagram * signature. + * + * As of 0.9.14, for signature types other than DSA_SHA1, this returns null. + * * @return The hash of the payload of the I2P repliable datagram */ public Hash extractHash() { - return this.rxHash; + if (rxHash == null) + return null; + // make a copy as we will reuse rxHash + byte[] hash = new byte[Hash.HASH_LENGTH]; + System.arraycopy(rxHash, 0, hash, 0, Hash.HASH_LENGTH); + return new Hash(hash); } /** @@ -194,12 +218,21 @@ public final class I2PDatagramDissector { if(this.valid) return; - if (rxSign == null || rxSign.getData() == null || rxDest == null || rxDest.getSigningPublicKey() == null) + if (rxSign == null || rxSign.getData() == null || rxDest == null) throw new I2PInvalidDatagramException("Datagram not yet read"); - + // now validate - if (!this.dsaEng.verifySignature(rxSign, rxHash.getData(), rxDest.getSigningPublicKey())) - throw new I2PInvalidDatagramException("Incorrect I2P repliable datagram signature"); + SigningPublicKey spk = rxDest.getSigningPublicKey(); + SigType type = spk.getType(); + if (type == null) + throw new I2PInvalidDatagramException("unsupported sig type"); + if (type == SigType.DSA_SHA1) { + if (!this.dsaEng.verifySignature(rxSign, rxHash, spk)) + throw new I2PInvalidDatagramException("Incorrect I2P repliable datagram signature"); + } else { + if (!this.dsaEng.verifySignature(rxSign, rxPayload, 0, rxPayloadLen, spk)) + throw new I2PInvalidDatagramException("Incorrect I2P repliable datagram signature"); + } // set validated this.valid = true; diff --git a/core/java/src/net/i2p/client/datagram/I2PDatagramMaker.java b/core/java/src/net/i2p/client/datagram/I2PDatagramMaker.java index 28336e412..015bbdbcd 100644 --- a/core/java/src/net/i2p/client/datagram/I2PDatagramMaker.java +++ b/core/java/src/net/i2p/client/datagram/I2PDatagramMaker.java @@ -16,8 +16,12 @@ import net.i2p.client.I2PSession; import net.i2p.crypto.DSAEngine; import net.i2p.crypto.SHA256Generator; import net.i2p.data.DataFormatException; +import net.i2p.data.Hash; +import net.i2p.data.Signature; import net.i2p.data.SigningPrivateKey; +import net.i2p.crypto.SigType; import net.i2p.util.Log; +import net.i2p.util.SimpleByteCache; /** * Class for creating I2P repliable datagrams. Note that objects of this class @@ -44,9 +48,9 @@ public final class I2PDatagramMaker { * @param session I2PSession used to send I2PDatagrams through */ public I2PDatagramMaker(I2PSession session) { - this(); this.setI2PDatagramMaker(session); } + /** * Construct a new I2PDatagramMaker that is null. * Use setI2PDatagramMaker to set the parameters. @@ -59,22 +63,53 @@ public final class I2PDatagramMaker { sxPrivKey = session.getPrivateKey(); sxDestBytes = session.getMyDestination().toByteArray(); } + /** * Make a repliable I2P datagram containing the specified payload. * + * Format is: + *
    + *
  1. Destination (387+ bytes) + *
  2. Signature (40+ bytes, type and length as implied by signing key type in the Destination) + *
  3. Payload + *
+ * + * Maximum datagram size is 32768, so maximum payload size is 32341, or less for + * non-DSA_SHA1 destinations. Practical maximum is a few KB less due to + * ElGamal/AES overhead. 10 KB or less is recommended for best results. + * + * For DSA_SHA1 Destinations, the signature is of the SHA-256 Hash of the payload. + * + * As of 0.9.14, for non-DSA_SHA1 Destinations, the signature is of the payload itself. + * * @param payload non-null Bytes to be contained in the I2P datagram. + * @return null on error + * @throws IllegalArgumentException if payload is too big + * @throws IllegalStateException if Destination signature type unsupported */ public byte[] makeI2PDatagram(byte[] payload) { sxDGram.reset(); try { sxDGram.write(sxDestBytes); + SigType type = sxPrivKey.getType(); + if (type == null) + throw new IllegalStateException("Unsupported sig type"); - dsaEng.sign(hashGen.calculateHash(payload).toByteArray(), - sxPrivKey).writeBytes(sxDGram); - + Signature sig; + if (type == SigType.DSA_SHA1) { + byte[] hash = SimpleByteCache.acquire(Hash.HASH_LENGTH); + // non-caching + hashGen.calculateHash(payload, 0, payload.length, hash, 0); + sig = dsaEng.sign(hash, sxPrivKey); + SimpleByteCache.release(hash); + } else { + sig = dsaEng.sign(payload, sxPrivKey); + } + sig.writeBytes(sxDGram); sxDGram.write(payload); - + if (sxDGram.size() > DGRAM_BUFSIZE) + throw new IllegalArgumentException("Too big"); return sxDGram.toByteArray(); } catch (IOException e) { Log log = I2PAppContext.getGlobalContext().logManager().getLog(I2PDatagramMaker.class); diff --git a/core/java/src/net/i2p/client/datagram/package.html b/core/java/src/net/i2p/client/datagram/package.html index da3a87140..085df6568 100644 --- a/core/java/src/net/i2p/client/datagram/package.html +++ b/core/java/src/net/i2p/client/datagram/package.html @@ -10,6 +10,9 @@ in turn, use the {@link net.i2p.client.datagram.I2PDatagramMaker} to build a message that can be parsed.

The datagram format implemented here includes -the sender's {@link net.i2p.data.Destination}, the payload, and a hash of the -payload (signed by the sender's {@link net.i2p.data.SigningPrivateKey}).

+the sender's {@link net.i2p.data.Destination}, the payload, and a signature +(signed by the sender's {@link net.i2p.data.SigningPrivateKey}). +For DSA_SHA1 destinations, the signature is of the SHA-256 Hash of the payload. +For other destination types, the signature is of the payload itself. +

diff --git a/core/java/src/net/i2p/crypto/CertUtil.java b/core/java/src/net/i2p/crypto/CertUtil.java index 359ce7aac..aa484a522 100644 --- a/core/java/src/net/i2p/crypto/CertUtil.java +++ b/core/java/src/net/i2p/crypto/CertUtil.java @@ -18,6 +18,7 @@ import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.util.Log; import net.i2p.util.SecureFileOutputStream; +import net.i2p.util.SystemVersion; /** * Java X.509 certificate utilities, consolidated from various places. @@ -65,11 +66,18 @@ public class CertUtil { } /** - * Get a value out of the subject distinguished name + * Get a value out of the subject distinguished name. + * + * Warning - unsupported in Android (no javax.naming), returns null. + * * @param type e.g. "CN" * @return value or null if not found */ public static String getSubjectValue(X509Certificate cert, String type) { + if (SystemVersion.isAndroid()) { + error("Don't call this in Android", new UnsupportedOperationException("I did it")); + return null; + } type = type.toUpperCase(Locale.US); X500Principal p = cert.getSubjectX500Principal(); String subj = p.getName(); diff --git a/core/java/src/net/i2p/crypto/DirKeyRing.java b/core/java/src/net/i2p/crypto/DirKeyRing.java index 6085694ea..38ba45bf8 100644 --- a/core/java/src/net/i2p/crypto/DirKeyRing.java +++ b/core/java/src/net/i2p/crypto/DirKeyRing.java @@ -14,9 +14,11 @@ import java.security.PublicKey; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; +import net.i2p.util.SystemVersion; + /** - * Dumb storage in a directory for testing. - * No sanitization of filenames, unsafe. + * Simple storage of each cert in a separate file in a directory. + * Limited sanitization of filenames. * * @since 0.9.9 */ @@ -30,7 +32,9 @@ class DirKeyRing implements KeyRing { /** * Cert must be in the file (escaped keyName).crt, - * and have a CN == keyName + * and have a CN == keyName. + * + * CN check unsupported on Android. */ public PublicKey getKey(String keyName, String scope, SigType type) throws GeneralSecurityException, IOException { @@ -49,14 +53,21 @@ class DirKeyRing implements KeyRing { CertificateFactory cf = CertificateFactory.getInstance("X.509"); X509Certificate cert = (X509Certificate)cf.generateCertificate(fis); cert.checkValidity(); - String cn = CertUtil.getSubjectValue(cert, "CN"); - if (!keyName.equals(cn)) - throw new GeneralSecurityException("CN mismatch: " + cn); + if (!SystemVersion.isAndroid()) { + // getSubjectValue() unsupported on Android. + // Any cert problems will be caught in non-Android testing. + String cn = CertUtil.getSubjectValue(cert, "CN"); + if (!keyName.equals(cn)) + throw new GeneralSecurityException("CN mismatch: " + cn); + } return cert.getPublicKey(); } finally { try { if (fis != null) fis.close(); } catch (IOException foo) {} } } + /** + * Unimplemented, unused. + */ public void setKey(String keyName, String scope, PublicKey key) {} } diff --git a/core/java/src/net/i2p/crypto/SessionKeyManager.java b/core/java/src/net/i2p/crypto/SessionKeyManager.java index cb67c9f3f..c8da3537a 100644 --- a/core/java/src/net/i2p/crypto/SessionKeyManager.java +++ b/core/java/src/net/i2p/crypto/SessionKeyManager.java @@ -29,7 +29,7 @@ public class SessionKeyManager { /** * A dummy SessionKeyManager for testing or for passing to - * ElGamalAESEngine.encrypt() + * ElGamalAESEngine.decrypt() * * @since 0.9.14 */ @@ -37,7 +37,7 @@ public class SessionKeyManager { /** * A dummy SessionKeyManager for testing or for passing to - * ElGamalAESEngine.encrypt() + * ElGamalAESEngine.decrypt() * * @param context unused * @since public since 0.9.14; protected before that diff --git a/history.txt b/history.txt index 5fcdc5897..8748f6f5b 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,18 @@ +2014-07-19 zzz + * i2psnark: Don't prefer leeches during end game, to + prevent slowdowns or stalls + * SAM: Add support for RAW on the bridge socket in v3 (ticket #1334) + * Streaming; Disable fail-fast for now. + * SusiMail: Better error message on decode fail + +2014-07-15 str4d + * I2CP: Stubs for I2CP connections over Unix domain sockets + +2014-07-11 zzz + * Datagrams: + - Redefine the repliable datagram signature for non-DSA_SHA1 sig types; + was the sig of the SHA-256 of the payload, now the sig of the payload itself. + 2014-07-03 zzz * Base64: - Catch numerous decoding errors that were previously misdecoded (ticket #1318) diff --git a/installer/resources/certificates/reseed/matt_at_drollette.com.crt b/installer/resources/certificates/reseed/matt_at_drollette.com.crt new file mode 100644 index 000000000..e490a152a --- /dev/null +++ b/installer/resources/certificates/reseed/matt_at_drollette.com.crt @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFgzCCA2ugAwIBAgIEB52rdjANBgkqhkiG9w0BAQ0FADByMQswCQYDVQQGEwJY +WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt +b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEbMBkGA1UEAwwSbWF0dEBkcm9sbGV0 +dGUuY29tMB4XDTE0MDcyMTEzMjYxM1oXDTI0MDcyMDEzMjYxM1owcjELMAkGA1UE +BhMCWFgxCzAJBgNVBAgTAlhYMQswCQYDVQQHEwJYWDEeMBwGA1UEChMVSTJQIEFu +b255bW91cyBOZXR3b3JrMQwwCgYDVQQLEwNJMlAxGzAZBgNVBAMMEm1hdHRAZHJv +bGxldHRlLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5M9wKT +csNLg4EA3fW7LleTQdrm3stPnoUvFmsNZHGgsKt1Nc1qCNis3kr2QEY+4Z398U7r +7xGEQFa7D/9SPHf6n1uVXc9DIcmwBtEB0FPB1XPFp2h00ZXIv24yiLN3GQT1woAM +yEbBWsUgn8K/iMBeA5dU2vPwAbGO/0ibD62frgGdYqU2EeiJ/U6vBmKxvC+q2noL +gnyfQJEJANXgf+Cw/gBaS6yn5ZsYcenLNenID2TQKQ6Q/NxYrDYRdWdId29iwldt +dmNSmASv8C7g9d/isZkpmtYNkE4J4m0W9wKziOoyvLSMo8ec67QmCKaPaYKTHTjx +aUuja02+mnlV4DSdZo6nPkSdokRY0+5e6q7+dIPefu8ealGEAE5oedEfl5iM5Fnz +phTR+ePodBK3sB+bMi1NMppbWugpFpdqs1hg2KNKSSG8C4/eTqf2nnlDiVvvFANc +imt6tk0pZcKqveRiDSgI8mTzTcrNgVClsCLoInY5Vab7onZjY9bGijPQ2i1P6+qu +5G6LiLFW7xFq2BcX1DnTztcJ8Yu9NYHhR21J6u7Dr8YHntes3mnth1F0BX3FVA1s +9SaE9/pNhdqap9owpEhNoE1Ke3LorVLL8jyQsqgRHx8VdhWdi9Ao0mzzeI9HYX0j +nZ7uXK5DqGG74K6eWoS9jZSDJLj3IBkIr3B/AgMBAAGjITAfMB0GA1UdDgQWBBTK +YjH+9Jv82Zqi86r95/1sXUCOnDANBgkqhkiG9w0BAQ0FAAOCAgEAsDyl3dS/5pR1 +iDN0zE70HN1Sjv55c5um6N39rgz8JSObbAMihhpjRXPR6yl0PdfVcswdCuEaaykp +ppPNY5ObqZIdqI92XOaOhSA3AkZwZffbwaoXFYiawq1aQG1HP7oxXzWwbnbPOxgz +6ThNP5DJan53Mk8TAhxoJkEJxVlMwIiC+QEgqDNYrP8oNOR2J1EXgzsHheEKObyP +xTwRYFqZU/7BQlFeB0LG1LIy9zXAHlb/XIor10w6ChPDW7DiDwGq3zDJw1d8eiUn +RoPRmFjTqn+3rGaEkk+vUFHoWo7cLCEIC3+P9wlY4Kel+ldXMmuJ+BZ1glFXeO3L +VO85n7iVIyBbwo7RLtNaBvrRQIEG3ld5UOKklLlWwhrX/FXksEhdFvmuF9sbiYNr +cg81sbwZlX7Gi7VicXkykFFXwRRr3UblDtfeevouxk4nMVzcDsmzGeAZKQBvcxHa +Pzc70YwnVRqTc87c0bEwPoxK1Vb26+DILyDjKb/AkTw/rwj6vcJZP2ad+hpiz5Ka +nlbY2cI3JJb0TQiDiOIk+xFqC5oHUTSEmfqA6sA5o/RqdwDpkfpgI5mCwhYzDSLD +jfS+263ylhanl7oz0sM+GtH63owVbYJAFT2EozT9siTIErvJESL4Z80yUQG63d/7 +fss8T6gOo19esb/KEMZGZE4pAApakWM= +-----END CERTIFICATE----- diff --git a/installer/resources/certificates/reseed/sindu_at_mail.i2p.crt b/installer/resources/certificates/reseed/sindu_at_mail.i2p.crt new file mode 100644 index 000000000..be1010f9b --- /dev/null +++ b/installer/resources/certificates/reseed/sindu_at_mail.i2p.crt @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFezCCA2OgAwIBAgIEPSs1SjANBgkqhkiG9w0BAQ0FADBuMQswCQYDVQQGEwJY +WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt +b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOc2luZHVAbWFpbC5p +MnAwHhcNMTQwNzIxMDAwNjUwWhcNMjQwNzIwMDAwNjUwWjBuMQswCQYDVQQGEwJY +WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt +b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEXMBUGA1UEAwwOc2luZHVAbWFpbC5p +MnAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnYMNclgj1gIJfot6f +65jbcXpcqf9hhL/uYiU4+uxVevWyJvNHpMzhPWNN4l3HihJJsINsPs/MsZ83Guva +GW5S/93I617kyjs/ZVpEtfABGewho0m9VCBV2/N1mJpHvvR+9OR+YVuWlTB/8sTG +2smdRj/dkKvewN5PSTQH350yT18NR/DmZUU1Iwa7vrNw8ol3rP3qx9UGpFN3JE7V +Q9cA1nktMiFUm76eOPOoln04WDqW2rvArXzvhSApvt0JsLBrZDzM3cx2Rc2UdjIC +h+Ha+G4CLjszfZfQAFJYPred38Gg6wuXiza/wCBSPiB92i94hIQF/OSeukaMiqwG +dRAcBT84/U9bddqHlIICw14PkNHOGUyJGjGKWQl/2bLX43ghWkUJmsTXS3iVcOTc +gb/7MoCRBdL0q2GyEJXuAoKXD9VqD3g+EdcBTQxS9lhZ0iTR7423pg6FP43VMEUC +HUi/BOX1tCY6iRzD1Su6ISIx7klH/sAWWa+SybLFXWtZJxHXXJICiBHJWRbWgtlu +5V+at66yg/LNpyfW3Am08gDV0kiWUBN2Ct4TX9PAQmNDisNgi2AzdZHIfX6tRpU8 +UnNcnZGOh4+HXQwJtI0y83C8TsXJUFYfGFWqXN69sMEmgtX8/w+YUqjtb2GcX1HN +6z9u9lH40JCFHTA/clPqOSQ+MQIDAQABoyEwHzAdBgNVHQ4EFgQU4R6x7ArVpSVs +b8VTBXmodXzyraEwDQYJKoZIhvcNAQENBQADggIBAJEHLSDBRU2x6EalmN2W952p +MEO5lGD+ZfUVK0c44t1O53naffwZx9QmDmrC4TjeQrLOpAXLQ8GJHAGeZVmYRgkf +OioKde5uuqVcxqNxArO8VyYGwsuNVPCaBV+SyIO+EmWogidSIrOP2WsRRS2NBhLV +2dp3TvMeod9bPwRl00guvv9iqL0UVSpQSlfGkAQTVpyADOaQHOzeoCpmtPOfB6OK +syB/Z/6HElKoUbvhynaASLgmo3wM93PVJQ2Ho294bQHtDl2qcOksJQvWfCgi7Zrt +KuHaM/a2kItzI6JmyNFXgsKQSDJ4UvoppppgD7K48zOtSipGuZAADC5w5HdVvIGJ +1Czva8kTcmC6AMc+4tACGqYZEAEokkeXn+pIIqKVj2eQukT/0dLGGHbKmxp3Z0f2 +pIH2Draq8JPdacr9P/xqEWUuViaOuC5OBjY8Fg3fmVCpwefIuk+DBhbJjEugB0Cu +brJpqNznoYahkbyAXIA8T+QJYMhoGWmaIcaPWK6K3nArvaxzwJbb9Egyivhyp9Rr +r2QMEZ+cPO8p1mEhKpL/wGqAzYyla8SJ06PzLc1lQeGiClu1nbZj5AgkZ1DLa8SD +iO7+e6rS0q1bzc7smE5JzZRiOVqKij/ReKa2uebLLI4wgAhz5ymaD1HfZY+3dV9T +WX89Xn2UyQf5kHifiDKL +-----END CERTIFICATE----- diff --git a/installer/resources/hosts.txt b/installer/resources/hosts.txt index 527653924..662b4995c 100644 --- a/installer/resources/hosts.txt +++ b/installer/resources/hosts.txt @@ -357,3 +357,4 @@ anoncoin.i2p=vA4OWvaW6ChyRACDUSq0SiWBB88SBd-3sBAPphzAsUGfQeZMvcmCLM1KuZ9kRLPZnzA jisko.i2p=YSXAtZN7atC3kAoMLFr6vRcEYf3oUpBonrePtfzt6ydtXIqt501dUqwDXVzKP2Hkmg2Zg9HCdMy8a1JCUZLS-T9sPgYn44FEnWg4j2QFFRafpSTLrdDXMK1CpyQhZUYJr4mzg3MEY37cBGSlodFlAgm-J2sgcog7SEpoZrLJ3wNZU8aisQZlUjvn83McMEnLH-AmcTyO3feLaTX7BJE6L6OB67MBieUH0-uNeolHIne1GzcHBuC-0F~wW6pd1eDFDdoQV81VMWAPnkCPzdIW-rmF0C7nvSqzgBpeoywBmIsZwzRKpWO029vknOcioj5HCkvUT~iZeYqSyoLXcdJjM3c5ZPz0AnPss6wuhhSQTqcIqvF0r42ET6-XerwuWJVlDilKjDmzFZ6sj7ZvNiOs2vwQqyNM00geSWgWs50MEqQU1oE2~05fj9qtBw~kXVn1NqAs0~477mnvNlObTHI72USk8OBQDdEKO-OjzL6T67w5Nn3XXe-UYHXqCBvbgAjgAAAA hiddengate.i2p=2BJrMAUHLQBc0CoRnkVpFfkx9dp74qpe3TVlLiXe-RuQGwBNztoYN7WjfmRHF5~KZ-KUEKhA3BbAFuWksGMOi7mV0hUD8Egr5ZG03-ekysSiKmVj3mfMv-GfPTdq5W-OdXK87q1Z~KV-e4Qwq6OFV8VREF81jDeMo4agdV0~388WNaQUjS-Jyh7wInh1XOaENFzsLSBPfbgZMIUEoCe5HiTaXLDTxRnDdLPgkvNfOEV9vT3rCgX2lhd8xVL48q4OObjlZ6DLdQ~O4kSIZoPX~9FWDKPB9nCVCa2zIkbDhBqN7p-r~HSPBUM2nUBB2gwuyYtpiLz3ukqEUGV20VAVZ35RqL-pWl4wAMqy2iRwFcgYnM8tvPGFmJM0lLyPlZdyRSU86QkvvVMUrZYXcylg4uP0WXPeNIP4nXOj5ZR7s9gP3AL4xW4Dh2YqPoCaWWt8J2LZugX7QSHpFVEdWZtxnppD1zDmIsbpm-UAUqdgviTIcFPyhxHaEGMUZ7Gid2FqAAAA i2pdocs.str4d.i2p=CRayYfxrPBELUQ4tYi723g8atsyHwkR0--N8fXggNqJgHsnrKxle0ovH5qj6aqUGToay4ktJEz~opIV2lF605gdGE9rSrPONOU0v737~gzjmLpJoyW03yOhr6lGvTxTKWjgx5xRHctt11DEMlMufY4Q72~EZETE4k5E45V3YqSWGyYIzxdpzzw9zvMe9TaLZTs0ZYFgXRMIu1o5IzTkfK2FfAMNfHMcRESHHK8GcF0TkzZFnvOhtgr~Fywq5B7VMYzwq6a8ws5bPjSjQWbJqX8NR~NZl7gxSMwdlZlcICVFOo-uW9Yna2YfhzM-A5SOx60EsL26YX1VXh1zQ3Rsg2lNXbSPI4dLb9taGWxpZS914L-N3Htgih7VM-Zl1QYQGuNV-9LaEEUQKRPCeKdyG14Yry4YOVDItMFE5CHIDaoFcpD24jPE~0aHmVk~RXOIzVhmtVj~HcpBXWxT4lpIO2V3kzA-ZTvo5I0ollbP5Ep3s0Cj~EfikBhUL6zHsWVC0AAAA +mtn.i2p-projekt.i2p=I6Ha4I7rgR0JyExQnN~4sZz5CfRqdN7o-2t1i2YOExd2CxC4MHHz3nJ5KgBIqeNa0dZbugwMEYMWneXAf8nuy9RKUrjcDvGLqScuU8QCpG-e7UDR8lNregfaOwTuypBQiPh9nrc86Zc2JXyTv0eG3T5Yl1tydqs3qEz5w1vn64uRCrGLEMsnGMIZ4aXexseL6McW9ObIQ0qOIfRG9kc~3~bpD9UM4G04BXPZ1Ao5MUjGoQyxlaNCt1DrvAYcrRArzvv0QGyPjb6HpHLlK2UIoR6SumRuNYpEXCaqbXEnEicx1kB5Pyhcwm0cyaMCx-ZaUU-F1~23VurE41xNMbq4GwXtev4bVP4ycHGHjH-XYJmKrqnesIEp7InSAWfm0gdDHuy9377nSIyAhGLLFlWKtzrZPiKm57SN4~BZSQIF6CI4JutGa0x9EaO8hvzFgaYKgwS~a7-YuZNfx4VHEF2J34DrsJo4qetdPTWTKX1o-ztMP6f7DpWjp4JTKb36YstvAAAA diff --git a/installer/resources/i2ptunnel.config b/installer/resources/i2ptunnel.config index d2a0b113e..8f2fdb925 100644 --- a/installer/resources/i2ptunnel.config +++ b/installer/resources/i2ptunnel.config @@ -57,13 +57,13 @@ tunnel.1.option.outbound.priority=15 tunnel.1.startOnLoad=true # I2P's mtn server -tunnel.2.name=mtn.i2p2.i2p +tunnel.2.name=mtn.i2p-projekt.i2p tunnel.2.description=I2P Monotone Server tunnel.2.type=client tunnel.2.sharedClient=true tunnel.2.interface=127.0.0.1 tunnel.2.listenPort=8998 -tunnel.2.targetDestination=mtn.i2p2.i2p:4691 +tunnel.2.targetDestination=mtn.i2p-projekt.i2p:4691 tunnel.2.i2cpHost=127.0.0.1 tunnel.2.i2cpPort=7654 tunnel.2.option.inbound.nickname=shared clients @@ -107,7 +107,6 @@ tunnel.4.option.outbound.nickname=shared clients tunnel.4.option.i2cp.reduceIdleTime=900000 tunnel.4.option.i2cp.reduceOnIdle=true tunnel.4.option.i2cp.reduceQuantity=1 -tunnel.4.option.i2p.streaming.connectDelay=1000 tunnel.4.option.inbound.length=3 tunnel.4.option.inbound.lengthVariance=0 tunnel.4.option.outbound.length=3 diff --git a/installer/resources/initialNews/initialNews.xml b/installer/resources/initialNews/initialNews.xml index a91ae226e..0432286e0 100644 --- a/installer/resources/initialNews/initialNews.xml +++ b/installer/resources/initialNews/initialNews.xml @@ -14,7 +14,7 @@ _("Do not use SOCKS for this.") _("More information can be found on the {0}I2P browser proxy setup page{1}.", "", "")

-_("Once you have a \"shared clients\" destination listed on the left, please {0}check out{1} our {2}FAQ{3}.", "", "", "", "") +_("Once you have a \"shared clients\" destination listed on the left, please {0}check out{1} our {2}FAQ{3}.", "", "", "", "")

_("Point your IRC client to {0}localhost:6668{1} and say hi to us on {2}#i2p{3}.", "", "", "", "") diff --git a/installer/resources/readme/readme_fr.html b/installer/resources/readme/readme_fr.html index f30a4003e..1060c7253 100644 --- a/installer/resources/readme/readme_fr.html +++ b/installer/resources/readme/readme_fr.html @@ -1,109 +1,96 @@

-
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 31c35f8c3..5b1ba79e3 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -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 = 14; + public final static long BUILD = 19; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/client/ClientListenerRunner.java b/router/java/src/net/i2p/router/client/ClientListenerRunner.java index 9b169ca75..44d7811b6 100644 --- a/router/java/src/net/i2p/router/client/ClientListenerRunner.java +++ b/router/java/src/net/i2p/router/client/ClientListenerRunner.java @@ -64,7 +64,9 @@ class ClientListenerRunner implements Runnable { return new ServerSocket(_port, 0, InetAddress.getByName(listenInterface)); } } - + + public void run() { runServer(); } + /** * Start up the socket listener, listens for connections, and * fires those connections off via {@link #runConnection runConnection}. @@ -72,7 +74,7 @@ class ClientListenerRunner implements Runnable { * failure. * */ - public void runServer() { + protected void runServer() { _running = true; int curDelay = 1000; while (_running) { @@ -173,5 +175,4 @@ class ClientListenerRunner implements Runnable { _socket = null; } catch (IOException ioe) {} } - public void run() { runServer(); } } diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index 96e6ac20b..9a8850c9b 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -10,8 +10,10 @@ package net.i2p.router.client; import java.io.IOException; import java.io.Writer; +import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.LinkedBlockingQueue; @@ -37,6 +39,7 @@ import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; import net.i2p.util.I2PThread; import net.i2p.util.Log; +import net.i2p.util.SystemVersion; /** * Coordinate connections and various tasks @@ -45,7 +48,7 @@ import net.i2p.util.Log; */ class ClientManager { private final Log _log; - protected ClientListenerRunner _listener; + protected final List _listeners; // Destination --> ClientConnectionRunner // Locked for adds/removes but not lookups private final Map _runners; @@ -87,6 +90,7 @@ class ClientManager { // "How large are messages received by the client?", // "ClientMessages", // new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l }); + _listeners = new ArrayList(); _runners = new ConcurrentHashMap(); _runnersByHash = new ConcurrentHashMap(); _pendingRunners = new HashSet(); @@ -105,14 +109,22 @@ class ClientManager { /** Todo: Start a 3rd listener for IPV6? */ protected void startListeners() { + ClientListenerRunner listener; + if (SystemVersion.isAndroid()) { + listener = new DomainClientListenerRunner(_ctx, this); + Thread t = new I2PThread(listener, "DomainClientListener", true); + t.start(); + _listeners.add(listener); + } if (!_ctx.getBooleanProperty(PROP_DISABLE_EXTERNAL)) { // there's no option to start both an SSL and non-SSL listener if (_ctx.getBooleanProperty(PROP_ENABLE_SSL)) - _listener = new SSLClientListenerRunner(_ctx, this, _port); + listener = new SSLClientListenerRunner(_ctx, this, _port); else - _listener = new ClientListenerRunner(_ctx, this, _port); - Thread t = new I2PThread(_listener, "ClientListener:" + _port, true); + listener = new ClientListenerRunner(_ctx, this, _port); + Thread t = new I2PThread(listener, "ClientListener:" + _port, true); t.start(); + _listeners.add(listener); } _isStarted = true; } @@ -132,8 +144,9 @@ class ClientManager { public synchronized void shutdown(String msg) { _isStarted = false; _log.info("Shutting down the ClientManager"); - if (_listener != null) - _listener.stopListening(); + for (ClientListenerRunner listener : _listeners) + listener.stopListening(); + _listeners.clear(); Set runners = new HashSet(); synchronized (_runners) { for (ClientConnectionRunner runner : _runners.values()) { @@ -169,8 +182,13 @@ class ClientManager { return hisQueue; } - public boolean isAlive() { - return _isStarted && (_listener == null || _listener.isListening()); + public synchronized boolean isAlive() { + boolean listening = true; + if (!_listeners.isEmpty()) { + for (ClientListenerRunner listener : _listeners) + listening = listening && listener.isListening(); + } + return _isStarted && (_listeners.isEmpty() || listening); } public void registerConnection(ClientConnectionRunner runner) { diff --git a/router/java/src/net/i2p/router/client/DomainClientListenerRunner.java b/router/java/src/net/i2p/router/client/DomainClientListenerRunner.java new file mode 100644 index 000000000..0f28a494f --- /dev/null +++ b/router/java/src/net/i2p/router/client/DomainClientListenerRunner.java @@ -0,0 +1,31 @@ +package net.i2p.router.client; + +import java.io.IOException; +import java.net.ServerSocket; + +import net.i2p.client.DomainSocketFactory; +import net.i2p.router.RouterContext; + +/** + * Unix domain socket version of ClientListenerRunner. + *

+ * This is a stub that does nothing. + * This class is replaced in the Android build. + * + * @author str4d + * @since 0.9.14 + */ +public class DomainClientListenerRunner extends ClientListenerRunner { + public DomainClientListenerRunner(RouterContext context, ClientManager manager) { + super(context, manager, -1); + } + + /** + * @throws IOException + */ + @Override + protected ServerSocket getServerSocket() throws IOException { + final DomainSocketFactory fact = new DomainSocketFactory(_context); + return fact.createServerSocket(DomainSocketFactory.I2CP_SOCKET_ADDRESS); + } +} diff --git a/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java b/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java index fcd008ad6..948cb7527 100644 --- a/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java +++ b/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java @@ -181,7 +181,7 @@ class SSLClientListenerRunner extends ClientListenerRunner { * Create (if necessary) and load the key store, then run. */ @Override - public void runServer() { + protected void runServer() { File keyStore = new File(_context.getConfigDir(), "keystore/i2cp.ks"); if (verifyKeyStore(keyStore) && initializeFactory(keyStore)) { super.runServer(); diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java index 3bcb7d8d9..af605cc8e 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -534,7 +534,9 @@ public class Reseeder { break; } } catch (Throwable t) { - _log.warn("Error reseeding", t); + System.err.println("Error reseeding: " + t); + _log.error("Error reseeding", t); + errors++; } finally { if (contentRaw != null) contentRaw.delete(); diff --git a/router/java/src/net/i2p/router/package.html b/router/java/src/net/i2p/router/package.html index e18dbdf96..dc610cc0c 100644 --- a/router/java/src/net/i2p/router/package.html +++ b/router/java/src/net/i2p/router/package.html @@ -10,6 +10,9 @@ Classes in this package, sub-packages, and others in router.jar are not for use by apps, clients or plugins (except for routerconsole). Subject to change. Not necessarily maintained as a stable API. +

+For applications bundling the I2P router, instantiate Router and call runRouter(), or use Router.main() or RouterLaunch. +Most public methods in Router are maintained as a stable I2P for those bundling the router.

diff --git a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java index fb7bf15fc..f8df02989 100644 --- a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java +++ b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java @@ -36,9 +36,10 @@ class LocalClientManager extends ClientManager { @Override protected void startListeners() { - _listener = new LocalClientListenerRunner(_ctx, this, _port); - Thread t = new I2PThread(_listener, "ClientListener:" + _port, true); + ClientListenerRunner listener = new LocalClientListenerRunner(_ctx, this, _port); + Thread t = new I2PThread(listener, "ClientListener:" + _port, true); t.start(); + _listeners.add(listener); _isStarted = true; }