diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-05 15:52:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-05 15:52:03 -0400 |
| commit | 94e4fab7be5ecdc7889f592ed9d12a409a864738 (patch) | |
| tree | 94c146eb71decf300e095b1e0a874439daf0f791 /doc/design/assistant | |
| parent | ffeb353813754e431ed3a6ae80c3d4422792db78 (diff) | |
clean up protocol docs
Diffstat (limited to 'doc/design/assistant')
| -rw-r--r-- | doc/design/assistant/xmpp.mdwn | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/doc/design/assistant/xmpp.mdwn b/doc/design/assistant/xmpp.mdwn index 284e56fa3..3c8864021 100644 --- a/doc/design/assistant/xmpp.mdwn +++ b/doc/design/assistant/xmpp.mdwn @@ -36,18 +36,23 @@ To these messages, it adds its own tag as [extended content](http://xmpp.org/rfcs/rfc6121.html#presence-extended). The xml namespace is "git-annex" (not an URL because I hate wasting bandwidth). -To indicate it's pushed changes to a git repo with a given UUID, -a message that should be sent to all buddies and other clients using the account -(no explicit pairing needed), a client uses a broadcast presence message with: +To indicate it's pushed changes to a git repo with a given UUID, a message +that should be sent to all buddies and other clients using the account (no +explicit pairing needed), it uses a broadcast presence message containing: <git-annex xmlns='git-annex' push="uuid[,uuid...]" /> 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, a chat message is sent, also using the git-annex tag: +To query if other git-annex clients are around, a presence message is used, +containing: - <git-annex xmlns='git-annex' pairing="PairReq uuid" /> + <git-annex xmlns='git-annex' query="" /> + +For pairing, a chat message is sent, containing: + + <git-annex xmlns='git-annex' pairing="PairReq|PairAck|PairDone uuid" /> ### security |