From 1c8f68829dc6a79b2c2be808eb5a4538ab5aa759 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Fri, 28 Dec 2007 20:33:25 +0000
Subject: [PATCH] adjustments per XEP-0176 version 0.13

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

diff --git a/xep-0167.xml b/xep-0167.xml
index 4380f2b5..4564d38b 100644
--- a/xep-0167.xml
+++ b/xep-0167.xml
@@ -244,7 +244,7 @@
         <payload-type id='103' name='L16' clockrate='16000' channels='2'/>
         <payload-type id='98' name='x-ISAC' clockrate='8000'/>
       </description>
-      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns-udp'/>
+      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns'/>
     </content>
   </jingle>
 </iq>
@@ -277,7 +277,7 @@
         <payload-type id='8' name='PCMA'/>
         <payload-type id='13' name='CN'/>
       </description>
-      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns-udp'/>
+      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns'/>
     </content>
   </jingle>
 </iq>
@@ -310,14 +310,14 @@
         <payload-type id='8' name='PCMA'/>
         <payload-type id='13' name='CN'/>
       </description>
-      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns-udp'>
-        <candidate component='2'
+      <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='1107821052'
+                   priority='1678246398'
                    protocol='udp'
                    pwd='asd88fgpdd777uzjYhagZg'
                    type='srflx'
@@ -528,7 +528,7 @@ Romeo                         Juliet
         <payload-type id='103' name='L16' clockrate='16000' channels='2'/>
         <payload-type id='98' name='x-ISAC' clockrate='8000'/>
       </description>
-      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns-udp'/>
+      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns'/>
     </content>
   </jingle>
 </iq>
@@ -626,7 +626,7 @@ Romeo                         Juliet
         <payload-type id='103' name='L16' clockrate='16000' channels='2'/>
         <payload-type id='98' name='x-ISAC' clockrate='8000'/>
       </description>
-      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns-udp'/>
+      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns'/>
     </content>
   </jingle>
 </iq>
@@ -656,107 +656,7 @@ Romeo                         Juliet
     to='juliet@capulet.lit/balcony'
     type='result'/>
     ]]></example>
