diff --git a/xep-0167.xml b/xep-0167.xml index 420763cc..bc98d330 100644 --- a/xep-0167.xml +++ b/xep-0167.xml @@ -25,6 +25,12 @@ &stpeter; &seanegan; &robmcqueen; + + 0.17 + 2008-02-29 + psa +

Corrected use of content-replace action per XEP-0166.

+
0.16 2008-02-28 @@ -275,7 +281,7 @@ to='romeo@montague.net/orchard' type='result'/> ]]> -

The responder then should send a list of the payload types that it can receive via a Jingle "content-accept" (or "session-accept") action. The list that the responder sends MAY include any payload types (not a subset of the payload types sent by the initiator) but SHOULD retain the ID numbers specified by the initiator. The order of the &PAYLOADTYPE; elements indicates the responder's preferences, with the most-preferred types first.

+

If the responder wishes to accept the session, it MUST send a content-accept action to the initiator, which SHOULD include a list of the payload types that it can receive. The list that the responder sends MAY include any payload types (not a subset of the payload types sent by the initiator) but SHOULD retain the ID numbers specified by the initiator. The order of the &PAYLOADTYPE; elements indicates the responder's preferences, with the most-preferred types first.

]]> -

The initiator acknowledges the 'content-accept' with an empty IQ result:

+

The initiator acknowledges the content-accept action:

]]> -

Note: Because a "session-accept" action implicitly indicates acceptance of the application format (i.e., "content-accept"), it is not necessary to send a separate "content-accept" action. This flow is shown for completeness only.

@@ -619,7 +624,7 @@ Romeo Juliet |<--------------------------->| | STUN connectivity checks | |<--------------------------->| - | content-modify | + | content-replace | |---------------------------->| | ack | |<----------------------------| @@ -683,14 +688,14 @@ Romeo Juliet to='juliet@capulet.lit/balcony' type='result'/> ]]> -

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 XEP-0176. Once ICE negotiation is completed, the initiator sends a content-modify action to the responder.

- 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 XEP-0176. Once ICE negotiation is completed, the initiator sends a content-replace action to the responder.

+ @@ -718,10 +723,10 @@ Romeo Juliet ]]> -

The responder then acknowledges the content-modify action and sends a session-accept action.

- The responder then acknowledges the content-replace action and sends a session-accept action.

+ ]]> @@ -823,7 +828,7 @@ Romeo Juliet |<--------------------------->| | STUN connectivity checks | |<--------------------------->| - | content-modify | + | content-replace | |---------------------------->| | ack | |<----------------------------| @@ -939,14 +944,14 @@ Romeo Juliet to='juliet@capulet.lit/balcony' type='result'/> ]]>
-

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 XEP-0176. Once ICE negotiation is completed, the initiator sends a content-modify action to the responder.

- 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 XEP-0176. Once ICE negotiation is completed, the initiator sends a content-replace action to the responder.

+ @@ -974,10 +979,10 @@ Romeo Juliet ]]> -

The responder then acknowledges the content-modify action and sends a session-accept action.

- The responder then acknowledges the content-replace action and sends a session-accept action.

+ ]]> @@ -1096,14 +1101,14 @@ Romeo Juliet ]]>
-

The entity receiving the content-add request then acknowledges the request and, if it is acceptable, returns a content-accept:

+

The entity receiving the content-add request then acknowledges the request and, if it is acceptable, returns a content-accept action:

]]> - | - | content-modify | + | content-replace | |<----------------------------| | ack | |---------------------------->| @@ -1187,7 +1192,7 @@ Romeo Juliet |<--------------------------->| | STUN connectivity checks | |<--------------------------->| - | content-modify | + | content-replace | |---------------------------->| | ack | |<----------------------------| @@ -1251,61 +1256,65 @@ Romeo Juliet to='juliet@capulet.lit/balcony' type='result'/> ]]> -

However, Juliet wants to make sure that the communications are encrypted, so she sends a "content-modify" request to Romeo.

- However, Juliet wants to make sure that the communications are encrypted, so she sends a content-replace action to Romeo.

+ - + + + + ]]> -

Romeo then acknowledges the content-modify request and, if it is acceptable, returns a content-accept:

- Romeo then acknowledges the content-replace action and, if it is acceptable, returns a content-accept action:

+ ]]> - + + + + ]]>

The other party then acknowledges the acceptance.

]]> -

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 XEP-0176. Once ICE negotiation is completed, the initiator sends a content-modify action to the responder.

- 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 XEP-0176. Once ICE negotiation is completed, the initiator sends a content-replace action to the responder.

+ - + [ ... ] @@ -1329,10 +1338,10 @@ Romeo Juliet ]]> -

The responder then acknowledges the content-modify action and sends a session-accept action.

- The responder then acknowledges the content-replace action and sends a session-accept action.

+ ]]> @@ -1421,7 +1430,7 @@ Romeo Juliet

If it is necessary to send Dual Tone Multi-Frequency (DTMF) tones, it is REQUIRED to use the XML format specified &xep0181;.

-

When the Jingle Audio content type is accepted via a "content-accept" action, both initiator and responder SHOULD start listening for audio as defined by the negotiated transport method and audio application format. For interoperability with telephony systems, after the responder acknowledges the session initiation request, the responder SHOULD send a "ringing" message and both parties SHOULD play any audio received.

+

When the Jingle Audio content type is accepted via a content-accept action, both initiator and responder SHOULD start listening for audio as defined by the negotiated transport method and audio application format. For interoperability with telephony systems, after the responder acknowledges the session initiation request, the responder SHOULD send a "ringing" message and both parties SHOULD play any audio received.