diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-05 17:43:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-05 17:43:17 -0400 |
| commit | a4667e3e8cb7fae50b0c2cb8bc1a46df0b289b6c (patch) | |
| tree | 9f75d066b025e99f7015818ccbe143d70b5bbae7 /Assistant/Threads/PairListener.hs | |
| parent | dedc9790ef60b0965c0c34acd080ef8d4906e07a (diff) | |
finished XMPP pairing!
This includes keeping track of which buddies we're pairing with, to know
which PairAck are legitimate.
Diffstat (limited to 'Assistant/Threads/PairListener.hs')
| -rw-r--r-- | Assistant/Threads/PairListener.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/Threads/PairListener.hs b/Assistant/Threads/PairListener.hs index c169aa255..44b35a9c3 100644 --- a/Assistant/Threads/PairListener.hs +++ b/Assistant/Threads/PairListener.hs @@ -123,7 +123,7 @@ pairAckReceived True (Just pip) msg cache = do stopSending pip repodir <- repoPath <$> liftAnnex gitRepo liftIO $ setupAuthorizedKeys msg repodir - finishedPairing msg (inProgressSshKeyPair pip) + finishedLocalPairing msg (inProgressSshKeyPair pip) startSending pip PairDone $ multicastPairMsg (Just 1) (inProgressSecret pip) (inProgressPairData pip) return $ pip : take 10 cache @@ -153,4 +153,4 @@ pairDoneReceived False _ _ = noop -- not verified pairDoneReceived True Nothing _ = noop -- not in progress pairDoneReceived True (Just pip) msg = do stopSending pip - finishedPairing msg (inProgressSshKeyPair pip) + finishedLocalPairing msg (inProgressSshKeyPair pip) |