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

Transport: More deadlock prevention (ticket #1722)

Browse Source
This commit is contained in:
zzz
2015-12-11 15:28:39 +00:00
parent 00a5d19534
commit 7680ecbdc4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
router/java/src/net/i2p/router/Router.java
View File

@ -92,6 +92,7 @@ public class Router implements RouterClock.ClockShiftListener {
private State _state = State.UNINITIALIZED;
private FamilyKeyCrypto _familyKeyCrypto;
private boolean _familyKeyCryptoFail;
public final Object _familyKeyLock = new Object();
public final static String PROP_CONFIG_FILE = "router.configLocation";
@ -877,7 +878,7 @@ public class Router implements RouterClock.ClockShiftListener {
* @since 0.9.24
*/
public FamilyKeyCrypto getFamilyKeyCrypto() {
synchronized (_routerInfoLock) {
synchronized (_familyKeyLock) {
if (_familyKeyCrypto == null) {
if (!_familyKeyCryptoFail) {
try {
@ -918,7 +919,7 @@ public class Router implements RouterClock.ClockShiftListener {
*
* @return a capabilities string to be added to the RI
*/
String getCapabilities() {
public String getCapabilities() {
StringBuilder rv = new StringBuilder(4);
int bwLim = Math.min(_context.bandwidthLimiter().getInboundKBytesPerSecond(),
_context.bandwidthLimiter().getOutboundKBytesPerSecond());

13
router/java/src/net/i2p/router/transport/TransportImpl.java
View File

@ -141,9 +141,10 @@ public abstract class TransportImpl implements Transport {
else // shouldn't happen
maxProp = "i2np." + style.toLowerCase(Locale.US) + ".maxConnections";
int def = MAX_CONNECTION_FACTOR;
RouterInfo ri = _context.router().getRouterInfo();
if (ri != null) {
char bw = ri.getBandwidthTier().charAt(0);
// get it from here, not the RI, to avoid deadlock
String caps = _context.router().getCapabilities();
char bw = caps.charAt(0);
switch (bw) {
case Router.CAPABILITY_BW12:
case 'u': // unknown
@ -168,7 +169,7 @@ public abstract class TransportImpl implements Transport {
def *= 12;
break;
}
}
if (_context.netDb().floodfillEnabled()) {
// && !SystemVersion.isWindows()) {
def *= 17; def /= 10; // 425 for Class O ff
@ -747,13 +748,11 @@ public abstract class TransportImpl implements Transport {
* This can be called before startListening() to set an initial address,
* or after the transport is running.
*
* This implementation does nothing. Transports should override if they want notification.
*
* @param source defined in Transport.java
* @param ip typ. IPv4 or IPv6 non-local; may be null to indicate IPv4 failure or port info only
* @param port 0 for unknown or unchanged
*/
public void externalAddressReceived(AddressSource source, byte[] ip, int port) {}
public abstract void externalAddressReceived(AddressSource source, byte[] ip, int port);
/**
* Notify a transport of an external address change.