git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1378 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2007-11-14 01:52:36 +00:00
parent b15e799d97
commit 1883892056
1 changed files with 13 additions and 7 deletions

View File

@ -25,6 +25,12 @@
&stpeter; &stpeter;
&seanegan; &seanegan;
&robmcqueen; &robmcqueen;
<revision>
<version>0.10</version>
<date>2007-11-13</date>
<initials>psa</initials>
<remark><p>Removed info message for busy since it is now a Jingle-specific error condition defined in XEP-0166; defined info message for active.</p></remark>
</revision>
<revision> <revision>
<version>0.9</version> <version>0.9</version>
<date>2007-04-17</date> <date>2007-04-17</date>
@ -349,8 +355,8 @@ a=fmtp:96 vbr=on;cng=on
<th>Meaning</th> <th>Meaning</th>
</tr> </tr>
<tr> <tr>
<td>&lt;busy/&gt;</td> <td>&lt;active/&gt;</td>
<td>The principal or device is currently unavailable for a session because busy with another (audio or other) session.</td> <td>The principal or device is again actively participating in the session after having been on hold or on mute.</td>
</tr> </tr>
<tr> <tr>
<td>&lt;hold/&gt;</td> <td>&lt;hold/&gt;</td>
@ -362,22 +368,22 @@ a=fmtp:96 vbr=on;cng=on
</tr> </tr>
<tr> <tr>
<td>&lt;ringing/&gt;</td> <td>&lt;ringing/&gt;</td>
<td>The device is ringing but the principal has not yet interacted with it to answer (maps to the SIP 180 response code).</td> <td>The device is ringing but the principal has not yet interacted with it to answer (this maps to the SIP 180 response code).</td>
</tr> </tr>
</table> </table>
<p>Note: Because the informational message is sent in an IQ-set, the receiving party MUST return either an IQ-result or an IQ-error (normally only an IQ-result to acknowledge receipt; no error flows are defined or envisioned at this time).</p> <p>Note: Because the informational message is sent in an IQ-set, the receiving party MUST return either an IQ-result or an IQ-error (normally only an IQ-result to acknowledge receipt; no error flows are defined or envisioned at this time).</p>
</section2> </section2>
<section2 topic='Examples' anchor='info-examples'> <section2 topic='Examples' anchor='info-examples'>
<example caption="Receiver Sends Busy Message"><![CDATA[ <example caption="Receiver Sends Active Message"><![CDATA[
<iq from='juliet@capulet.com/balcony' <iq from='juliet@capulet.com/balcony'
to='romeo@montague.net/orchard' to='romeo@montague.net/orchard'
id='busy1' id='active1'
type='set'> type='set'>
<jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'> <jingle xmlns='http://www.xmpp.org/extensions/xep-0166.html#ns'>
action='session-info' action='session-info'
initiator='romeo@montague.net/orchard' initiator='romeo@montague.net/orchard'
sid='a73sjjvkla37jfea'> sid='a73sjjvkla37jfea'>
<busy xmlns='http://www.xmpp.org/extensions/xep-0167.html#ns-info'/> <active xmlns='http://www.xmpp.org/extensions/xep-0167.html#ns-info'/>
</jingle> </jingle>
</iq> </iq>
]]></example> ]]></example>
@ -584,7 +590,7 @@ a=fmtp:96 vbr=on;cng=on
xmlns='http://www.xmpp.org/extensions/xep-0167.html#ns-info' xmlns='http://www.xmpp.org/extensions/xep-0167.html#ns-info'
elementFormDefault='qualified'> elementFormDefault='qualified'>
<xs:element name='busy' type='empty'/> <xs:element name='active' type='empty'/>
<xs:element name='hold' type='empty'/> <xs:element name='hold' type='empty'/>
<xs:element name='mute' type='empty'/> <xs:element name='mute' type='empty'/>
<xs:element name='ringing' type='empty'/> <xs:element name='ringing' type='empty'/>