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 /doc/design/assistant/xmpp.mdwn | |
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 'doc/design/assistant/xmpp.mdwn')
-rw-r--r-- | doc/design/assistant/xmpp.mdwn | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/design/assistant/xmpp.mdwn b/doc/design/assistant/xmpp.mdwn index 99a4a56b8..6cfcbf56c 100644 --- a/doc/design/assistant/xmpp.mdwn +++ b/doc/design/assistant/xmpp.mdwn @@ -40,6 +40,10 @@ To indicate it's pushed changes to a git repo with a given UUID, a client uses: Multiple UUIDs can be listed when multiple clients were pushed. If the git repo does not have a git-annex UUID, an empty string is used. +For pairing over XMPP, git-annex uses IQ messages, also containing a +git-annex tag. The id attribute of the iq tag contains the pairing +information. + ### security Data git-annex sends over XMPP will be visible to the XMPP |