aboutsummaryrefslogtreecommitdiff
path: root/xep-0247.xml
diff options
context:
space:
mode:
authorPeter Saint-Andre <stpeter@jabber.org>2009-02-20 18:01:49 +0000
committerPeter Saint-Andre <stpeter@jabber.org>2009-02-20 18:01:49 +0000
commitf741142221746a51901df0de0e17e6b661509b9b (patch)
tree39fbccc45472bb674ea62301fe1bd5b00b6329f0 /xep-0247.xml
parent4be6840cf5eff745bee34d91cb04e7a2df15ca15 (diff)
0.2
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@2764 4b5297f7-1745-476d-ba37-a9c6900126ab
Diffstat (limited to 'xep-0247.xml')
-rw-r--r--xep-0247.xml344
1 files changed, 183 insertions, 161 deletions
diff --git a/xep-0247.xml b/xep-0247.xml
index 1790983..593a7c2 100644
--- a/xep-0247.xml
+++ b/xep-0247.xml
@@ -7,7 +7,7 @@
<xep>
<header>
<title>Jingle XML Streams</title>
- <abstract>This specification defines a Jingle application type for establishing direct or mediated XML streams between two entities over any reliable transport. This technology thus enables two entities to establish a trusted connection for end-to-end encryption or for bypassing server limits on large volumes of XMPP traffic.</abstract>
+ <abstract>This specification defines a Jingle application type for establishing direct or mediated XML streams between two entities over any streaming transport. This technology thus enables two entities to establish a trusted connection for end-to-end encryption or for bypassing server limits on large volumes of XMPP traffic.</abstract>
&LEGALNOTICE;
<number>0247</number>
<status>Experimental</status>
@@ -29,8 +29,8 @@
<revision>
<version>0.2</version>
<date>2009-02-20</date>
- <initials>dm</initials>
- <remark><p>Adjust to Jingle-XTLS, Jingle-S5B, and Jingle-IBB. The basic stream setup from XEP-0246 is now included in the document</p></remark>
+ <initials>dm/psa</initials>
+ <remark><p>Adjusted text and examples to reflect Jingle-XTLS, Jingle-IBB, and Jingle-S5B; moved stream security to Jingle-XTLS; moved basic stream setup from XEP-0246 to this document; changed examples to use Jingle-IBB as the transport; clarified stream opening and closing as well as session termination.</p></remark>
</revision>
<revision>
<version>0.1</version>
@@ -53,47 +53,43 @@
<li>Two endpoints want to enforce end-to-end encryption</li>
<li>Two endpoints want to send a high volume of XMPP traffic but the intermediate servers enforce rate limits</li>
</ul>
- <p>The first situation is addressed by &xep0174;. However, if the endpoints already have client-to-server connections but wish to bypass those connections or leverage those streams for a higher-level application such as end-to-end encryption, it is desirable for the two endpoints to negotiate an end-to-end XML stream. This specification defines methods for doing so, where the application format is an XML stream and the transport method is any direct or mediated reliable transport, such as &xep0261; (mediated), &xep0260; (direct or mediated), or a future ice-tcp Jingle transport (direct or mediated) based on &ice-tcp;.</p>
+ <p>The first situation is addressed by &xep0174;. However, if the endpoints already have client-to-server connections but wish to bypass those connections or leverage those streams for a higher-level application such as end-to-end encryption, it is desirable for the two endpoints to negotiate an end-to-end XML stream. This specification defines methods for doing so, where the application format is an XML stream and the transport method is any direct or mediated streaming transport, such as &xep0261; (mediated), &xep0260; (direct or mediated), or a future ice-tcp Jingle transport (direct or mediated) based on &ice-tcp;.</p>
</section1>
-<section1 topic='Open a Secure Stream' anchor='protocol'>
+<section1 topic='Protocol' anchor='protocol'>
<p>This section provides a friendly introduction to Jingle XML streams.</p>
- <p>First, the party that wishes to initiate the stream determines the responder's capabilities (via &xep0030; or &xep0115;). Here we assume that the responder supports a service discovery feature of 'urn:xmpp:tmp:jingle:apps:xmlstream:0' &NSNOTE; corresponding to the Jingle XML stream functionalited defined herein, as well as the 'urn:xmpp:jingle:transports:s5b:0' and 'urn:xmpp:jingle:transports:ibb:0' features.</p>
+ <p>First, the party that wishes to initiate the stream determines the responder's capabilities (via &xep0030; or &xep0115;). Here we assume that the responder supports a service discovery feature of 'urn:xmpp:jingle:apps:xmlstream:0' &VNOTE; corresponding to the Jingle XML stream functionality defined herein, as well as the 'urn:xmpp:jingle:transports:ibb:0' feature.</p>
<p>The initiator then sends a Jingle session-initiation request to the responder. The content-type of the request specifies three things:</p>
<ol start='1'>
- <li><p>An application type of "urn:xmpp:tmp:jingle:apps:xmlstream:0" &NSNOTE;, where the &lt;description/&gt; element specifies parameters for the XML stream and the parameters map to those provided in &xep0155; in a way that is consistent with &xep0116;.</p></li>
- <li><p>Options for the reliable transport method, such as In-Band Bytestreams ("IBB") as defined in <cite>XEP-0261</cite> or SOCKS5 Bytestreams ("S5B") as defined in <cite>XEP-0260</cite>.</p></li>
- <li><p>A security element as defined by <cite>Jingle-XTLS</cite>.</p></li>
+ <li><p>An application type of "urn:xmpp:jingle:apps:xmlstream:0".</p></li>
+ <li><p>Options for the streaming transport method, such as In-Band Bytestreams ("IBB") as defined in <cite>XEP-0261</cite> or SOCKS5 Bytestreams ("S5B") as defined in <cite>XEP-0260</cite>.</p></li>
</ol>
- <p>In this example, the initiator is &lt;romeo@montague.lit&gt;, the responder is &lt;juliet@capulet.lit&gt;, and the initiation request specifies Alice's desired stream parameters along with a transport method of "s5b" (i.e., <cite>XEP-0260</cite>).</p>
+ <p class='box'>Note: It is STRONGLY RECOMMENDED to encrypt all end-to-end XML streams as described in <cite>Jingle-XTLS</cite> (currently located at &lt;<link url='http://xmpp.org/extensions/inbox/jingle-xtls.html'>http://xmpp.org/extensions/inbox/jingle-xtls.html</link>&gt;). Those security flows are NOT described here.</p>
+ <p>In this example, the initiator is &lt;romeo@montague.lit&gt;, the responder is &lt;juliet@capulet.lit&gt;, and the initiation request specifies a transport method of "jingle-ibb" (i.e., <cite>XEP-0261</cite>).</p>
<p>The flow is as follows.</p>
<code><![CDATA[
- Romeo Juliet
- | |
- | session-initiate |
- |---------------------------->|
- | ack |
- |<----------------------------|
- | session-accept |
- |<----------------------------|
- | ack |
- |---------------------------->|
- | [ SOCKS5 negotiation ] |
- |<--------------------------->|
- | [ TLS handshake ] |
- |<--------------------------->|
- | [ XML stream ] |
- |<--------------------------->|
- | terminate |
- |<----------------------------|
- | ack |
- |---------------------------->|
- | |
+ Romeo Juliet
+ | |
+ | session-initiate |
+ |------------------------------>|
+ | ack |
+ |<------------------------------|
+ | session-accept |
+ |<------------------------------|
+ | ack |
+ |------------------------------>|
+ | [ XML stream over IBB ] |
+ |<----------------------------->|
+ | terminate |
+ |<------------------------------|
+ | ack |
+ |------------------------------>|
+ | |
]]></code>
<p>First the initiator sends a Jingle session-initiate.</p>
<example caption="Initiator sends session-initiate"><![CDATA[
<iq from='romeo@montague.lit/orchard'
- id='jingle1'
+ id='ty1bf726'
to='juliet@capulet.lit/balcony'
type='set'>
<jingle xmlns='urn:xmpp:jingle:0'
@@ -101,19 +97,10 @@
initiator='romeo@montague.lit/orchard'
sid='851ba2'>
<content creator='initiator' name='xmlstream'>
- <description xmlns='urn:xmpp:tmp:jingle:apps:xmlstream:0'/>
- <transport xmlns='urn:xmpp:jingle:transports:s5b:0'
- sid='vj3hs98y'
- mode='tcp'>
- <streamhost
- jid='romeo@montague.lit/orchard'
- host='192.168.4.1'
- port='5086'/>
- <streamhost
- jid='streamer.shakespeare.lit'
- host='24.24.24.1'
- zeroconf='_jabber.bytestreams'/>
- </transport>
+ <description xmlns='urn:xmpp:jingle:apps:xmlstream:0'/>
+ <transport xmlns='urn:xmpp:jingle:transports:ibb:0'
+ block-size='4096'
+ sid='vj3hs98y'/>
</content>
</jingle>
</iq>
@@ -121,12 +108,12 @@
<p>The responder immediately acknowledges receipt of the Jingle session-initiate.</p>
<example caption="Responder acknowledges session-initiate"><![CDATA[
<iq from='juliet@capulet.lit/balcony'
- id='jingle1'
+ id='ty1bf726'
to='romeo@montague.lit/orchard'
type='result'/>
]]></example>
- <p>If the user accepts the session the responder sends a session-accept.</p>
- <example caption="Responder sends session-accept with streamhost candidates"><![CDATA[
+ <p>If the responding user accepts the session then her client sends a session-accept.</p>
+ <example caption="Responder sends session-accept"><![CDATA[
<iq from='juliet@capulet.lit/balcony'
id='hwd987h'
to='romeo@montague.lit/orchard'
@@ -138,141 +125,169 @@
<content creator='initiator' name='stub'>
<description xmlns='urn:xmpp:jingle:apps:stub:0'/>
<transport xmlns='urn:xmpp:jingle:transports:s5b:0'
- sid='vj3hs98y'
- mode='tcp'>
- <streamhost
- jid='juliet@capulet.lit/balcony'
- host='192.169.1.10'
- port='6539'/>
- <streamhost
- jid='juliet@capulet.lit/balcony'
- host='134.102.201.180'
- port='16453'/>
- <streamhost
- jid='juliet@capulet.lit/balcony'
- host='2001:638:708:30c9:219:d1ff:fea4:a17d'
- port='6539'/>
- </transport>
- <security xmlns='urn:xmpp:jingle:security:xtls:0'/>
- <offer xmlns='urn:xmpp:tmp:c2ctls'>
- <keyinfo xmlns='urn:xmpp:tmp:pubkey'>
- <name>JulietX509CertificateHash</name>
- </keyinfo>
- <srp/>
- </offer>
- </security>
+ block-size='4096'
+ sid='vj3hs98y'/>
</content>
</jingle>
</iq>
]]></example>
- <p>The initiator acknowledges receipt and tries to connect to the offered StreamHosts.</p>
+ <p>The initiator acknowledges receipt.</p>
<example caption="Initiator acknowledges session-accept"><![CDATA[
<iq from='romeo@montague.lit/orchard'
id='hwd987h'
to='juliet@capulet.lit/balcony'
type='result'/>
]]></example>
- <p>The clients MUST attempt to open a standard TCP socket on the network address of the StreamHost communicated by the peer. If more than one StreamHost was provided, the client SHOULD try to connect to them in the order they occur.</p>
- <p>If the client is able to open a TCP socket on a StreamHost, it MUST utilize the SOCKS5 protocol specified in &rfc1928; to establish the connection with the StreamHost.</p>
- <example caption='Responder Connects to StreamHost'><![CDATA[
-CMD = X'01'
-ATYP = X'03'
-DST.ADDR = SHA1 Hash of: (SID + Initiator JID + Responder JID)
-DST.PORT = 0
- ]]></example>
- <example caption='StreamHost Acknowledges Connection'><![CDATA[
-STATUS = X'00'
+ <p>The clients can then begin to exchange XMPP data over the in-band bytestream. Because the transport is an in-band bytestream, the XMPP data is prepared as described in &xep0047; (i.e., Base64-encoded).</p>
+ <p>First the initiator sends an initial stream header to the responder.</p>
+ <example caption="Initial stream header (unencoded)"><![CDATA[
+<stream:stream
+ xmlns='jabber:client'
+ xmlns:stream='http://etherx.jabber.org/streams'
+ from='romeo@montague.lit/orchard'
+ to='juliet@capulet.lit/balcony'
+ version='1.0'>
]]></example>
- <p>After one client has authenticated with the StreamHost, it MUST send a Jingle transport-info to the initiator indicating which StreamHost was used.</p>
- <example caption="Initiator sends streamhost-used in Jingle transport-info"><![CDATA[
-<iq from='romeo@montague.lit/orchard'
- id='hjdi8'
- to='juliet@capulet.lit/balcony'
+ <p>Note: In accordance with &rfc3921bis;, the initial stream header SHOULD include the 'to' and 'from' attributes, which SHOULD specify the full JIDs of the clients. If the initiator supports stream features and the other stream-related aspects of XMPP 1.0 as specified in <cite>RFC 3920</cite>, then it SHOULD include the version='1.0' flag as shown in the previous example.</p>
+ <example caption="Initial stream header (encoded in IBB) and IQ-result"><![CDATA[
+<iq from='romeo@montague.net/orchard'
+ id='ur73n153'
+ to='juliet@capulet.com/balcony'
type='set'>
- <jingle xmlns='urn:xmpp:jingle:0'>
- action='transport-info'
- initiator='romeo@montague.lit/orchard'
- sid='a73sjjvkla37jfea'>
- <content creator='initiator' name='stub'>
- <transport xmlns='urn:xmpp:jingle:transports:s5b:0'
- sid='vj3hs98y'
- mode='tcp'>
- <streamhost-used
- jid='juliet@capulet.lit/balcony'
- host='134.102.201.180'
- port='16453'/>
- </transport>
- </content>
- </jingle>
+ <data xmlns='http://jabber.org/protocol/ibb' seq='0' sid='vj3hs98y'>
+ PHN0cmVhbTpzdHJlYW0geG1sbnM9J2phYmJlcjpjbGllbnQnIHhtbG5zOnN0cmVh
+ bT0naHR0cDovL2V0aGVyeC5qYWJiZXIub3JnL3N0cmVhbXMnIGZyb209J3JvbWVv
+ QG1vbnRhZ3VlLmxpdC9vcmNoYXJkJyB0bz0nanVsaWV0QGNhcHVsZXQubGl0L2Jh
+ bGNvbnknIHZlcnNpb249JzEuMCc+
+ </data>
</iq>
- ]]></example>
- <p>The peer immediately acknowledges receipt.</p>
- <example caption="Responder acknowledges streamhost-used message"><![CDATA[
-<iq from='juliet@capulet.lit/balcony'
- id='hjdi8'
- to='romeo@montague.lit/orchard'
+
+<iq from='juliet@capulet.com/balcony'
+ id='ur73n153'
+ to='romeo@montague.net/orchard'
type='result'/>
]]></example>
- <p>Parallel to the SOCKS5 transport setup the initiator signals the TLS method to be used to the responder.</p>
- <example caption="Initiator sends security-info"><![CDATA[
-<iq from='romeo@montague.lit/orchard'
- id='hf749j'
- to='juliet@capulet.lit/balcony'
- type='set'>
- <jingle xmlns='urn:xmpp:jingle:0'>
- action='security-info'
- initiator='romeo@montague.lit/orchard'
- sid='a73sjjvkla37jfea'>
- <content creator='initiator' name='xmlstream'>
- <security xmlns='urn:xmpp:jingle:security:xtls:0'
- method='x509'/>
- </content>
- </jingle>
-</iq>
- ]]></example>
- <p>The responder acknowledges the receipt</p>
- <example caption='Responder acknowledges security-info'><![CDATA[
-<iq from='juliet@capulet.lit/balcony'
- id='hf749j'
- to='romeo@montague.lit/orchard'
- type='result'/>
- ]]></example>
- <p>After the transport stream is ready and the initiator received the acknowledment from the security-info it starts the four-way TLS handshake on the transport stream.</p>
-</section1>
-
-<section1 topic='Initiating an e2e Stream' anchor='initiate'>
- <p>If the TLS handshake is complete both clients send an initial &lt;stream/&gt; element to open a client-to-client stream</p>
- <example caption="Opening a Stream"><![CDATA[
+ <p>The responder then sends a response stream header back to the initiator (because this stream header is sent in the other direction, the IBB 'seq' attribute has a value of zero, not 1).</p>
+ <example caption="Response stream header"><![CDATA[
<stream:stream
xmlns='jabber:client'
xmlns:stream='http://etherx.jabber.org/streams'
- from='romeo@montague.lit/orchard'
- to='juliet@capulet.lit/balcony'
+ from='juliet@capulet.lit/balcony'
+ id='hs91gh1836d8s717'
+ to='romeo@montague.lit/orchard'
version='1.0'>
]]></example>
- <p>In accordance with &rfc3921bis;, the initial stream header SHOULD include the 'to' and 'from' attributes. This should be the full JID of the clients. If the initiator supports stream features and the other stream-related aspects of XMPP 1.0 as specified in <cite>RFC 3920</cite>, then it SHOULD include the version='1.0' flag as shown in the previous example.</p>
-</section1>
+ <example caption="Response stream header (encoded in IBB) and IQ-result"><![CDATA[
+<iq from='juliet@capulet.com/balcony'
+ id='pd61g397'
+ to='romeo@montague.net/orchard'
+ type='set'>
+ <data xmlns='http://jabber.org/protocol/ibb' seq='1' sid='vj3hs98y'>
+ PHN0cmVhbTpzdHJlYW0geG1sbnM9J2phYmJlcjpjbGllbnQnIHhtbG5zOnN0cmVh
+ bT0naHR0cDovL2V0aGVyeC5qYWJiZXIub3JnL3N0cmVhbXMnIGZyb209J2p1bGll
+ dEBjYXB1bGV0LmxpdC9iYWxjb255JyBpZD0naHM5MWdoMTgzNmQ4czcxNycgdG89
+ J3JvbWVvQG1vbnRhZ3VlLmxpdC9vcmNoYXJkJyB2ZXJzaW9uPScxLjAnPg==
+ </data>
+</iq>
-<section1 topic='Exchanging Stanzas' anchor='exchange'>
+<iq from='romeo@montague.net/orchard'
+ id='pd61g397'
+ to='juliet@capulet.com/balcony'
+ type='result'/>
+ ]]></example>
<p>Once the streams are established, either entity then can send XMPP message, presence, and IQ stanzas, with or without 'to' and 'from' addresses.</p>
- <example caption="Sending a Message"><![CDATA[
+ <example caption="A message (unencoded)"><![CDATA[
<message from='romeo@montague.lit/orchard' to='juliet@capulet.lit/balcony'>
- <body>M'lady, I would be pleased to make your acquaintance.</body>
+ <body>M&apos;lady, I would be pleased to make your acquaintance.</body>
</message>
]]></example>
- <example caption="A Reply"><![CDATA[
+ <example caption="A message (encoded in IBB) and IQ-result"><![CDATA[
+<iq from='romeo@montague.net/orchard'
+ id='iq7dh294'
+ to='juliet@capulet.com/balcony'
+ type='set'>
+ <data xmlns='http://jabber.org/protocol/ibb' seq='1' sid='vj3hs98y'>
+ PG1lc3NhZ2UgZnJvbT0ncm9tZW9AbW9udGFndWUubGl0L29yY2hhcmQnIHRvPSdq
+ dWxpZXRAY2FwdWxldC5saXQvYmFsY29ueSc+PGJvZHk+TSZhcG9zO2xhZHksIEkg
+ d291bGQgYmUgcGxlYXNlZCB0byBtYWtlIHlvdXIgYWNxdWFpbnRhbmNlLjwvYm9k
+ eT48L21lc3NhZ2U+
+ </data>
+</iq>
+
+<iq from='juliet@capulet.com/balcony'
+ id='iq7dh294'
+ to='romeo@montague.net/orchard'
+ type='result'/>
+ ]]></example>
+ <p>The responder could then send a reply.</p>
+ <example caption="A reply (unencoded)"><![CDATA[
<message from='juliet@capulet.lit/balcony' to='romeo@montague.lit/orchard'>
<body>Art thou not Romeo, and a Montague?</body>
</message>
]]></example>
+ <example caption="A reply (encoded in IBB) and IQ-result"><![CDATA[
+<iq from='juliet@capulet.com/balcony'
+ id='hr91hd63'
+ to='romeo@montague.net/orchard'
+ type='set'>
+ <data xmlns='http://jabber.org/protocol/ibb' seq='1' sid='vj3hs98y'>
+ PG1lc3NhZ2UgZnJvbT0nanVsaWV0QGNhcHVsZXQubGl0L2JhbGNvbnknIHRvPSdy
+ b21lb0Btb250YWd1ZS5saXQvb3JjaGFyZCc+PGJvZHk+QXJ0IHRob3Ugbm90IFJv
+ bWVvLCBhbmQgYSBNb250YWd1ZT88L2JvZHk+PC9tZXNzYWdlPg==
+ </data>
+</iq>
+
+<iq from='romeo@montague.net/orchard'
+ id='kr91n475'
+ to='juliet@capulet.com/balcony'
+ type='result'/>
+ ]]></example>
+ <p>To end the XML stream, either party sends a closing &lt;/stream:stream&gt; element.</p>
+ <example caption="Stream close (unencoded)"><![CDATA[
+</stream:stream>
+ ]]></example>
+ <example caption="Stream close (encoded in IBB) and IQ-result"><![CDATA[
+<iq from='juliet@capulet.com/balcony'
+ id='kr91n475'
+ to='romeo@montague.net/orchard'
+ type='set'>
+ <data xmlns='http://jabber.org/protocol/ibb' seq='2' sid='vj3hs98y'>
+ PC9zdHJlYW06c3RyZWFtPg==
+ </data>
+</iq>
+
+<iq from='romeo@montague.net/orchard'
+ id='kr91n475'
+ to='juliet@capulet.com/balcony'
+ type='result'/>
+ ]]></example>
+ <p>However, even after the application-level XML stream is terminated, the negotiated Jingle transport (here in-band bytestream) continues and could be re-used. To completely terminate the Jingle session, the terminating party would then also send a Jingle session-terminate message.</p>
+ <example caption="Responder terminates the stream and session"><![CDATA[
+<iq from='juliet@capulet.lit/balcony'
+ id='psy617r4'
+ to='romeo@montague.lit/orchard'
+ type='set'>
+ <jingle xmlns='urn:xmpp:jingle:0'
+ action='session-terminate'
+ initiator='romeo@montague.lit/orchard'
+ sid='851ba2'/>
+</iq>
+ ]]></example>
+ <p>The other party then acknowledges the Jingle session-terminate.</p>
+ <example caption="Initiator acks session-terminate"><![CDATA[
+<iq from='romeo@montague.lit/orchard'
+ id='psy617r4'
+ to='juliet@capulet.lit/balcony'
+ type='result'/>
+ ]]></example>
</section1>
<section1 topic='Implementation Notes' anchor='impl'>
<section2 topic='Mandatory to Implement Technologies' anchor='impl-mti'>
- <p>All implementations MUST support the In-Band Bytestreams transport method as a reliable method of last resort. An implementation SHOULD support other transport methods as well.</p>
+ <p>An implementations MUST support the Jingle IBB Transport Method (<cite>XEP-0261</cite>) as a dependable method of last resort. An implementation SHOULD support other streaming transport methods as well, such as the Jingle S5B Transport Method (<cite>XEP-0260</cite>).</p>
</section2>
<section2 topic='Preference Order of Transport Methods' anchor='impl-pref'>
- <p>An application MAY present transport methods in any order, except that the In-Band Bytestreams method MUST be the lowest preference.</p>
+ <p>An application MAY present transport methods in any order, except that the Jingle IBB Transport Method MUST be the lowest preference.</p>
</section2>
</section1>
@@ -281,8 +296,15 @@ STATUS = X'00'
</section1>
<section1 topic='XMPP Registrar Considerations' anchor='registrar'>
- <section2 topic='Protocol Namespaces' anchor='ns'>
- <p>Until this specification advances to a status of Draft, its associated namespaces shall be 'urn:xmpp:tmp:jingle:apps:xmlstream:0'. Upon advancement of this specification, the &REGISTRAR; shall issue a permanent namespace in accordance with the process defined in Section 4 of &xep0053;. The namespace 'urn:xmpp:jingle:apps:xmlstream' is requested and is thought to be unique per the XMPP Registrar's requirements.</p>
+ <section2 topic='Protocol Namespaces' anchor='registrar-ns'>
+ <p>This specification defines the following XML namespace:</p>
+ <ul>
+ <li>urn:xmpp:jingle:apps:xmlstream:0</li>
+ </ul>
+ <p>Upon advancement of this specification from a status of Experimental to a status of Draft, the &REGISTRAR; shall add the foregoing namespaces to the registry located at &NAMESPACES;, as described in Section 4 of &xep0053;.</p>
+ </section2>
+ <section2 topic='Protocol Versioning' anchor='registrar-versioning'>
+ &NSVER;
</section2>
<section2 topic='Jingle Application Formats' anchor='registrar-content'>
<p>The XMPP Registrar shall include "xmlstream" in its registry of Jingle application formats. The registry submission is as follows:</p>
@@ -290,8 +312,8 @@ STATUS = X'00'
<application>
<name>xmlstream</name>
<desc>Jingle sessions for an end-to-end XML stream</desc>
- <transport>reliable</transport>
- <doc>XEP-xxxx</doc>
+ <transport>streaming</transport>
+ <doc>XEP-0247</doc>
</application>
]]></code>
</section2>
@@ -303,17 +325,17 @@ STATUS = X'00'
<xs:schema
xmlns:xs='http://www.w3.org/2001/XMLSchema'
- targetNamespace='urn:xmpp:tmp:jingle:apps:xmlstream:0'
- xmlns='urn:xmpp:tmp:jingle:apps:xmlstream:0'
+ targetNamespace='urn:xmpp:jingle:apps:xmlstream:0'
+ xmlns='urn:xmpp:jingle:apps:xmlstream:0'
elementFormDefault='qualified'>
- <xs:element name='description'>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base='empty'/>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
+ <xs:element name='description' type='empty'/>
+
+ <xs:simpleType name='empty'>
+ <xs:restriction base='xs:string'>
+ <xs:enumeration value=''/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:schema>
]]></code>