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

i2ptunnel: Don't default to a private key file that exists (ticket #1628)

Browse Source 
Fix build.xml war dependency tracking
This commit is contained in:
zzz
2016-02-27 16:17:25 +00:00
parent d28f983c46
commit 80860232d7
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/i2ptunnel/java/build.xml
View File

@@ -235,6 +235,7 @@
<target name="warUpToDate">
<uptodate property="war.uptodate" targetfile="build/i2ptunnel.war" >
<srcfiles dir= "../jsp" excludes="web.xml, web-fragment.xml, **/*.java, *.jsp" />
<srcfiles dir= "build/obj" includes="**/ui/*.class **/web/*.class" />
</uptodate>
<condition property="shouldListChanges2" >
<and>

12
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java
View File

@@ -267,13 +267,21 @@ public class GeneralHelper {
public String getPrivateKeyFile(int tunnel) {
return getPrivateKeyFile(_group, tunnel);
}
public static String getPrivateKeyFile(TunnelControllerGroup tcg, int tunnel) {
public String getPrivateKeyFile(TunnelControllerGroup tcg, int tunnel) {
TunnelController tun = getController(tcg, tunnel);
if (tun != null && tun.getPrivKeyFile() != null)
return tun.getPrivKeyFile();
if (tunnel < 0)
tunnel = tcg == null ? 999 : tcg.getControllers().size();
return "i2ptunnel" + tunnel + "-privKeys.dat";
String rv = "i2ptunnel" + tunnel + "-privKeys.dat";
// Don't default to a file that already exists,
// which could happen after other tunnels are deleted.
int i = 0;
while ((new File(_context.getConfigDir(), rv)).exists()) {
rv = "i2ptunnel" + tunnel + '.' + (++i) + "-privKeys.dat";
}
return rv;
}
public String getClientInterface(int tunnel) {