From bad26d2a6eec21b75c5722829ac9f5be8515c7df Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Thu, 3 Jan 2008 21:12:30 +0000
Subject: [PATCH] 0.14

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1507 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0167.xml | 173 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 165 insertions(+), 8 deletions(-)

diff --git a/xep-0167.xml b/xep-0167.xml
index 4564d38b..2464ed26 100644
--- a/xep-0167.xml
+++ b/xep-0167.xml
@@ -25,6 +25,12 @@
   &stpeter;
   &seanegan;
   &robmcqueen;
+  <revision>
+    <version>0.14</version>
+    <date>2008-01-03</date>
+    <initials>psa</initials>
+    <remark><p>Modified examples to track changes to XEP-0176.</p></remark>
+  </revision>
   <revision>
     <version>0.13</version>
     <date>2007-12-06</date>
@@ -596,6 +602,12 @@ Romeo                         Juliet
   |   transport-info (X times)  |
   |   (with acks)               |
   |<--------------------------->|
+  |   STUN connectivity checks  |
+  |<--------------------------->|
+  |   content-modify            |
+  |---------------------------->|
+  |   ack                       |
+  |<----------------------------|
   |   session-accept            |
   |<----------------------------|
   |   ack                       |
@@ -656,7 +668,48 @@ Romeo                         Juliet
     to='juliet@capulet.lit/balcony'
     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 one of the candidate transports is found to work, the responder accepts the session.</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[
+<iq from='romeo@montague.lit/orchard'
+    id='mod1'
+    to='juliet@capulet.lit/balcony'
+    type='set'>
+  <jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'
+          action='content-modify'
+          initiator='romeo@montague.lit/orchard'
+          sid='a73sjjvkla37jfea'>
+    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
+      <description xmlns='http://www.xmpp.org/extensions/xep-0167.html#ns'>
+        [ ... ]
+      </description>
+      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns'>
+        <candidate component='1'
+                   foundation='1'
+                   generation='0'
+                   ip='192.0.2.3'
+                   network='1'
+                   port='45664'
+                   priority='1694498815'
+                   protocol='udp'
+                   pwd='asd88fgpdd777uzjYhagZg'
+                   rel-addr='10.0.1.1'
+                   rel-port='8998'
+                   rem-addr='192.0.2.1'
+                   rem-port='3478'
+                   type='srflx'
+                   ufrag='8hhy'/>
+      </transport>
+    </content>
+  </jingle>
+</iq>
+    ]]></example>
+    <p>The responder then acknowledges the content-modify action and sends a session-accept action.</p>
+    <example caption="Responder acknowledges content-modify"><![CDATA[
+<iq from='juliet@capulet.lit/balcony'
+    id='mod1'
+    to='romeo@montague.lit/orchard'
+    type='result'/>
+    ]]></example>
     <example caption="Responder sends session-accept"><![CDATA[
 <iq from='juliet@capulet.lit/balcony'
     id='accept1'
@@ -684,9 +737,13 @@ Romeo                         Juliet
                    ip='192.0.2.3'
                    network='1'
                    port='45664'
-                   priority='1678246398'
+                   priority='1694498815'
                    protocol='udp'
                    pwd='asd88fgpdd777uzjYhagZg'
+                   rel-addr='10.0.1.1'
+                   rel-port='8998'
+                   rem-addr='192.0.2.1'
+                   rem-port='3478'
                    type='srflx'
                    ufrag='8hhy'/>
       </transport>
@@ -750,6 +807,12 @@ Romeo                         Juliet
   |   transport-info (X times)  |
   |   (with acks)               |
   |<--------------------------->|
+  |   STUN connectivity checks  |
+  |<--------------------------->|
+  |   content-modify            |
+  |---------------------------->|
+  |   ack                       |
+  |<----------------------------|
   |   session-accept            |
   |<----------------------------|
   |   ack                       |
@@ -882,8 +945,48 @@ Romeo                         Juliet
     to='romeo@montague.lit/orchard'
     type='result'/>
     ]]></example>
