Fix deadlock in SelfAwareness by deferring reconnects.

This commit is contained in:
Adam Ierymenko 2015-04-30 21:09:41 -07:00
parent 105e1a016f
commit 9279bac385
3 changed files with 34 additions and 14 deletions

View file

@ -311,15 +311,14 @@ public:
* Reset paths within a given scope
*
* For fixed paths in this scope, a packet is sent. Non-fixed paths in this
* scope are forgotten. If there are no paths remaining, a message is sent
* indirectly to reestablish connectivity if we're actively exchanging
* data with this peer (alive).
* scope are forgotten.
*
* @param RR Runtime environment
* @param scope IP scope of paths to reset
* @param now Current time
* @return True if at least one path was forgotten
*/
void resetWithinScope(const RuntimeEnvironment *RR,InetAddress::IpScope scope,uint64_t now);
bool resetWithinScope(const RuntimeEnvironment *RR,InetAddress::IpScope scope,uint64_t now);
/**
* @return 256-bit secret symmetric encryption key