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

merge of '5985a037ecd49475ed49c120a5ab9d898f058fe6'

Browse Source 
and 'adba1e5ca6162b93d450aee8fd7e723bac51abf0'
This commit is contained in:
zzz
2011-07-18 14:07:56 +00:00
parent dbaa659912 a8378d0411
commit 127aebeadc
8 changed files with 92 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ package net.i2p.i2ptunnel.web;
*
*/
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -30,6 +31,7 @@ import net.i2p.i2ptunnel.I2PTunnelHTTPClientBase;
import net.i2p.i2ptunnel.TunnelController;
import net.i2p.i2ptunnel.TunnelControllerGroup;
import net.i2p.util.ConcurrentHashSet;
import net.i2p.util.FileUtil;
import net.i2p.util.Log;
/**
@@ -40,9 +42,9 @@ import net.i2p.util.Log;
* Usage by classes outside of i2ptunnel.war is deprecated.
*/
public class IndexBean {
protected I2PAppContext _context;
protected Log _log;
protected TunnelControllerGroup _group;
protected final I2PAppContext _context;
protected final Log _log;
protected final TunnelControllerGroup _group;
private String _action;
private int _tunnel;
//private long _prevNonce;
@@ -74,8 +76,8 @@ public class IndexBean {
private boolean _sharedClient;
private boolean _privKeyGenerate;
private boolean _removeConfirmed;
private Set<String> _booleanOptions;
private Map<String, String> _otherOptions;
private final Set<String> _booleanOptions;
private final Map<String, String> _otherOptions;
private int _hashCashValue;
private int _certType;
private String _certSigner;
@@ -198,17 +200,17 @@ public class IndexBean {
}
private String stopAll() {
if (_group == null) return "";
List msgs = _group.stopAllControllers();
List<String> msgs = _group.stopAllControllers();
return getMessages(msgs);
}
private String startAll() {
if (_group == null) return "";
List msgs = _group.startAllControllers();
List<String> msgs = _group.startAllControllers();
return getMessages(msgs);
}
private String restartAll() {
if (_group == null) return "";
List msgs = _group.restartAllControllers();
List<String> msgs = _group.restartAllControllers();
return getMessages(msgs);
}
private String reloadConfig() {
@@ -316,6 +318,10 @@ public class IndexBean {
return rv;
}
/**
* Stop the tunnel, delete from config,
* rename the private key file if in the default directory
*/
private String deleteTunnel() {
if (!_removeConfirmed)
return "Please confirm removal";
@@ -324,8 +330,38 @@ public class IndexBean {
if (cur == null)
return "Invalid tunnel number";
List msgs = _group.removeController(cur);
List<String> msgs = _group.removeController(cur);
msgs.addAll(doSave());
// Rename private key file if it was a default name in
// the default directory, so it doesn't get reused when a new
// tunnel is created.
// Use configured file name if available, not the one from the form.
String pk = cur.getPrivKeyFile();
if (pk == null)
pk = _privKeyFile;
if (pk != null && pk.startsWith("i2ptunnel") && pk.endsWith("-privKeys.dat")) {
File pkf = new File(_context.getConfigDir(), pk);
if (pkf.exists()) {
String name = cur.getName();
if (name == null) {
name = cur.getDescription();
if (name == null) {
name = cur.getType();
if (name == null)
name = Long.toString(_context.clock().now());
}
}
name = "i2ptunnel-deleted-" + name.replace(' ', '_') + "-privkeys.dat";
File to = new File(_context.getConfigDir(), name);
if (to.exists())
to = new File(_context.getConfigDir(), name + '-' + _context.clock().now());
boolean success = FileUtil.rename(pkf, to);
if (success)
msgs.add("Private key file " + pkf.getAbsolutePath() +
" renamed to " + to.getAbsolutePath());
}
}
return getMessages(msgs);
}

2
apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java
View File

@@ -359,7 +359,7 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
long now = _context.clock().now();
if (_tempFile.exists()) {
boolean copied = FileUtil.copy(_tempFile.getAbsolutePath(), _newsFile.getAbsolutePath(), true);
boolean copied = FileUtil.copy(_tempFile, _newsFile, true, false);
if (copied) {
_lastUpdated = now;
_tempFile.delete();

6
apps/routerconsole/java/src/net/i2p/router/web/UnsignedUpdateHandler.java
View File

@@ -93,8 +93,8 @@ public class UnsignedUpdateHandler extends UpdateHandler {
_log.log(Log.CRIT, "Corrupt zip file from " + url);
return;
}
String to = (new File(_context.getRouterDir(), Router.UPDATE_FILE)).getAbsolutePath();
boolean copied = FileUtil.copy(_updateFile, to, true);
File to = new File(_context.getRouterDir(), Router.UPDATE_FILE);
boolean copied = FileUtil.copy(updFile, to, true, false);
if (copied) {
updFile.delete();
String policy = _context.getProperty(ConfigUpdateHandler.PROP_UPDATE_POLICY);
@@ -124,7 +124,7 @@ public class UnsignedUpdateHandler extends UpdateHandler {
}
} else {
_log.log(Log.CRIT, "Failed copy to " + to);
updateStatus("<b>" + _("Failed copy to {0}", to) + "</b>");
updateStatus("<b>" + _("Failed copy to {0}", to.getAbsolutePath()) + "</b>");
}
}
}

2
core/java/src/freenet/support/CPUInformation/CPUID.java
View File

@@ -402,7 +402,7 @@ public class CPUID {
}
// copy to install dir, ignore failure
File newFile = new File(I2PAppContext.getGlobalContext().getBaseDir(), filename);
FileUtil.copy(outFile.getAbsolutePath(), newFile.getAbsolutePath(), false, true);
FileUtil.copy(outFile, newFile, false, true);
return true;
}

22
core/java/src/net/i2p/client/naming/SingleFileNamingService.java
View File

@@ -193,7 +193,7 @@ public class SingleFileNamingService extends NamingService {
out.write(d.toBase64());
out.newLine();
out.close();
boolean success = rename(tmp, _file);
boolean success = FileUtil.rename(tmp, _file);
if (success) {
for (NamingServiceListener nsl : _listeners) {
nsl.entryChanged(this, hostname, d, options);
@@ -284,7 +284,7 @@ public class SingleFileNamingService extends NamingService {
tmp.delete();
return false;
}
success = rename(tmp, _file);
success = FileUtil.rename(tmp, _file);
if (success) {
for (NamingServiceListener nsl : _listeners) {
nsl.entryRemoved(this, hostname);
@@ -442,24 +442,6 @@ public class SingleFileNamingService extends NamingService {
}
}
private static boolean rename(File from, File to) {
boolean success = false;
boolean isWindows = System.getProperty("os.name").startsWith("Win");
// overwrite fails on windows
if (!isWindows)
success = from.renameTo(to);
if (!success) {
to.delete();
success = from.renameTo(to);
if (!success) {
// hard way
success = FileUtil.copy(from.getAbsolutePath(), to.getAbsolutePath(), true, true);
from.delete();
}
}
return success;
}
private void getReadLock() {
_fileLock.readLock().lock();
}

37
core/java/src/net/i2p/util/FileUtil.java
View File

@@ -400,7 +400,15 @@ public class FileUtil {
public static boolean copy(String source, String dest, boolean overwriteExisting, boolean quiet) {
File src = new File(source);
File dst = new File(dest);
return copy(src, dst, overwriteExisting, quiet);
}
/**
* @param quiet don't log fails to wrapper log if true
* @return true if it was copied successfully
* @since 0.8.8
*/
public static boolean copy(File src, File dst, boolean overwriteExisting, boolean quiet) {
if (dst.exists() && dst.isDirectory())
dst = new File(dst, src.getName());
@@ -429,6 +437,35 @@ public class FileUtil {
}
}
/**
* Try to rename, if it doesn't work then copy and delete the old.
* Always overwrites any existing "to" file.
* Method moved from SingleFileNamingService.
*
* @return true if it was renamed / copied successfully
* @since 0.8.8
*/
public static boolean rename(File from, File to) {
if (!from.exists())
return false;
boolean success = false;
boolean isWindows = System.getProperty("os.name").startsWith("Win");
// overwrite fails on windows
if (!isWindows)
success = from.renameTo(to);
if (!success) {
to.delete();
success = from.renameTo(to);
if (!success) {
// hard way
success = copy(from, to, true, true);
if (success)
from.delete();
}
}
return success;
}
/**
* Usage: FileUtil (delete path | copy source dest | unzip path.zip)
*

2
core/java/src/net/i2p/util/NativeBigInteger.java
View File

@@ -606,7 +606,7 @@ public class NativeBigInteger extends BigInteger {
}
// copy to install dir, ignore failure
File newFile = new File(I2PAppContext.getGlobalContext().getBaseDir(), filename);
FileUtil.copy(outFile.getAbsolutePath(), newFile.getAbsolutePath(), false, true);
FileUtil.copy(outFile, newFile, false, true);
return true;
}

4
router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java
View File

@@ -80,11 +80,11 @@ class UDPEndpoint {
}
********/
/** 8998 is monotone, and 32000 is the wrapper, so let's stay between those */
/** 8998 is monotone, and 31000 is the wrapper outbound, so let's stay between those */
public static final String PROP_MIN_PORT = "i2np.udp.minPort";
public static final String PROP_MAX_PORT = "i2np.udp.maxPort";
private static final int MIN_RANDOM_PORT = 9111;
private static final int MAX_RANDOM_PORT = 31777;
private static final int MAX_RANDOM_PORT = 30777;
private static final int MAX_PORT_RETRIES = 20;
/**