1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-10-31 15:35:07 -04:00
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1571 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2008-01-11 22:43:04 +00:00
parent 364d8530e8
commit 2817a14b24

View File

@ -25,6 +25,12 @@
&stpeter; &stpeter;
&seanegan; &seanegan;
&robmcqueen; &robmcqueen;
<revision>
<version>0.15</version>
<date>2008-01-11</date>
<initials>psa</initials>
<remark><p>Removed content-accept after content-remove per XEP-0166.</p></remark>
</revision>
<revision> <revision>
<version>0.14</version> <version>0.14</version>
<date>2008-01-03</date> <date>2008-01-03</date>
@ -800,10 +806,6 @@ Romeo Juliet
|<----------------------------| |<----------------------------|
| ack | | ack |
|---------------------------->| |---------------------------->|
| content-accept |
|---------------------------->|
| ack |
|<----------------------------|
| transport-info (X times) | | transport-info (X times) |
| (with acks) | | (with acks) |
|<--------------------------->| |<--------------------------->|
@ -918,33 +920,13 @@ Romeo Juliet
</jingle> </jingle>
</iq> </iq>
]]></example> ]]></example>
<p>Romeo then acknowledges the content-remove request and, if it is acceptable, returns a content-accept:</p> <p>Romeo then acknowledges the content-remove request:</p>
<example caption="Initiator acknowledges content-remove"><![CDATA[ <example caption="Initiator acknowledges content-remove"><![CDATA[
<iq from='romeo@montague.lit/orchard' <iq from='romeo@montague.lit/orchard'
id='remove1' id='remove1'
to='juliet@capulet.lit/balcony' to='juliet@capulet.lit/balcony'
type='result'/> type='result'/>
]]></example> ]]></example>
<example caption="Initiator accepts content definition"><![CDATA[
<iq from='romeo@montague.lit/orchard'
id='remove2'
to='juliet@capulet.lit/balcony'
type='set'>
<jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'
action='content-accept'
initiator='romeo@montague.lit/orchard'
sid='a73sjjvkla37jfea'>
<content creator='responder' name='this-is-the-audio-content' profile='RTP/AVP'/>
</jingle>
</iq>
]]></example>
<p>The other party then acknowledges the acceptance.</p>
<example caption="Responder acknowledges content-accept"><![CDATA[
<iq from='juliet@capulet.lit/balcony'
id='remove2'
to='romeo@montague.lit/orchard'
type='result'/>
]]></example>
<p>Because the parties have chosen the Jingle ICE-UDP Transport Method, the initiator and responder exchange an open-ended number of possible candidate transports, perform connectivity checks, and agree upon a candidate transport as explained in <cite>XEP-0176</cite>. Once ICE negotiation is completed, the initiator sends a content-modify action to the responder.</p> <p>Because the parties have chosen the Jingle ICE-UDP Transport Method, the initiator and responder exchange an open-ended number of possible candidate transports, perform connectivity checks, and agree upon a candidate transport as explained in <cite>XEP-0176</cite>. Once ICE negotiation is completed, the initiator sends a content-modify action to the responder.</p>
<example caption="Initiator requests content-modify"><![CDATA[ <example caption="Initiator requests content-modify"><![CDATA[
<iq from='romeo@montague.lit/orchard' <iq from='romeo@montague.lit/orchard'