Changeset ab08ac7


Ignore:
Timestamp:
Aug 13, 2009 10:14:07 PM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
7e039d0
Parents:
5decf3cd
Message:
  • 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
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/i2psnark.config

    r5decf3cd rab08ac7  
     1#
     2# If you have a 'split' directory installation, with configuration
     3# files in ~/.i2p (Linux) or %APPDATA%\I2P (Windows), be sure to
     4# edit the file in the configuration directory, NOT the install directory.
     5#
    16i2psnark.dir=i2psnark
  • apps/i2ptunnel/jsp/editClient.jsp

    r5decf3cd rab08ac7  
    320320            <div id="optionsField" class="rowItem">
    321321                <label for="reduce" accesskey="c">
    322                     <span class="accessKey">C</span>lose tunnels when idle: <i>Experimental</i>
     322                    <span class="accessKey">C</span>lose tunnels when idle:
    323323                </label>
    324324            </div>
     
    355355            <div id="optionsField" class="rowItem">
    356356                <label for="reduce" accesskey="c">
    357                     <span class="accessKey">D</span>elay tunnel open until required: <i>Experimental</i>
     357                    <span class="accessKey">D</span>elay tunnel open until required:
    358358                </label>
    359359            </div>
  • apps/routerconsole/jsp/configclients.jsp

    r5decf3cd rab08ac7  
    3939 <jsp:getProperty name="clientshelper" property="form1" />
    4040 </p><p>
    41  <i>All changes require restart to take effect. To change other client options, edit the clients.config file.</i>
     41 <i>To change other client options, edit the file
     42<%=net.i2p.router.startup.ClientAppConfig.configFile(net.i2p.I2PAppContext.getGlobalContext())%>.
     43All changes require restart to take effect.</i>
    4244 </p> <hr /><div class="formaction">
    4345 <input type="submit" name="action" value="Save Client Configuration" />
     
    5860 </p>
    5961 <p>
    60  <i>All changes require restart to take effect. To change other webapp options, edit the webapps.config file.</i>
     62 <i>All changes require restart to take effect.</i>
    6163 </p>
    6264 <hr><div class="formaction">
  • installer/resources/clients.config

    r5decf3cd rab08ac7  
     1#
     2# If you have a 'split' directory installation, with configuration
     3# files in ~/.i2p (Linux) or %APPDATA%\I2P (Windows), be sure to
     4# edit the file in the configuration directory, NOT the install directory.
     5#
     6
    17# fire up the web console
    28clientApp.0.args=7657 ::1,127.0.0.1 ./webapps/
  • installer/resources/i2ptunnel.config

    r5decf3cd rab08ac7  
     1#
     2# If you have a 'split' directory installation, with configuration
     3# files in ~/.i2p (Linux) or %APPDATA%\I2P (Windows), be sure to
     4# edit the file in the configuration directory, NOT the install directory.
     5#
     6
    17# eepproxy
    28tunnel.0.name=eepProxy
     
    1824
    1925# irc
    20 tunnel.1.name=ircProxy
    21 tunnel.1.description=IRC proxy to access the anonymous irc net
     26tunnel.1.name=IRC Proxy
     27tunnel.1.description=IRC proxy to access the anonymous IRC network
    2228tunnel.1.type=ircclient
    23 tunnel.1.sharedClient=true
     29tunnel.1.sharedClient=false
    2430tunnel.1.interface=127.0.0.1
    2531tunnel.1.listenPort=6668
     
    2733tunnel.1.i2cpHost=127.0.0.1
    2834tunnel.1.i2cpPort=7654
    29 tunnel.1.option.inbound.nickname=shared clients
    30 tunnel.1.option.outbound.nickname=shared clients
    31 tunnel.1.option.i2cp.reduceIdleTime=900000
     35tunnel.1.option.inbound.nickname=IRC Proxy
     36tunnel.1.option.outbound.nickname=IRC Proxy
     37tunnel.1.option.i2cp.closeIdleTime=1200000
     38tunnel.1.option.i2cp.closeOnIdle=true
     39tunnel.1.option.i2cp.delayOpen=true
     40tunnel.1.option.i2cp.newDestOnResume=false
     41tunnel.1.option.i2cp.reduceIdleTime=600000
    3242tunnel.1.option.i2cp.reduceOnIdle=true
    3343tunnel.1.option.i2cp.reduceQuantity=1
  • router/java/src/net/i2p/router/startup/ClientAppConfig.java

    r5decf3cd rab08ac7  
    88import java.util.Properties;
    99
     10import net.i2p.I2PAppContext;
    1011import net.i2p.data.DataHelper;
    1112import net.i2p.router.RouterContext;
     
    4041    }
    4142
    42     private static Properties getClientAppProps(RouterContext ctx) {
    43         Properties rv = new Properties();
     43    public static File configFile(I2PAppContext ctx) {
    4444        String clientConfigFile = ctx.getProperty(PROP_CLIENT_CONFIG_FILENAME, DEFAULT_CLIENT_CONFIG_FILENAME);
    4545        File cfgFile = new File(clientConfigFile);
    4646        if (!cfgFile.isAbsolute())
    4747            cfgFile = new File(ctx.getConfigDir(), clientConfigFile);
     48        return cfgFile;
     49    }
     50
     51    private static Properties getClientAppProps(RouterContext ctx) {
     52        Properties rv = new Properties();
     53        File cfgFile = configFile(ctx);
    4854       
    4955        // fall back to use router.config's clientApp.* lines
     
    95101
    96102    public static void writeClientAppConfig(RouterContext ctx, List apps) {
    97         String clientConfigFile = ctx.getProperty(PROP_CLIENT_CONFIG_FILENAME, DEFAULT_CLIENT_CONFIG_FILENAME);
    98         File cfgFile = new File(clientConfigFile);
    99         if (!cfgFile.isAbsolute())
    100             cfgFile = new File(ctx.getConfigDir(), clientConfigFile);
     103        File cfgFile = configFile(ctx);
    101104        FileOutputStream fos = null;
    102105        try {
Note: See TracChangeset for help on using the changeset viewer.