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

Router: Fix rekey after hidden config change

Browse Source
This commit is contained in:
zzz
2018-03-10 18:30:08 +00:00
parent 39039b89a4
commit eb321445d9
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHandler.java
View File

@@ -346,6 +346,7 @@ public class ConfigNetHandler extends FormHandler {
addFormError(_t("Gracefully restarting to exit Hidden Router Mode"));
}
changes.put(Router.PROP_REBUILD_KEYS, "" + switchRequired);
changes.put(Router.PROP_DYNAMIC_KEYS, "" + _dynamicKeys);
if (_context.getBooleanPropertyDefaultTrue(TransportManager.PROP_ENABLE_UPNP) !=

9
router/java/src/net/i2p/router/Router.java
View File

@@ -114,7 +114,13 @@ public class Router implements RouterClock.ClockShiftListener {
public final static String PROP_HIDDEN = "router.hiddenMode";
/** this does not put an 'H' in your routerInfo **/
public final static String PROP_HIDDEN_HIDDEN = "router.isHidden";
/** New router keys at every restart. Disabled. */
public final static String PROP_DYNAMIC_KEYS = "router.dynamicKeys";
/**
* New router keys once only.
* @since 0.9.34
*/
public final static String PROP_REBUILD_KEYS = "router.rebuildKeys";
/** deprecated, use gracefulShutdownInProgress() */
private final static String PROP_SHUTDOWN_IN_PROGRESS = "__shutdownInProgress";
public static final String PROP_IB_RANDOM_KEY = TunnelPoolSettings.PREFIX_INBOUND_EXPLORATORY + TunnelPoolSettings.PROP_RANDOM_KEY;
@@ -627,6 +633,8 @@ public class Router implements RouterClock.ClockShiftListener {
// if ("true".equalsIgnoreCase(_context.getProperty(Router.PROP_HIDDEN, "false")))
// killKeys();
//}
if (_context.getBooleanProperty(PROP_REBUILD_KEYS))
killKeys();
_context.messageValidator().startup();
_context.tunnelDispatcher().startup();
@@ -1159,6 +1167,7 @@ public class Router implements RouterClock.ClockShiftListener {
removeConfigSetting(UDPTransport.PROP_EXTERNAL_PORT);
removeConfigSetting(PROP_IB_RANDOM_KEY);
removeConfigSetting(PROP_OB_RANDOM_KEY);
removeConfigSetting(PROP_REBUILD_KEYS);
saveConfig();
}
}