git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@4159 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2010-04-13 21:11:57 +00:00
parent df83f66e69
commit ebe1c86f66
1 changed files with 13 additions and 7 deletions

View File

@ -32,6 +32,12 @@
<email>klaus.hartke@googlemail.com</email>
<jid>nx@jabber.org</jid>
</author>
<revision>
<version>0.5</version>
<date>2010-04-13</date>
<initials>psa</initials>
<remark><p>Removed 'zeroconf' attribute for consistency with XEP-0065; clarified use of proxy-error condition; corrected schema.</p></remark>
</revision>
<revision>
<version>0.4</version>
<date>2010-02-17</date>
@ -268,7 +274,7 @@ priority = (2^16)*(type preference) + (local preference)
to='romeo@montague.lit/orchard'
type='result'/>
]]></example>
<p>If a client is unable to connect to <em>any</em> candidate sent by its peer, or if it stopped trying to connect because its peer sent a candidate-used notification with a priority higher than its remaining candidate(s), it sends a candidate-error Jingle transport-info message (this is equivalent to the IQ-error with code="500" from the "fast-mode" extension).</p>
<p>If a client is unable to connect to <em>any</em> candidate sent by its peer, or if it stopped trying to connect because its peer sent a candidate-used notification with a priority higher than its remaining candidate(s), it sends a candidate-error Jingle transport-info message (this is equivalent to the IQ-error with code='500' from the "fast-mode" extension).</p>
<example caption="Responder sends candidate-error in Jingle transport-info"><![CDATA[
<iq from='juliet@capulet.lit/balcony'
id='gft65ewd'
@ -322,8 +328,8 @@ priority = (2^16)*(type preference) + (local preference)
</jingle>
</iq>
]]></example>
<p>If the nominated candidate is of the proxy type and the party that offered that candidate can not connect to the proxy to activate it (for example because of a restrictive firewall), the party shall send a transport-info message containing an &lt;proxy-error/&gt; element as follows.</p>
<example caption="Responder informs initiator that bytestream has been activated"><![CDATA[
<p>If the nominated candidate is of the proxy type and either party cannot connect to the proxy (for example because of a restrictive firewall), the party shall send a transport-info message containing an &lt;proxy-error/&gt; element.</p>
<example caption="Responder informs initiator of inability to connect to the proxy"><![CDATA[
<iq from='juliet@capulet.lit/balcony'
id='bv73bs91'
to='romeo@montague.lit/orchard'
@ -530,10 +536,11 @@ Romeo Juliet
<xs:element name='transport'>
<xs:complexType>
<xs:choice>
<xs:element ref='candidate' minOccurs='0' maxOccurs='unbounded'/>
<xs:element ref='candidate-used' minOccurs='0' maxOccurs='1'/>
<xs:element name='candidate-error' minOccurs='0' maxOccurs='1' type='empty'/>
<xs:element ref='activated' minOccurs='0' maxOccurs='1'/>
<xs:element ref='candidate' minOccurs='0' maxOccurs='unbounded'/>
<xs:element name='candidate-error' minOccurs='0' maxOccurs='1' type='empty'/>
<xs:element ref='candidate-used' minOccurs='0' maxOccurs='1'/>
<xs:element name='proxy-error' minOccurs='0' maxOccurs='1' type='empty'/>
</xs:choice>
<xs:attribute name='mode' use='optional' default='tcp'>
<xs:attribute name='sid' type='xs:string' use='optional'/>
@ -566,7 +573,6 @@ Romeo Juliet
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name='zeroconf' type='xs:string' use='optional'/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>