* I2PTunnel:

- Make IRC Proxy non-shared, delayed-start, close-on-idle
        for new users, for the anonymity benefits (see "Shared Clients,
        Correlation and Collusion" http://zzz.i2p/topics/217 )
      - Remove "experimental" flag on new client options
    * configclients.jsp: Add full path to config file
    * Add some path help in some config files
This commit is contained in:
zzz
2009-08-13 22:14:07 +00:00
parent 5decf3cd7a
commit ab08ac70aa
6 changed files with 42 additions and 16 deletions

View File

@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import net.i2p.I2PAppContext;
import net.i2p.data.DataHelper;
import net.i2p.router.RouterContext;
@ -39,12 +40,17 @@ public class ClientAppConfig {
disabled = dis;
}
private static Properties getClientAppProps(RouterContext ctx) {
Properties rv = new Properties();
public static File configFile(I2PAppContext ctx) {
String clientConfigFile = ctx.getProperty(PROP_CLIENT_CONFIG_FILENAME, DEFAULT_CLIENT_CONFIG_FILENAME);
File cfgFile = new File(clientConfigFile);
if (!cfgFile.isAbsolute())
cfgFile = new File(ctx.getConfigDir(), clientConfigFile);
return cfgFile;
}
private static Properties getClientAppProps(RouterContext ctx) {
Properties rv = new Properties();
File cfgFile = configFile(ctx);
// fall back to use router.config's clientApp.* lines
if (!cfgFile.exists()) {
@ -94,10 +100,7 @@ public class ClientAppConfig {
}
public static void writeClientAppConfig(RouterContext ctx, List apps) {
String clientConfigFile = ctx.getProperty(PROP_CLIENT_CONFIG_FILENAME, DEFAULT_CLIENT_CONFIG_FILENAME);
File cfgFile = new File(clientConfigFile);
if (!cfgFile.isAbsolute())
cfgFile = new File(ctx.getConfigDir(), clientConfigFile);
File cfgFile = configFile(ctx);
FileOutputStream fos = null;
try {
fos = new FileOutputStream(cfgFile);