path: root/docs
diff options
authorGuillaume Desmottes <>2008-12-18 16:55:18 +0000
committerGuillaume Desmottes <>2008-12-18 16:55:18 +0000
commit10faa72c524ed3c2ad1362f5124c89464ec9e364 (patch)
treee25c86fb352ac199f37ec5d2a3875ff36cbd3e7b /docs
parent58cc78a2de7760ae6cc0de957f782e5d978983b7 (diff)
parent6f8331f008a1d8cfc32ee19ce9f3b4f2bf5e79c8 (diff)
Merge branch 'sock5' into si-fallback
Conflicts: src/bytestream-ibb.c src/bytestream-socks5.c
Diffstat (limited to 'docs')
1 files changed, 21 insertions, 0 deletions
diff --git a/docs/tubes.xml b/docs/tubes.xml
index 90f723c44..adbb113b8 100644
--- a/docs/tubes.xml
+++ b/docs/tubes.xml
@@ -660,6 +660,27 @@
also implicitly implies leaving all tubes.</p>
+<section1 topic='Tube capability' anchor='caps'>
+ <section2 topic='Global tube capability' anchor='caps-general'>
+ <p>The tube feature is advertised with XEP-0115 Entity Capabilities using
+ this string:</p>
+ <code></code>
+ </section2>
+ <section2 topic='Specific tube capability' anchor='caps-specific'>
+ <p>We want to know which tube the contacts can handle. There is two
+ different kind of tube capabilities:</p>
+ <ul>
+ <li>Can my contact receive a tube offer of a specific service?</li>
+ <li>Can my contact offer a tube of a specific service?</li>
+ </ul>
+ <p>Only the first kind is considered. The second is out of scope of this
+ specification. Each specific service is advertised with XEP-0115 Entity
+ Capabilities with this string:</p>
+ <code>$type#$service</code>
+ <p>where $type is the tube type (either "dbus" or "stream") and $service is
+ the service name (e.g. "vnc" or "TicTacTube").</p>
+ </section2>
<section1 topic='Business Rules' anchor='rules'>
<section2 topic='D-Bus unique names in a MUC context'>
<p>The D-Bus unique names used in the MUC SHOULD be ":2." followed by the