From 6f256ab13afb5acbd7a1f9f87855a93074d88b47 Mon Sep 17 00:00:00 2001 From: Peter Saint-Andre Date: Fri, 29 Feb 2008 19:20:14 +0000 Subject: [PATCH] 0.16 git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1716 4b5297f7-1745-476d-ba37-a9c6900126ab --- xep-0176.xml | 97 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 71 insertions(+), 26 deletions(-) diff --git a/xep-0176.xml b/xep-0176.xml index 297c70af..19d7a767 100644 --- a/xep-0176.xml +++ b/xep-0176.xml @@ -27,6 +27,12 @@ &stpeter; &hildjj; &seanegan; + + 0.16 + 2008-02-29 + psa +

Changed content-modify to content-replace per XEP-0166.

 + 0.15 2008-01-06 @@ -185,7 +191,7 @@ INITIATOR RESPONDER |<-----------------------------------| | STUN Binding Result | |----------------------------------->| - | Jingle content-modify | + | Jingle content-replace | |----------------------------------->| | Jingle ack (XMPP IQ-result) | |<-----------------------------------| @@ -523,19 +529,19 @@ INITIATOR NAT RESPONDER

If, based on STUN connectivity checks, the parties determine that they will be able to exchange media between a given pair of local candidates and remote candidates (i.e., the pair is "nominated" and ICE processing is "completed"), the parties shall proceed as follows:

    -
  1. The initiator sends a Jingle content-modify action to the responder.
    2. -
  2. The responder acknowledges receipt of the content-modify.
    3. -
  3. The responder sends a Jingle content-accept or session-accept action to the initiator.
    4. -
  4. The initiator acknowledges receipt of the content-accept.
    5. +
  5. The initiator sends a Jingle content-replace action to the responder.
    6. +
  6. The responder acknowledges receipt of the content-replace.
    7. +
  7. The responder sends a Jingle session-accept action to the initiator.
    8. +
  8. The initiator acknowledges receipt of the session-accept.
-

First the initiator sends a Jingle content-modify action to the responder. The content-modify MUST contain information about the nominated pair, including the "rem-addr" and "rem-port" attributes (which specify the IP address and port for the responder's end of the pair, which is a "remote address" according to the initiator). This enables both parties to explicitly agree to both ends of the connection pair (i.e., the local address+port and the remote address+port).

- First the initiator sends a Jingle content-replace action to the responder. The content-replace MUST contain information about the nominated pair, including the "rem-addr" and "rem-port" attributes (which specify the IP address and port for the responder's end of the pair, which is a "remote address" according to the initiator). This enables both parties to explicitly agree to both ends of the connection pair (i.e., the local address+port and the remote address+port).

+ @@ -563,14 +569,14 @@ INITIATOR NAT RESPONDER ]]> -

The responder then acknowledges the content-modify action.

- The responder then acknowledges the content-replace action.

+ ]]> -

The responder then sends a &JINGLE; element with an action of 'content-accept' (or 'session-accept') to the initiator, specifying the candidate that succeeded.

+

The responder then sends a session-accept action to the initiator, specifying the candidate that succeeded.

]]> -

The &JINGLE; element in the content-accept or session-accept stanza SHOULD possess a 'responder' attribute that explicitly specifies the full JID of the responding entity. If the 'responder' attribute is provided, all future commmunications SHOULD be sent to the JID provided in the 'responder' attribute.

+

The &JINGLE; element in the session-accept stanza SHOULD possess a 'responder' attribute that explicitly specifies the full JID of the responding entity. If the 'responder' attribute is provided, all future commmunications SHOULD be sent to the JID provided in the 'responder' attribute.

Since according to the connectivity checks the initiator can also send data over that candidate, it acknowledges the responder's acceptance:

If the responder cannot find a suitable candidate transport or it receives a ¬acceptable; error from the initiator in response to its acceptance of a suitable transport, it SHOULD terminate the session as described in Section 6.8 of XEP-0166.

 -

The creator of a content type MAY modify an existing, in-use candidate at any time during the session, for example to change the IP address or port. This is done by sending a content-modify action with the changed candidate information, where the value of the 'generation' is incremented to specify that the candidate information is a modification to an existing candidate.

+

The creator of a content type MAY modify an existing, in-use candidate at any time during the session, for example to change the IP address or port. This is done by sending a content-replace action with the changed candidate information, where the value of the 'generation' is incremented to specify that the candidate information is a modification to an existing candidate.

An example follows (change to IP address and port).

@@ -659,14 +665,14 @@ INITIATOR NAT RESPONDER ]]>

The recipient then acknowledges receipt.

- ]]> -

If the modification is acceptable, the recipient then sends a content-accept action.

- If the content-replace is acceptable, the recipient then sends a content-accept action.

+ ]]>

The initiator then acknowledges the responder's acceptance:

- ]]> -

The receiving party SHOULD check the newly-offered candidate for connectivity, as above. If the candidate is acceptable, the receiving party shall send a content-accept action.

- The parties SHOULD check the newly-offered candidate for connectivity, as described previously. If the parties determine that media can flow over the candidate, the initiating party shall send a content-replace action to the responder.

+ + + + + [ ... ] + + + + + + + + ]]> +

The responder then acknowledges the replaced content definition.

+ + ]]> +

The responder then accepts the replaced content definition.

+ ]]> -

The other party then acknowledges the content-accept.

- The initiator then acknowledges content acceptance.

+