diff --git a/apps/addressbook/build.xml b/apps/addressbook/build.xml index 2fe77475cb..ad27a00905 100644 --- a/apps/addressbook/build.xml +++ b/apps/addressbook/build.xml @@ -55,6 +55,7 @@ + @@ -73,6 +74,7 @@ + diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml index edc92ed5b1..c5a3b106fd 100644 --- a/apps/i2psnark/java/build.xml +++ b/apps/i2psnark/java/build.xml @@ -60,6 +60,7 @@ + @@ -98,6 +99,7 @@ + diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml index 1778ffb872..1b62279145 100644 --- a/apps/i2ptunnel/java/build.xml +++ b/apps/i2ptunnel/java/build.xml @@ -62,6 +62,7 @@ + @@ -134,6 +135,7 @@ + diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml index 8904bafb3b..235088fc31 100644 --- a/apps/ministreaming/java/build.xml +++ b/apps/ministreaming/java/build.xml @@ -50,6 +50,7 @@ + diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml index f49153486c..3dba335781 100644 --- a/apps/routerconsole/java/build.xml +++ b/apps/routerconsole/java/build.xml @@ -35,6 +35,7 @@ + @@ -90,6 +91,7 @@ + @@ -169,6 +171,7 @@ + @@ -292,6 +295,8 @@ + + diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java index b65d58fb6b..7c911156fa 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java @@ -54,6 +54,10 @@ public class ConfigClientsHandler extends FormHandler { installPlugin(); return; } + if (_action.equals(_("Update All Installed Plugins"))) { + updateAllPlugins(); + return; + } // value if (_action.startsWith("Start ")) { String app = _action.substring(6); @@ -322,6 +326,16 @@ public class ConfigClientsHandler extends FormHandler { installPlugin(url); } + /** @since 0.8.13 */ + private void updateAllPlugins() { + addFormNotice(_("Updating all plugins")); + PluginStarter.updateAll(_context); + // So that update() will post a status to the summary bar before we reload + try { + Thread.sleep(1000); + } catch (InterruptedException ie) {} + } + private void installPlugin(String url) { if ("true".equals(System.getProperty(UpdateHandler.PROP_UPDATE_IN_PROGRESS))) { addFormError(_("Plugin or update download already in progress.")); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java index 6c95734f7b..eea306aa20 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/FileDumpHelper.java @@ -113,17 +113,18 @@ public class FileDumpHelper extends HelperBase { if (att == null) att = new Attributes(); buf.append(""); + String iv = getAtt(att, "Implementation-Version"); + if (iv != null) + buf.append("").append(iv).append(""); String s = getAtt(att, "Base-Revision"); if (s != null && s.length() > 20) { + if (iv != null) + buf.append("
"); buf.append("" + "").append(s.substring(0, 20)).append("" + "
" + "").append(s.substring(20)).append(""); - } else { - s = getAtt(att, "Implementation-Version"); - if (s != null) - buf.append("").append(s).append(""); } buf.append(""); s = getAtt(att, "Created-By"); 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 6be4b1cd7e..c4c567b3f9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java @@ -22,10 +22,12 @@ import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; import net.i2p.router.Job; import net.i2p.router.RouterContext; +import net.i2p.router.RouterVersion; import net.i2p.router.startup.ClientAppConfig; import net.i2p.router.startup.LoadClientAppsJob; import net.i2p.util.ConcurrentHashSet; import net.i2p.util.FileUtil; +import net.i2p.util.I2PAppThread; import net.i2p.util.Log; import net.i2p.util.Translate; import net.i2p.util.VersionComparator; @@ -63,9 +65,96 @@ public class PluginStarter implements Runnable { } public void run() { + if (_context.getBooleanPropertyDefaultTrue("plugins.autoUpdate") && + (!Boolean.valueOf(System.getProperty(UpdateHandler.PROP_UPDATE_IN_PROGRESS)).booleanValue()) && + (!RouterVersion.VERSION.equals(_context.getProperty("router.previousVersion")))) + updateAll(_context, true); startPlugins(_context); } + /** + * threaded + * @since 0.8.13 + */ + static void updateAll(RouterContext ctx) { + Thread t = new I2PAppThread(new PluginUpdater(ctx), "PluginUpdater", true); + t.start(); + } + + /** + * thread + * @since 0.8.13 + */ + private static class PluginUpdater implements Runnable { + private final RouterContext _ctx; + + public PluginUpdater(RouterContext ctx) { + _ctx = ctx; + } + + public void run() { + updateAll(_ctx, false); + } + } + + /** + * inline + * @since 0.8.13 + */ + private static void updateAll(RouterContext ctx, boolean delay) { + List plugins = getPlugins(); + Map toUpdate = new HashMap(); + for (String appName : plugins) { + Properties props = pluginProperties(ctx, appName); + String url = props.getProperty("updateURL"); + if (url != null) + toUpdate.put(appName, url); + } + if (toUpdate.isEmpty()) + return; + PluginUpdateChecker puc = PluginUpdateChecker.getInstance(ctx); + if (puc.isRunning()) + return; + + if (delay) { + // wait for proxy + System.setProperty(UpdateHandler.PROP_UPDATE_IN_PROGRESS, "true"); + puc.setAppStatus(Messages.getString("Checking for plugin updates", ctx)); + try { + Thread.sleep(3*60*1000); + } catch (InterruptedException ie) {} + System.setProperty(UpdateHandler.PROP_UPDATE_IN_PROGRESS, "false"); + } + + Log log = ctx.logManager().getLog(PluginStarter.class); + for (Map.Entry entry : toUpdate.entrySet()) { + String appName = entry.getKey(); + if (log.shouldLog(Log.WARN)) + log.warn("Checking for update plugin: " + appName); + puc.update(appName); + do { + try { + Thread.sleep(5*1000); + } catch (InterruptedException ie) {} + } while (puc.isRunning()); + if (!puc.isNewerAvailable()) { + if (log.shouldLog(Log.WARN)) + log.warn("No update available for plugin: " + appName); + continue; + } + PluginUpdateHandler puh = PluginUpdateHandler.getInstance(ctx); + String url = entry.getValue(); + if (log.shouldLog(Log.WARN)) + log.warn("Updating plugin: " + appName); + puh.update(url); + do { + try { + Thread.sleep(5*1000); + } catch (InterruptedException ie) {} + } while (puh.isRunning()); + } + } + /** this shouldn't throw anything */ static void startPlugins(RouterContext ctx) { Log log = ctx.logManager().getLog(PluginStarter.class); @@ -75,6 +164,9 @@ public class PluginStarter implements Runnable { if (name.startsWith(PREFIX) && name.endsWith(ENABLED)) { if (Boolean.valueOf(props.getProperty(name)).booleanValue()) { String app = name.substring(PREFIX.length(), name.lastIndexOf(ENABLED)); + // plugins could have been started after update + if (isPluginRunning(app, ctx)) + continue; try { if (!startPlugin(ctx, app)) log.error("Failed to start plugin: " + app); @@ -95,6 +187,7 @@ public class PluginStarter implements Runnable { File pluginDir = new File(ctx.getConfigDir(), PluginUpdateHandler.PLUGIN_DIR + '/' + appName); if ((!pluginDir.exists()) || (!pluginDir.isDirectory())) { log.error("Cannot start nonexistent plugin: " + appName); + disablePlugin(appName); return false; } @@ -104,6 +197,7 @@ public class PluginStarter implements Runnable { (new VersionComparator()).compare(CoreVersion.VERSION, minVersion) < 0) { String foo = "Plugin " + appName + " requires I2P version " + minVersion + " or higher"; log.error(foo); + disablePlugin(appName); throw new Exception(foo); } @@ -112,6 +206,7 @@ public class PluginStarter implements Runnable { (new VersionComparator()).compare(System.getProperty("java.version"), minVersion) < 0) { String foo = "Plugin " + appName + " requires Java version " + minVersion + " or higher"; log.error(foo); + disablePlugin(appName); throw new Exception(foo); } @@ -121,6 +216,7 @@ public class PluginStarter implements Runnable { (new VersionComparator()).compare(minVersion, jVersion) > 0) { String foo = "Plugin " + appName + " requires Jetty version " + minVersion + " or higher"; log.error(foo); + disablePlugin(appName); throw new Exception(foo); } @@ -129,6 +225,7 @@ public class PluginStarter implements Runnable { (new VersionComparator()).compare(maxVersion, jVersion) < 0) { String foo = "Plugin " + appName + " requires Jetty version " + maxVersion + " or lower"; log.error(foo); + disablePlugin(appName); throw new Exception(foo); } @@ -334,7 +431,7 @@ public class PluginStarter implements Runnable { Properties props = pluginProperties(); for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) { String name = (String)iter.next(); - if (name.startsWith(PREFIX + appName)) + if (name.startsWith(PREFIX + appName + '.')) iter.remove(); } storePluginProperties(props); @@ -373,6 +470,32 @@ public class PluginStarter implements Runnable { return rv; } + /** + * Is the plugin enabled in plugins.config? + * Default true + * + * @since 0.8.13 + */ + public static boolean isPluginEnabled(String appName) { + Properties props = pluginProperties(); + String prop = PREFIX + appName + ENABLED; + return Boolean.valueOf(props.getProperty(prop, "true")).booleanValue(); + } + + /** + * Disable in plugins.config + * + * @since 0.8.13 + */ + public static void disablePlugin(String appName) { + Properties props = pluginProperties(); + String prop = PREFIX + appName + ENABLED; + if (Boolean.valueOf(props.getProperty(prop, "true")).booleanValue()) { + props.setProperty(prop, "false"); + storePluginProperties(props); + } + } + /** * all installed plugins whether enabled or not */ diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginStopper.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginStopper.java index 2f29eddf27..ca81463d04 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStopper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStopper.java @@ -4,7 +4,7 @@ import net.i2p.router.RouterContext; import net.i2p.util.Log; /** - * Stop all plugins that are installed + * Stop all plugins that are installed and running * * @since 0.7.13 * @author zzz @@ -21,19 +21,20 @@ public class PluginStopper extends PluginStarter { } /** - * Stop all plugins - * (whether or not they were ever started) + * Stop all running plugins * * this shouldn't throw anything */ - static void stopPlugins(RouterContext ctx) { + private static void stopPlugins(RouterContext ctx) { Log log = ctx.logManager().getLog(PluginStopper.class); for (String app : getPlugins()) { - try { - stopPlugin(ctx, app); - } catch (Throwable e) { - if (log.shouldLog(Log.WARN)) - log.warn("Failed to stop plugin: " + app, e); + if (isPluginRunning(app, ctx)) { + try { + stopPlugin(ctx, app); + } catch (Throwable e) { + if (log.shouldLog(Log.WARN)) + log.warn("Failed to stop plugin: " + app, e); + } } } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateChecker.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateChecker.java index cf3f75f3eb..73b6850a04 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateChecker.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateChecker.java @@ -36,6 +36,7 @@ public class PluginUpdateChecker extends UpdateHandler { private String _appName; private String _oldVersion; private String _xpi2pURL; + private volatile boolean _isNewerAvailable; private static PluginUpdateChecker _instance; public static final synchronized PluginUpdateChecker getInstance(RouterContext ctx) { @@ -49,12 +50,19 @@ public class PluginUpdateChecker extends UpdateHandler { super(ctx); } - /** check all plugins */ + /** + * check all plugins + * @deprecated not finished + */ public void update() { Thread t = new I2PAppThread(new AllCheckerRunner(), "AllAppChecker", true); t.start(); } + /** + * check all plugins + * @deprecated not finished + */ public class AllCheckerRunner implements Runnable { public void run() { List plugins = PluginStarter.getPlugins(); @@ -85,12 +93,18 @@ public class PluginUpdateChecker extends UpdateHandler { _xpi2pURL = xpi2pURL; _appName = appName; _oldVersion = oldVersion; + _isNewerAvailable = false; System.setProperty(PROP_UPDATE_IN_PROGRESS, "true"); I2PAppThread update = new I2PAppThread(_pluginUpdateCheckerRunner, "AppChecker", true); update.start(); } } + /** @since 0.8.13 */ + public void setAppStatus(String status) { + updateStatus(status); + } + public boolean isRunning() { return _pluginUpdateCheckerRunner != null && _pluginUpdateCheckerRunner.isRunning(); } @@ -101,12 +115,17 @@ public class PluginUpdateChecker extends UpdateHandler { return false; } + /** @since 0.8.13 */ + public boolean isNewerAvailable() { + return _isNewerAvailable; + } + private void scheduleStatusClean(String msg) { - SimpleScheduler.getInstance().addEvent(new Cleaner(msg), 60*60*1000); + SimpleScheduler.getInstance().addEvent(new Cleaner(msg), 20*60*1000); } private class Cleaner implements SimpleTimer.TimedEvent { - private String _msg; + private final String _msg; public Cleaner(String msg) { _msg = msg; } @@ -126,6 +145,7 @@ public class PluginUpdateChecker extends UpdateHandler { @Override protected void update() { + _isNewerAvailable = false; updateStatus("" + _("Checking for update of plugin {0}", _appName) + ""); // use the same settings as for updater // always proxy, or else FIXME @@ -142,6 +162,10 @@ public class PluginUpdateChecker extends UpdateHandler { } } + public boolean isNewerAvailable() { + return _isNewerAvailable; + } + @Override public void bytesTransferred(long alreadyTransferred, int currentWrite, long bytesTransferred, long bytesRemaining, String url) { } @@ -151,10 +175,12 @@ public class PluginUpdateChecker extends UpdateHandler { String newVersion = TrustedUpdate.getVersionString(new ByteArrayInputStream(_baos.toByteArray())); boolean newer = (new VersionComparator()).compare(newVersion, _oldVersion) > 0; String msg; - if (newer) + if (newer) { msg = "" + _("New plugin version {0} is available", newVersion) + ""; - else + _isNewerAvailable = true; + } else { msg = "" + _("No new version is available for plugin {0}", _appName) + ""; + } updateStatus(msg); scheduleStatusClean(msg); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java index 511bfb0cd0..ecef4bb19e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateHandler.java @@ -93,11 +93,11 @@ public class PluginUpdateHandler extends UpdateHandler { } private void scheduleStatusClean(String msg) { - SimpleScheduler.getInstance().addEvent(new Cleaner(msg), 60*60*1000); + SimpleScheduler.getInstance().addEvent(new Cleaner(msg), 20*60*1000); } private class Cleaner implements SimpleTimer.TimedEvent { - private String _msg; + private final String _msg; public Cleaner(String msg) { _msg = msg; } @@ -286,6 +286,7 @@ public class PluginUpdateHandler extends UpdateHandler { return; } + boolean wasRunning = false; File destDir = new SecureDirectory(appDir, appName); if (destDir.exists()) { if (Boolean.valueOf(props.getProperty("install-only")).booleanValue()) { @@ -350,14 +351,16 @@ public class PluginUpdateHandler extends UpdateHandler { return; } - // check if it is running first? - try { - if (!PluginStarter.stopPlugin(_context, appName)) { - // failed, ignore + if (PluginStarter.isPluginRunning(appName, _context)) { + wasRunning = true; + try { + if (!PluginStarter.stopPlugin(_context, appName)) { + // failed, ignore + } + } catch (Throwable e) { + // no updateStatus() for this one + _log.error("Error stopping plugin " + appName, e); } - } catch (Throwable e) { - // no updateStatus() for this one - _log.error("Error stopping plugin " + appName, e); } } else { @@ -390,8 +393,8 @@ public class PluginUpdateHandler extends UpdateHandler { pluginProps.setProperty(PluginStarter.PREFIX + appName + PluginStarter.ENABLED, "false"); PluginStarter.storePluginProperties(pluginProps); } - } else { - // start everything + } else if (wasRunning || PluginStarter.isPluginEnabled(appName)) { + // start everything unless it was disabled and not running before try { if (PluginStarter.startPlugin(_context, appName)) { String linkName = ConfigClientsHelper.stripHTML(props, "consoleLinkName_" + Messages.getLanguage(_context)); @@ -411,6 +414,8 @@ public class PluginUpdateHandler extends UpdateHandler { statusDone("" + _("Plugin {0} installed but failed to start", appName) + ": " + e + ""); _log.error("Error starting plugin " + appName, e); } + } else { + statusDone("" + _("Plugin {0} installed", appName) + ""); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java index 2f2d3db74f..5b7eaec03c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java @@ -127,7 +127,7 @@ public class UpdateHandler { } public class UpdateRunner implements Runnable, EepGet.StatusListener { - protected boolean _isRunning; + protected volatile boolean _isRunning; protected boolean done; protected EepGet _get; protected final DecimalFormat _pct = new DecimalFormat("0.0%"); diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp index 4c70beafed..25df053f46 100644 --- a/apps/routerconsole/jsp/configclients.jsp +++ b/apps/routerconsole/jsp/configclients.jsp @@ -103,6 +103,7 @@ button span.hide{