-    <example caption="Initiator sends a candidate"><![CDATA[
-<iq from='romeo@montague.lit/orchard'
-    id='info1'
-    to='juliet@capulet.lit/balcony'
-    type='set'>
-  <jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'
-          action='transport-info'
-          initiator='romeo@montague.lit/orchard'
-          sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns-udp'>
-        <candidate component='1'
-                   foundation='1'
-                   generation='0'
-                   ip='10.0.1.1'
-                   network='0'
-                   port='8998'
-                   priority='2114978302'
-                   protocol='udp'
-                   pwd='asd88fgpdd777uzjYhagZg'
-                   type='host'
-                   ufrag='8hhy'/>
-      </transport>
-    </content>
-  </jingle>
-</iq>
-    ]]></example>
-    <example caption="Initiator sends a second candidate"><![CDATA[
-<iq from='romeo@montague.lit/orchard'
-    id='info2'
-    to='juliet@capulet.lit/balcony'
-    type='set'>
-  <jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'
-          action='transport-info'
-          initiator='romeo@montague.lit/orchard'
-          sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns-udp'>
-        <candidate component='1'
-                   foundation='1'
-                   generation='0'
-                   ip='192.0.2.3'
-                   network='1'
-                   port='45664'
-                   priority='1678246398'
-                   protocol='udp'
-                   pwd='asd88fgpdd777uzjYhagZg'
-                   type='srflx'
-                   ufrag='8hhy'/>
-      </transport>
-    </content>
-  </jingle>
-</iq>
-    ]]></example>
-    <example caption="Initiator sends a third candidate"><![CDATA[
-<iq from='romeo@montague.lit/orchard'
-    id='info3'
-    to='juliet@capulet.lit/balcony'
-    type='set'>
-  <jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'
-          action='transport-info'
-          initiator='romeo@montague.lit/orchard'
-          sid='a73sjjvkla37jfea'>
-    <content creator='initiator' name='this-is-the-audio-content' profile='RTP/AVP'>
-      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns-udp'>
-        <candidate component='1'
-                   foundation='1'
-                   generation='0'
-                   ip='208.245.212.67'
-                   network='2'
-                   port='53267'
-                   priority='1677984254'
-                   protocol='udp'
-                   pwd='asd88fgpdd777uzjYhagZg'
-                   type='srflx'
-                   ufrag='8hhy'/>
-      </transport>
-    </content>
-  </jingle>
-</iq>
-    ]]></example>
-    <p>For each candidate received, the other party acknowledges receipt or returns an error:</p>
-    <example caption="Responder acknowledges receipt"><![CDATA[
-<iq from='juliet@capulet.lit/balcony'
-    id='info1'
-    to='romeo@montague.lit/orchard'
-    type='result'/>
-
-<iq from='juliet@capulet.lit/balcony'
-    id='info2'
-    to='romeo@montague.lit/orchard'
-    type='result'/>
-
-<iq from='juliet@capulet.lit/balcony'
-    id='info3'
-    to='romeo@montague.lit/orchard'
-    type='result'/>
-    ]]></example>
-    <p>At the same time (i.e., immediately after acknowledging the session-initation request, not waiting for the initiator to begin or finish sending candidates), the responder also begins sending candidates that may work for it. As above, the initiator acknowledges receipt of the candidates.</p>
-    <p>As the initiator and responder receive candidates, they probe the various candidate transports for connectivity. In performing these connectivity checks, the parties follow the procedure specified in Section 7 of <cite>draft-ietf-mmusic-ice</cite>.</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 one of the candidate transports is found to work, the responder accepts the session.</p>
     <example caption="Responder sends session-accept"><![CDATA[
 <iq from='juliet@capulet.lit/balcony'
     id='accept1'
@@ -778,7 +678,17 @@ Romeo                         Juliet
         <payload-type id='13' name='CN'/>
       </description>
       <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns'>
-        <candidate ip='208.245.212.67' port='9876' generation='0'/>
+        <candidate component='1'
+                   foundation='1'
+                   generation='0'
+                   ip='192.0.2.3'
+                   network='1'
+                   port='45664'
+                   priority='1678246398'
+                   protocol='udp'
+                   pwd='asd88fgpdd777uzjYhagZg'
+                   type='srflx'
+                   ufrag='8hhy'/>
       </transport>
     </content>
   </jingle>
@@ -995,7 +905,17 @@ Romeo                         Juliet
         <payload-type id='13' name='CN'/>
       </description>
       <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns'>
-        <candidate ip='208.245.212.67' port='9876' generation='0'/>
+        <candidate component='1'
+                   foundation='1'
+                   generation='0'
+                   ip='192.0.2.3'
+                   network='1'
+                   port='45664'
+                   priority='1678246398'
+                   protocol='udp'
+                   pwd='asd88fgpdd777uzjYhagZg'
+                   type='srflx'
+                   ufrag='8hhy'/>
       </transport>
     </content>
   </jingle>
@@ -1191,7 +1111,7 @@ Romeo                         Juliet
         <payload-type id='103' name='L16' clockrate='16000' channels='2'/>
         <payload-type id='98' name='x-ISAC' clockrate='8000'/>
       </description>
-      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns-udp'/>
+      <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns'/>
     </content>
   </jingle>
 </iq>
@@ -1287,7 +1207,17 @@ Romeo                         Juliet
         <payload-type id='13' name='CN'/>
       </description>
       <transport xmlns='http://www.xmpp.org/extensions/xep-0176.html#ns'>
-        <candidate ip='208.245.212.67' port='9876' generation='0'/>
+        <candidate component='1'
+                   foundation='1'
+                   generation='0'
+                   ip='192.0.2.3'
+                   network='1'
+                   port='45664'
+                   priority='1678246398'
+                   protocol='udp'
+                   pwd='asd88fgpdd777uzjYhagZg'
+                   type='srflx'
+                   ufrag='8hhy'/>
       </transport>
     </content>
   </jingle>