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

- Don't delete privkey file for a non-persistent client tunnel

Browse Source 
(ticket #599)
This commit is contained in:
zzz
2012-02-20 23:19:53 +00:00
parent 939329a96c
commit b8a1ab0138
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
View File

@@ -342,7 +342,8 @@ public class IndexBean {
String pk = cur.getPrivKeyFile(); String pk = cur.getPrivKeyFile();
if (pk == null) if (pk == null)
pk = _privKeyFile; pk = _privKeyFile;
if (pk != null && pk.startsWith("i2ptunnel") && pk.endsWith("-privKeys.dat")) { if (pk != null && pk.startsWith("i2ptunnel") && pk.endsWith("-privKeys.dat") &&
((!isClient(cur.getType())) || cur.getPersistentClientKey())) {
File pkf = new File(_context.getConfigDir(), pk); File pkf = new File(_context.getConfigDir(), pk);
if (pkf.exists()) { if (pkf.exists()) {
String name = cur.getName(); String name = cur.getName();

5
history.txt
View File

@@ -1,5 +1,8 @@
2012-02-20 zzz 2012-02-20 zzz
* i2ptunnel: Fix streamr session registration * i2ptunnel:
- Fix streamr session registration
- Don't delete privkey file for a non-persistent client tunnel
(ticket #599)
* Streaming: Fix race NPE (thx echelon) * Streaming: Fix race NPE (thx echelon)
2012-02-17 zzz 2012-02-17 zzz

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 16; public final static long BUILD = 17;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";