Improve local pairing behavior when two computers both try to start the pairing process separately.

I was able to reproduce something very like this bug by starting
pairing separately on both computers under poor network conditions (ie,
weak wifi on my front porch). Neither computer showed an alert for the
PairReq messages it was seeing (intermittently) from the other.

So, I've made a new PairReq message that has not been seen before
always make the alert pop up, even if the assistant thinks it is
in the middle of its own pairing process (or even another pairing
process with a different box on the LAN).

(This shouldn't cause a rogue PairAck to disrupt a pairing process part
way through.)
This commit is contained in:
Joey Hess 2013-11-02 15:10:29 -04:00
parent b5ddb4f0e6
commit 7e7e765cba
4 changed files with 42 additions and 9 deletions

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
git-annex (4.20131102) UNRELEASED; urgency=low
* Improve local pairing behavior when two computers both try to start
the pairing process separately.
-- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400
git-annex (4.20131101) unstable; urgency=low
* The "git annex content" command is renamed to "git annex wanted".