I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

propagate from branch 'i2p.i2p.zzz.test3' (head f18425568ef4ef20f5054f6fb133cf217bfab485)

Browse Source 
to branch 'i2p.i2p' (head 36f4774eb9dd538b3a7c314de79a6fb3bc4df813)
This commit is contained in:
zzz
2009-09-04 15:14:36 +00:00
parent 83588d9b98 e392469835
commit 5372a50bcc
5 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHandler.java
View File

@ -6,7 +6,7 @@ import net.i2p.data.SessionKey;
import net.i2p.util.ConvertToHash; import net.i2p.util.ConvertToHash;
/** /**
* Support additions via B64 Destkey, B64 Desthash, or blahblah.i2p * Support additions via B64 Destkey, B64 Desthash, blahblah.i2p, and others supported by ConvertToHash
*/ */
public class ConfigKeyringHandler extends FormHandler { public class ConfigKeyringHandler extends FormHandler {
private String _peer; private String _peer;
@ -14,21 +14,36 @@ public class ConfigKeyringHandler extends FormHandler {
@Override @Override
protected void processForm() { protected void processForm() {
if ("Add key".equals(_action)) { if (_action == null) return;
if (_peer == null || _key == null) { boolean adding = _action.startsWith("Add");
addFormError("You must enter a destination and a key"); if (adding || _action.startsWith("Delete")) {
if (_peer == null)
addFormError("You must enter a destination");
if (_key == null && adding)
addFormError("You must enter a key");
if (_peer == null || (_key == null && adding))
return; return;
}
Hash h = ConvertToHash.getHash(_peer); Hash h = ConvertToHash.getHash(_peer);
SessionKey sk = new SessionKey(); if (adding) {
try { SessionKey sk = new SessionKey();
sk.fromBase64(_key); try {
} catch (DataFormatException dfe) {} sk.fromBase64(_key);
if (h != null && h.getData() != null && sk.getData() != null) { } catch (DataFormatException dfe) {}
_context.keyRing().put(h, sk); if (h != null && h.getData() != null && sk.getData() != null) {
addFormNotice("Key for " + h.toBase64() + " added to keyring"); _context.keyRing().put(h, sk);
} else { addFormNotice("Key for " + h.toBase64() + " added to keyring");
addFormError("Invalid destination or key"); } else {
addFormError("Invalid destination or key");
}
} else { // Delete
if (h != null && h.getData() != null) {
if (_context.keyRing().remove(h) != null)
addFormNotice("Key for " + h.toBase64() + " removed from keyring");
else
addFormNotice("Key for " + h.toBase64() + " not found in keyring");
} else {
addFormError("Invalid destination");
}
} }
} else { } else {
addFormError("Unsupported"); addFormError("Unsupported");

6
apps/routerconsole/jsp/configkeyring.jsp
View File

@ -40,9 +40,9 @@
<td class="mediumtags" align="right">Dest. name, hash, or full key:</td> <td class="mediumtags" align="right">Dest. name, hash, or full key:</td>
<td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea></td> <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea></td>
</tr><tr> </tr><tr>
<td class="mediumtags" align="right">Session Key:</td> <td class="mediumtags" align="right">Encryption Key:</td>
<td><input type="text" size="55" name="key" /></td> <td><input type="text" size="55" name="key" /></td>
</tr><tr> </tr><tr>
<td></td> <td align="right" colspan="2"><input type="submit" name="action" value="Add key" />
<td align="right"><input type="submit" name="action" value="Add key" /></td> <input type="submit" name="action" value="Delete key" /> <input type="reset" value="Cancel" /></td>
</tr></table></div></form></div></div></body></html> </tr></table></div></form></div></div></body></html>

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

@ -196,7 +196,10 @@ class LogWriter implements Runnable {
_rotationNum++; _rotationNum++;
if (_rotationNum > max) _rotationNum = 0; if (_rotationNum > max) _rotationNum = 0;
return new File(replace(pattern, _rotationNum)); String newf = replace(pattern, _rotationNum);
if (base != null)
return new File(base, newf);
return new File(newf);
} }
/** /**

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

@ -67,7 +67,7 @@ public class PersistentKeyRing extends KeyRing {
@Override @Override
public void renderStatusHTML(Writer out) throws IOException { public void renderStatusHTML(Writer out) throws IOException {
StringBuilder buf = new StringBuilder(1024); StringBuilder buf = new StringBuilder(1024);
buf.append("\n<table><tr><th align=\"left\">Destination Hash<th align=\"left\">Name or Dest.<th align=\"left\">Session Key</tr>"); buf.append("\n<table><tr><th align=\"left\">Destination Hash<th align=\"left\">Name or Dest.<th align=\"left\">Encryption Key</tr>");
for (Entry<Hash, SessionKey> e : entrySet()) { for (Entry<Hash, SessionKey> e : entrySet()) {
buf.append("\n<tr><td>"); buf.append("\n<tr><td>");
Hash h = e.getKey(); Hash h = e.getKey();

25
router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
View File

@ -28,20 +28,20 @@ import net.i2p.util.Log;
* *
*/ */
public class TunnelDispatcher implements Service { public class TunnelDispatcher implements Service {
private RouterContext _context; private final RouterContext _context;
private Log _log; private final Log _log;
private Map<TunnelId, TunnelGateway> _outboundGateways; private final Map<TunnelId, TunnelGateway> _outboundGateways;
private Map<TunnelId, OutboundTunnelEndpoint> _outboundEndpoints; private final Map<TunnelId, OutboundTunnelEndpoint> _outboundEndpoints;
private Map<TunnelId, TunnelParticipant> _participants; private final Map<TunnelId, TunnelParticipant> _participants;
private Map<TunnelId, TunnelGateway> _inboundGateways; private final Map<TunnelId, TunnelGateway> _inboundGateways;
private Map<TunnelId, HopConfig> _participatingConfig; private final Map<TunnelId, HopConfig> _participatingConfig;
/** what is the date/time on which the last non-locally-created tunnel expires? */ /** what is the date/time on which the last non-locally-created tunnel expires? */
private long _lastParticipatingExpiration; private long _lastParticipatingExpiration;
private BloomFilterIVValidator _validator; private BloomFilterIVValidator _validator;
private LeaveTunnel _leaveJob; private final LeaveTunnel _leaveJob;
/** what is the date/time we last deliberately dropped a tunnel? **/ /** what is the date/time we last deliberately dropped a tunnel? **/
private long _lastDropTime; private long _lastDropTime;
private TunnelGatewayPumper _pumper; private final TunnelGatewayPumper _pumper;
/** Creates a new instance of TunnelDispatcher */ /** Creates a new instance of TunnelDispatcher */
public TunnelDispatcher(RouterContext ctx) { public TunnelDispatcher(RouterContext ctx) {
@ -615,14 +615,14 @@ public class TunnelDispatcher implements Service {
return reject; return reject;
} }
private static final int DROP_BASE_INTERVAL = 40 * 1000; //private static final int DROP_BASE_INTERVAL = 40 * 1000;
private static final int DROP_RANDOM_BOOST = 10 * 1000; //private static final int DROP_RANDOM_BOOST = 10 * 1000;
/** /**
* If a router is too overloaded to build its own tunnels, * If a router is too overloaded to build its own tunnels,
* the build executor may call this. * the build executor may call this.
*/ */
/*******
public void dropBiggestParticipating() { public void dropBiggestParticipating() {
List<HopConfig> partTunnels = listParticipatingTunnels(); List<HopConfig> partTunnels = listParticipatingTunnels();
@ -677,6 +677,7 @@ public class TunnelDispatcher implements Service {
remove(biggest); remove(biggest);
_lastDropTime = _context.clock().now() + _context.random().nextInt(DROP_RANDOM_BOOST); _lastDropTime = _context.clock().now() + _context.random().nextInt(DROP_RANDOM_BOOST);
} }
******/
public void startup() { public void startup() {
// NB: 256 == assume max rate (size adjusted to handle 256 messages per second) // NB: 256 == assume max rate (size adjusted to handle 256 messages per second)