javadoc, log, comment, and su3file help tweaks

This commit is contained in:
zzz
2013-07-30 22:05:46 +00:00
parent 1284c7ace0
commit 04e6beb43c
7 changed files with 32 additions and 7 deletions

View File

@ -358,9 +358,9 @@ public class SU3File {
} }
private static final void showUsageCLI() { private static final void showUsageCLI() {
System.err.println("Usage: SU3File showversion signedFile"); System.err.println("Usage: SU3File showversion signedFile.su3");
System.err.println(" SU3File sign inputFile signedFile privateKeyFile version signerName"); System.err.println(" SU3File sign inputFile.zip signedFile.su3 privateKeyFile version signerName@mail.i2p");
System.err.println(" SU3File verifysig signedFile"); System.err.println(" SU3File verifysig signedFile.su3");
} }
/** @return success */ /** @return success */

View File

@ -13,6 +13,13 @@ package net.i2p.data;
* Defines an end point in the I2P network. The Destination may move around * Defines an end point in the I2P network. The Destination may move around
* in the network, but messages sent to the Destination will find it * in the network, but messages sent to the Destination will find it
* *
* Note that the public (encryption) key is essentially unused, since
* "end-to-end" encryption was removed in 0.6. The public key in the
* LeaseSet is used instead.
*
* The first bytes of the public key are used for the IV for leaseset encryption,
* but that encryption is poorly designed and should be deprecated.
*
* @author jrandom * @author jrandom
*/ */
public class Destination extends KeysAndCert { public class Destination extends KeysAndCert {

View File

@ -31,6 +31,10 @@ import net.i2p.util.RandomSource;
* Only the gateways and tunnel IDs in the individual * Only the gateways and tunnel IDs in the individual
* leases are encrypted. * leases are encrypted.
* *
* WARNING:
* Encryption is poorly designed and probably insecure.
* Not recommended.
*
* Encrypted leases are not indicated as such. * Encrypted leases are not indicated as such.
* The only way to tell a lease is encrypted is to * The only way to tell a lease is encrypted is to
* determine that the listed gateways do not exist. * determine that the listed gateways do not exist.

View File

@ -176,8 +176,7 @@ public class RandomSource extends SecureRandom implements EntropyHarvester {
SecureRandom.getInstance("SHA1PRNG").nextBytes(buf); SecureRandom.getInstance("SHA1PRNG").nextBytes(buf);
ok = true; ok = true;
} catch (NoSuchAlgorithmException e) {} } catch (NoSuchAlgorithmException e) {}
// why urandom? because /dev/random blocks, and there are arguments // why urandom? because /dev/random blocks
// suggesting such blockages are largely meaningless
ok = seedFromFile(new File("/dev/urandom"), buf) || ok; ok = seedFromFile(new File("/dev/urandom"), buf) || ok;
// we merge (XOR) in the data from /dev/urandom with our own seedfile // we merge (XOR) in the data from /dev/urandom with our own seedfile
File localFile = new File(_context.getConfigDir(), SEEDFILE); File localFile = new File(_context.getConfigDir(), SEEDFILE);
@ -186,6 +185,8 @@ public class RandomSource extends SecureRandom implements EntropyHarvester {
} }
/** /**
* XORs the seed into buf
*
* @param f absolute path * @param f absolute path
* @return success * @return success
*/ */

View File

@ -29,6 +29,7 @@ class OutboundTunnelEndpoint {
_handler = new RouterFragmentHandler(ctx, new DefragmentedHandler()); _handler = new RouterFragmentHandler(ctx, new DefragmentedHandler());
_outDistributor = new OutboundMessageDistributor(ctx, OutNetMessage.PRIORITY_PARTICIPATING); _outDistributor = new OutboundMessageDistributor(ctx, OutNetMessage.PRIORITY_PARTICIPATING);
} }
public void dispatch(TunnelDataMessage msg, Hash recvFrom) { public void dispatch(TunnelDataMessage msg, Hash recvFrom) {
_config.incrementProcessedMessages(); _config.incrementProcessedMessages();
boolean ok = _processor.process(msg.getData(), 0, msg.getData().length, recvFrom); boolean ok = _processor.process(msg.getData(), 0, msg.getData().length, recvFrom);
@ -66,4 +67,10 @@ class OutboundTunnelEndpoint {
_outDistributor.distribute(msg, toRouter, toTunnel); _outDistributor.distribute(msg, toRouter, toTunnel);
} }
} }
/** @since 0.9.8 */
@Override
public String toString() {
return "OBEP " + _config.getReceiveTunnel();
}
} }

View File

@ -44,4 +44,10 @@ class ThrottledPumpedTunnelGateway extends PumpedTunnelGateway {
} }
add(new PendingGatewayMessage(msg, toRouter, toTunnel)); add(new PendingGatewayMessage(msg, toRouter, toTunnel));
} }
/** @since 0.9.8 */
@Override
public String toString() {
return "IBGW " + _config.getReceiveTunnel();
}
} }

View File

@ -491,11 +491,11 @@ public class TunnelDispatcher implements Service {
boolean removed = (null != _participatingConfig.remove(recvId)); boolean removed = (null != _participatingConfig.remove(recvId));
if (removed) { if (removed) {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("removing " + cfg, new Exception()); _log.debug("removing " + cfg /* , new Exception() */ );
} else { } else {
// this is normal, this can get called twice // this is normal, this can get called twice
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Participating tunnel, but no longer listed in participatingConfig? " + cfg, new Exception()); _log.debug("Participating tunnel, but no longer listed in participatingConfig? " + cfg /* , new Exception() */ );
} }
removed = (null != _participants.remove(recvId)); removed = (null != _participants.remove(recvId));