-    <p>As in the previous scenario, the parties exchange ICE candidates (see above for examples).</p>
-    <p>Once the parties find candidate transports that work, the responder accepts the session.</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[
+<iq from='romeo@montague.lit/orchard'
+    id='mod1'
+    to='juliet@capulet.lit/balcony'
+    type='set'>
+  <jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'
+          action='content-modify'
+          initiator='romeo@montague.lit/orchard'
+          sid='a73sjjvkla37jfea'>
+    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
+      <description xmlns='http://www.xmpp.org/extensions/xep-0167.html#ns'>
+        [ ... ]
+      </description>
+      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns'>
+        <candidate component='1'
+                   foundation='1'
+                   generation='0'
+                   ip='192.0.2.3'
+                   network='1'
+                   port='45664'
+                   priority='1694498815'
+                   protocol='udp'
+                   pwd='asd88fgpdd777uzjYhagZg'
+                   rel-addr='10.0.1.1'
+                   rel-port='8998'
+                   rem-addr='192.0.2.1'
+                   rem-port='3478'
+                   type='srflx'
+                   ufrag='8hhy'/>
+      </transport>
+    </content>
+  </jingle>
+</iq>
+    ]]></example>
+    <p>The responder then acknowledges the content-modify action and sends a session-accept action.</p>
+    <example caption="Responder acknowledges content-modify"><![CDATA[
+<iq from='juliet@capulet.lit/balcony'
+    id='mod1'
+    to='romeo@montague.lit/orchard'
+    type='result'/>
+    ]]></example>
     <example caption="Responder sends session-accept"><![CDATA[
 <iq from='juliet@capulet.lit/balcony'
     id='accept1'
@@ -911,9 +1014,13 @@ Romeo                         Juliet
                    ip='192.0.2.3'
                    network='1'
                    port='45664'
-                   priority='1678246398'
+                   priority='1694498815'
                    protocol='udp'
                    pwd='asd88fgpdd777uzjYhagZg'
+                   rel-addr='10.0.1.1'
+                   rel-port='8998'
+                   rem-addr='192.0.2.1'
+                   rem-port='3478'
                    type='srflx'
                    ufrag='8hhy'/>
       </transport>
@@ -1081,6 +1188,12 @@ Romeo                         Juliet
   |   transport-info (X times)  |
   |   (with acks)               |
   |<--------------------------->|
+  |   STUN connectivity checks  |
+  |<--------------------------->|
+  |   content-modify            |
+  |---------------------------->|
+  |   ack                       |
+  |<----------------------------|
   |   session-accept            |
   |<----------------------------|
   |   ack                       |
@@ -1184,8 +1297,48 @@ Romeo                         Juliet
     to='romeo@montague.lit/orchard'
     type='result'/>
     ]]></example>
-    <p>As in the previous scenario, the parties exchange ICE candidates (see above for examples).</p>
-    <p>If one of the candidate transports is found to work, the responder accepts the session.</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[
+<iq from='romeo@montague.lit/orchard'
+    id='mod1'
+    to='juliet@capulet.lit/balcony'
+    type='set'>
+  <jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'
+          action='content-modify'
+          initiator='romeo@montague.lit/orchard'
+          sid='a73sjjvkla37jfea'>
+    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
+      <description xmlns='http://www.xmpp.org/extensions/xep-0167.html#ns'>
+        [ ... ]
+      </description>
+      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns'>
+        <candidate component='1'
+                   foundation='1'
+                   generation='0'
+                   ip='192.0.2.3'
+                   network='1'
+                   port='45664'
+                   priority='1694498815'
+                   protocol='udp'
+                   pwd='asd88fgpdd777uzjYhagZg'
+                   rel-addr='10.0.1.1'
+                   rel-port='8998'
+                   rem-addr='192.0.2.1'
+                   rem-port='3478'
+                   type='srflx'
+                   ufrag='8hhy'/>
+      </transport>
+    </content>
+  </jingle>
+</iq>
+    ]]></example>
+    <p>The responder then acknowledges the content-modify action and sends a session-accept action.</p>
+    <example caption="Responder acknowledges content-modify"><![CDATA[
+<iq from='juliet@capulet.lit/balcony'
+    id='mod1'
+    to='romeo@montague.lit/orchard'
+    type='result'/>
+    ]]></example>
     <example caption="Responder sends session-accept"><![CDATA[
 <iq from='juliet@capulet.lit/balcony'
     id='accept1'
@@ -1213,9 +1366,13 @@ Romeo                         Juliet
                    ip='192.0.2.3'
                    network='1'
                    port='45664'
-                   priority='1678246398'
+                   priority='1694498815'
                    protocol='udp'
                    pwd='asd88fgpdd777uzjYhagZg'
+                   rel-addr='10.0.1.1'
+                   rel-port='8998'
+                   rem-addr='192.0.2.1'
+                   rem-port='3478'
                    type='srflx'
                    ufrag='8hhy'/>
       </transport>