From a2605dae080955de8cc3d5d09108c8be648e1802 Mon Sep 17 00:00:00 2001 From: Peter Saint-Andre Date: Wed, 8 Oct 2008 02:41:43 +0000 Subject: [PATCH] schema/text tweaks git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@2343 4b5297f7-1745-476d-ba37-a9c6900126ab --- xep-0167.xml | 13 ++++++++++++- xep-0176.xml | 2 +- xep-0181.xml | 2 +- xep-0234.xml | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xep-0167.xml b/xep-0167.xml index 920e8536..0c0d703a 100644 --- a/xep-0167.xml +++ b/xep-0167.xml @@ -473,7 +473,7 @@ delivery-method=inline; configuration=somebase16string;

The term "early media" refers to media that is exchanged before a responder has definitively accepted a session request generated by an initiator. Early media is typically used to send ringing tones and announcements, using either audio streams or Dual Tone Multi-Frequency (DTMF) events.

In Jingle, the exchange of early media is established through use of the "content-add" action. In order to match the usage specified in &rfc3959; and &rfc3960;, when adding a content definition for early media the value of the &CONTENT; element's 'disposition' attribute MUST be "early-session" for mapping to a SIP Content-Disposition header value of "early-session" (if necessary). This enables endpoints or intermediate gateways to apply the application server model described in RFC3960.

An entity that generates a content-add for early media SHOULD specify the same codecs for both session media and early media (however, it is possible that the entity generating early media does not generate session media, for example in the case of an intermediate gateway or application server; in this case the entity MUST use one of the codecs advertised by the initiator).

-

Upon receiving a content-add action specifying the use of early media, the initiator's client SHOULD acknowledge the content-add and then send a content-accept to the sender. When the responder subsequently sends a session-accept action, the acceptance MUST NOT be construued to include the content definition whose disposition is "early-session".

+

Upon receiving a content-add action specifying the use of early media, the initiator's client SHOULD acknowledge the content-add and then send a content-accept (or content-reject) to the sender. When the responder subsequently sends a session-accept action, the acceptance MUST NOT be construued to include the content definition whose disposition is "early-session".

In handling early media and deciding whether to generate local ringing or play early media received from the responder or an intermediate gateway, the initiator's client SHOULD proceed as follows:

  1. If no ringing notification is received via a session-info event containing a <ringing/> condition, do not generate local ringing.
    2. @@ -1677,6 +1677,17 @@ Romeo Juliet + + + + + + + + + + + ]]> -

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

    +

    If the transport-replace is acceptable, the recipient then sends a transport-accept action (if not, the recipient sends a transport-reject action).

    - +

    If an entity supports Jingle DTMF (i.e., sending of DTMF in the XMPP signalling channel as specified herein), it MUST return a &xep0030; feature of "urn:xmpp:jingle:dtmf:0" in response to service discovery information requests.

    In order for an application to determine whether an entity supports this protocol, where possible it SHOULD use the dynamic, presence-based profile of service discovery defined in &xep0115;. However, if an application has not received entity capabilities information from an entity, it SHOULD use explicit service discovery instead.

     diff --git a/xep-0234.xml b/xep-0234.xml index 9150fbfd..c5653d3c 100644 --- a/xep-0234.xml +++ b/xep-0234.xml @@ -555,7 +555,7 @@ Claudius Laertes to='kingclaudius@shakespeare.lit/castle' type='result'/> ]]> -

    If the transport replacement is acceptable, the responder then sends a transport-accept action to the initiator.

    +

    If the transport replacement is acceptable, the responder then sends a transport-accept action to the initiator (if not, the responder sends a transport-reject action).