<%=intl._("All changes require restart to take effect.")%>

+ " /> " />
@@ -114,6 +115,7 @@ button span.hide{
+ " /> " />
@@ -125,7 +127,9 @@ button span.hide{

+ " /> " /> + " />
<% } %> diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml index d55ed0d61c..4433c05754 100644 --- a/apps/sam/java/build.xml +++ b/apps/sam/java/build.xml @@ -66,6 +66,7 @@ + diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml index b5c842f5b9..5f278f307c 100644 --- a/apps/streaming/java/build.xml +++ b/apps/streaming/java/build.xml @@ -63,6 +63,7 @@ + diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml index d287e5a4d0..3fff55a34c 100644 --- a/apps/susidns/src/build.xml +++ b/apps/susidns/src/build.xml @@ -97,6 +97,7 @@ + diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml index 8a8d33c4ad..3368283d11 100644 --- a/apps/susimail/build.xml +++ b/apps/susimail/build.xml @@ -45,6 +45,7 @@ + diff --git a/apps/systray/java/build.xml b/apps/systray/java/build.xml index 4dd50f0c98..5baf4ab622 100644 --- a/apps/systray/java/build.xml +++ b/apps/systray/java/build.xml @@ -44,6 +44,7 @@ + diff --git a/build.xml b/build.xml index dd49fd8cb5..6365da50b0 100644 --- a/build.xml +++ b/build.xml @@ -182,12 +182,14 @@ - + + + diff --git a/core/java/build.xml b/core/java/build.xml index d627508594..c3eaf5c078 100644 --- a/core/java/build.xml +++ b/core/java/build.xml @@ -58,6 +58,7 @@ + diff --git a/history.txt b/history.txt index 0ca887885c..da999adc4b 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,19 @@ +2012-01-16 zzz + * Build: Put Implementation-Version in manifests + * NetDB: Hopefully fix rare NPE (ticket #589) + * Plugins: + - Only stop a plugin before update if it was running + - Only stop a plugin at shutdown if it was running + - Don't start a plugin after update if it was disabled + - Disable plugin if it fails version checks at startup + - Auto-update plugins after a router update + - Add update-all button and more cancel buttons + * Router: + - Add synchronized change-and-save-config methods to avoid races + - Save previous version in config so we know when we updated + * Transport: Revert change from -2, put addresses back in RouterInfo + when hidden, broke inbound tunnel building + 2012-01-14 zzz * i2ptunnel: Partial fix for dest formatting (ticket #581) * jars.jsp: New debug page diff --git a/router/java/build.xml b/router/java/build.xml index ea9f7b6135..e933086cf8 100644 --- a/router/java/build.xml +++ b/router/java/build.xml @@ -72,6 +72,7 @@ + diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 084731b7bb..f97422d02e 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -15,6 +15,7 @@ import java.io.FileOutputStream; import java.io.InputStreamReader; import java.io.IOException; import java.io.Writer; +import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashSet; @@ -241,6 +242,8 @@ public class Router implements RouterClock.ClockShiftListener { String now = Long.toString(System.currentTimeMillis()); _config.put("router.firstInstalled", now); _config.put("router.updateLastInstalled", now); + // First added in 0.8.13 + _config.put("router.previousVersion", RouterVersion.VERSION); saveConfig(); } // ********* Start no threads before here ********* // @@ -324,9 +327,23 @@ public class Router implements RouterClock.ClockShiftListener { public String getConfigSetting(String name) { return _config.get(name); } + + /** + * Warning, race between here and saveConfig(), + * saveConfig(String name, String value) or saveConfig(Map toAdd, Set toRemove) is recommended. + * + * @since 0.8.13 + */ public void setConfigSetting(String name, String value) { _config.put(name, value); } + + /** + * Warning, race between here and saveConfig(), + * saveConfig(String name, String value) or saveConfig(Map toAdd, Set toRemove) is recommended. + * + * @since 0.8.13 + */ public void removeConfigSetting(String name) { _config.remove(name); } @@ -1041,6 +1058,13 @@ public class Router implements RouterClock.ClockShiftListener { _log.log(Log.CRIT, "Error running shutdown task", t); } } + + // Set the last version to the current version, since 0.8.13 + if (!RouterVersion.VERSION.equals(_config.get("router.previousVersion"))) { + _config.put("router.previousVersion", RouterVersion.VERSION); + saveConfig(); + } + _context.removeShutdownTasks(); try { _context.clientManager().shutdown(); } catch (Throwable t) { _log.error("Error shutting down the client manager", t); } try { _context.namingService().shutdown(); } catch (Throwable t) { _log.error("Error shutting down the naming service", t); } @@ -1244,6 +1268,45 @@ public class Router implements RouterClock.ClockShiftListener { return true; } + /** + * Updates the current config and then saves it. + * Prevents a race in the interval between setConfigSetting() / removeConfigSetting() and saveConfig(), + * Synchronized with getConfig() / saveConfig() + * + * @param name setting to add/change/remove before saving + * @param value if non-null, updated value; if null, setting will be removed + * @return success + * @since 0.8.13 + */ + public synchronized boolean saveConfig(String name, String value) { + if (value != null) + _config.put(name, value); + else + _config.remove(name); + return saveConfig(); + } + + /** + * Updates the current config and then saves it. + * Prevents a race in the interval between setConfigSetting() / removeConfigSetting() and saveConfig(), + * Synchronized with getConfig() / saveConfig() + * + * @param toAdd settings to add/change before saving, may be null or empty + * @param toRemove settings to remove before saving, may be null or empty + * @return success + * @since 0.8.13 + */ + public synchronized boolean saveConfig(Map toAdd, Collection toRemove) { + if (toAdd != null) + _config.putAll(toAdd); + if (toRemove != null) { + for (String s : toRemove) { + _config.remove(toRemove); + } + } + return saveConfig(); + } + /** * The clock shift listener. * Restart the router if we should. @@ -1345,6 +1408,8 @@ public class Router implements RouterClock.ClockShiftListener { // This may be useful someday. First added in 0.8.2 // Moved above the extract so we don't NCDFE _config.put("router.updateLastInstalled", "" + System.currentTimeMillis()); + // Set the last version to the current version, since 0.8.13 + _config.put("router.previousVersion", RouterVersion.VERSION); saveConfig(); ok = FileUtil.extractZip(updateFile, _context.getBaseDir()); } diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 0725033fa6..f6e6df3a5c 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 = 3; + public final static long BUILD = 4; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java index f27be069a4..0956045805 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java @@ -25,10 +25,10 @@ import net.i2p.util.Log; * */ class KBucketSet { - private Log _log; - private I2PAppContext _context; - private LocalHash _us; - private KBucket _buckets[]; + private final Log _log; + private final I2PAppContext _context; + private final LocalHash _us; + private final KBucket _buckets[]; private volatile int _size; public final static int BASE = 8; // must go into KEYSIZE_BITS evenly @@ -41,7 +41,7 @@ class KBucketSet { _us = new LocalHash(us); _context = context; _log = context.logManager().getLog(KBucketSet.class); - createBuckets(); + _buckets = createBuckets(); context.statManager().createRateStat("netDb.KBSGetAllTime", "Time to add all Hashes to the Collector", "NetworkDatabase", new long[] { 60*60*1000 }); } @@ -132,12 +132,13 @@ class KBucketSet { public KBucket getBucket(int bucket) { return _buckets[bucket]; } - protected void createBuckets() { - _buckets = new KBucket[NUM_BUCKETS]; + protected KBucket[] createBuckets() { + KBucket[] buckets = new KBucket[NUM_BUCKETS]; for (int i = 0; i < NUM_BUCKETS-1; i++) { - _buckets[i] = createBucket(i*BASE, (i+1)*BASE); + buckets[i] = createBucket(i*BASE, (i+1)*BASE); } - _buckets[NUM_BUCKETS-1] = createBucket(BASE*(NUM_BUCKETS-1), BASE*(NUM_BUCKETS) + 1); + buckets[NUM_BUCKETS-1] = createBucket(BASE*(NUM_BUCKETS-1), BASE*(NUM_BUCKETS) + 1); + return buckets; } protected KBucket createBucket(int start, int end) { diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index c1302b9aa5..73fb5cb930 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -179,8 +179,9 @@ public class CommSystemFacadeImpl extends CommSystemFacade { /** @return non-null, possibly empty */ @Override public Set createAddresses() { - if (_context.router().isHidden()) - return Collections.EMPTY_SET; + // No, don't do this, it makes it almost impossible to build inbound tunnels + //if (_context.router().isHidden()) + // return Collections.EMPTY_SET; Map addresses = null; boolean newCreated = false;