diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-03 19:18:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-03 19:18:26 -0400 |
| commit | 221d51f68edaa4c74f6c35690339a9fd3100ded9 (patch) | |
| tree | f60653d49886403313f1c2d85a262159ff741751 /Assistant | |
| parent | d86432744193b03bcc23b4fa1c760598cd7eee1f (diff) | |
update xmpp protocol
Amusingly, I am not really using xmpp ping for pairing. I forgot to put in
the ping tag! And when I did, it stopped working, on Google Talk. Seems
it handles client to client pings, at least using the same JID, without
actually sending them to the end client. My mistake avoided this,
and seems to work, so I've left it as-is for now, with just the git-annex
tag in an IQ message. Also tested on prosody.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/XMPP.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/XMPP.hs b/Assistant/XMPP.hs index 3aef76b1a..75b64a788 100644 --- a/Assistant/XMPP.hs +++ b/Assistant/XMPP.hs @@ -85,7 +85,7 @@ isPresenceQuery p = case filter isGitAnnexTag (presencePayloads p) of [] -> False ((Element _name attrs _nodes):_) -> any (isAttr queryAttr) attrs -{- A notification about a stage of pairing. Sent as an XMPP ping. +{- A notification about a stage of pairing. Sent as an XMPP IQ. - The pairing info is sent using its id attribute; it also has a git-annex - tag to identify it as from us. -} pairingNotification :: PairStage -> UUID -> JID -> JID -> IQ |