From a4667e3e8cb7fae50b0c2cb8bc1a46df0b289b6c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Nov 2012 17:43:17 -0400 Subject: finished XMPP pairing! This includes keeping track of which buddies we're pairing with, to know which PairAck are legitimate. --- Assistant/Threads/PairListener.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Assistant/Threads/PairListener.hs') 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) -- cgit v1.2.3