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

NetDB: Prevent rare deadlock in rebuildRouterInfo()

Browse Source 
by making it always nonblocking.
as reported by drzed
This commit is contained in:
zzz
2021-06-08 10:06:41 -04:00
parent c2c922b665
commit 2f371301ad
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -997,8 +997,7 @@ public class Router implements RouterClock.ClockShiftListener {
*
* Warning - risk of deadlock - do not call while holding locks
*
* @param blockingRebuild If true, netdb publish will happen in-line.
* This may take a long time.
* @param blockingRebuild ignored, always nonblocking
*/
public void rebuildRouterInfo(boolean blockingRebuild) {
if (_log.shouldLog(Log.INFO))
@ -1015,6 +1014,8 @@ public class Router implements RouterClock.ClockShiftListener {
/**
* Rebuild and republish our routerInfo since something significant
* has changed.
*
* @param blockingRebuild ignored, always nonblocking
*/
private void locked_rebuildRouterInfo(boolean blockingRebuild) {
RouterInfo ri;
@ -1041,9 +1042,10 @@ public class Router implements RouterClock.ClockShiftListener {
if (!ri.isValid())
throw new DataFormatException("Our RouterInfo has a bad signature");
Republish r = new Republish(_context);
if (blockingRebuild)
r.timeReached();
else
// Avoid deadlocks part 1000
//if (blockingRebuild)
// r.timeReached();
//else
_context.simpleTimer2().addEvent(r, 0);
} catch (DataFormatException dfe) {
_log.log(Log.CRIT, "Internal error - unable to sign our own address?!", dfe);