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

Transport: Fix UPnP deadlock

Browse Source
This commit is contained in:
zzz
2022-04-12 09:00:40 -04:00
parent c0b8fe94a8
commit eaa526583d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
router/java/src/net/i2p/router/transport/TransportManager.java
View File

@ -977,7 +977,10 @@ public class TransportManager implements TransportEventListener {
_upnpUpdateQueued = true;
_context.simpleTimer2().addEvent(new UpdatePorts(), 3250);
} else {
_upnpManager.update(getPorts());
// throw onto timer to avoid deadlock
//_upnpManager.update(getPorts());
_upnpUpdateQueued = true;
_context.simpleTimer2().addEvent(new UpdatePorts(), 0);
}
}
}
@ -991,9 +994,10 @@ public class TransportManager implements TransportEventListener {
*/
private class UpdatePorts implements SimpleTimer.TimedEvent {
public void timeReached() {
Set<Port> ports = getPorts();
synchronized (_upnpManager) {
_upnpUpdateQueued = false;
_upnpManager.update(getPorts());
_upnpManager.update(ports);
}
}
}