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

* Fix UPnP address received before startListening(),

Browse Source 
broken by isAlive() check
* log tweakws
This commit is contained in:
zzz
2013-05-11 22:11:02 +00:00
parent 0be3beb30e
commit fcaebb4416
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -527,7 +527,7 @@ public abstract class TransportImpl implements Transport {
*/
protected void replaceAddress(RouterAddress address) {
if (_log.shouldLog(Log.WARN))
_log.warn("Replacing address with " + address);
_log.warn("Replacing address with " + address, new Exception());
if (address == null) {
_currentAddresses.clear();
} else {
@ -538,6 +538,8 @@ public abstract class TransportImpl implements Transport {
}
_currentAddresses.add(address);
}
if (_log.shouldLog(Log.WARN))
_log.warn(getStyle() + " now has " + _currentAddresses.size() + " addresses");
if (_listener != null)
_listener.transportAddressChanged();
}

2
router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
View File

@ -791,7 +791,7 @@ public class NTCPTransport extends TransportImpl {
return;
}
if (!isAlive()) {
if (source == SOURCE_INTERFACE) {
if (source == SOURCE_INTERFACE || source == SOURCE_UPNP) {
try {
InetAddress ia = InetAddress.getByAddress(ip);
saveLocalAddress(ia);

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

@ -635,7 +635,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
return;
}
if (!isAlive()) {
if (source == SOURCE_INTERFACE) {
if (source == SOURCE_INTERFACE || source == SOURCE_UPNP) {
try {
InetAddress ia = InetAddress.getByAddress(ip);
saveLocalAddress(ia);
@ -1797,7 +1797,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
if (wantsRebuild) {
if (_log.shouldLog(Log.INFO))
_log.info("Address rebuilt: " + addr, new Exception());
_log.info("Address rebuilt: " + addr);
replaceAddress(addr);
if (allowRebuildRouterInfo)
_context.router().rebuildRouterInfo();