diff --git a/xep-0166.xml b/xep-0166.xml index 0043f162..c9574e35 100644 --- a/xep-0166.xml +++ b/xep-0166.xml @@ -260,19 +260,19 @@ Romeo Juliet id='jingle1' to='juliet@capulet.lit/balcony' type='set'> - - + - + @@ -291,13 +291,13 @@ Romeo Juliet id='accept1' to='romeo@montague.lit/orchard' type='set'> - - + @@ -306,7 +306,7 @@ Romeo Juliet - + @@ -328,7 +328,7 @@ Romeo Juliet id='term1' to='romeo@montague.lit/orchard' type='set'> - In order to initiate a Jingle session, the initiator must determine which of the responder's XMPP resources is best for the desired application format. Methods for doing so are out of scope for this specification. However, see the Determining Support section of this document (and associated specifications) for relevant information.

-

Once the initiator has discovered which of the responder's XMPP resources is ideal for the desired application format, it sends a session initiation request to the responder. This request is an IQ-set containing a &JINGLE; element qualified by the 'http://www.xmpp.org/extensions/xep-0166.html#ns' namespace &NSNOTE;, where the value of the 'action' attribute is "session-initiate" and where the &JINGLE; element contains one or more &CONTENT; elements. Each &CONTENT; element defines a content type to be transferred during the session, and each &CONTENT; element in turn contains one &DESCRIPTION; child element that specifies a desired application format and one &TRANSPORT; child element that specifies a potential transport method. If either party wishes to propose the use of multiple transport methods for the same application format, it must send multiple &CONTENT; elements.

+

Once the initiator has discovered which of the responder's XMPP resources is ideal for the desired application format, it sends a session initiation request to the responder. This request is an IQ-set containing a &JINGLE; element qualified by the 'urn:xmpp:tmp:jingle' namespace &NSNOTE;, where the value of the 'action' attribute is "session-initiate" and where the &JINGLE; element contains one or more &CONTENT; elements. Each &CONTENT; element defines a content type to be transferred during the session, and each &CONTENT; element in turn contains one &DESCRIPTION; child element that specifies a desired application format and one &TRANSPORT; child element that specifies a potential transport method. If either party wishes to propose the use of multiple transport methods for the same application format, it must send multiple &CONTENT; elements.

Note: The syntax and semantics of the &DESCRIPTION; and &TRANSPORT; elements are out of scope for this specification, since they are defined in related specifications. The syntax and semantics of the &JINGLE; and &CONTENT; elements are specified in this document under Formal Definition.

Note: In order to expedite session establishment, the initiator MAY send transport candidates (e.g., for negotiation of the ICE transport) immediately after sending the "session-initiate" message and before receiving acknowledgement from the responder (i.e., the initiator MUST consider the session to be PENDING even before receiving acknowledgement). Given in-order delivery, the responder should receive such "transport-info" messages after receiving the "session-initiate" message (if not, it is appropriate for the responder to return <unknown-session/> errors since according to its state machine the session does not exist).

- + ]]> @@ -632,7 +632,7 @@ PENDING o---------------------+ | id='term1' to='romeo@montague.lit/orchard' type='set'> - - + + ]]> +

Another reason for terminating the session is that the terminating party already has an existing session with the other party and wishes to use that session rather than initiate a new session; in this case, the recommended reasoncode is "alternative-session" and the terminating party should include the session ID of the atlernative session in the 'reasontext' attribute.

+ + + sid='a73sjjvkla37jfea'/> ]]>

Another reason for terminating the session is that the terminating party does not support any of the offered application formats; in this case, the recommended reasoncode is "unsupported-applications".

@@ -658,7 +672,7 @@ PENDING o---------------------+ | id='term1' to='romeo@montague.lit/orchard' type='set'> - - - + ]]> @@ -782,7 +796,7 @@ PENDING o---------------------+ | -

The Jingle-specific error conditions are as follows. These condition elements are qualified by the 'http://www.xmpp.org/extensions/xep-0166.html#ns-errors' namespace &NSNOTE;.

+

The Jingle-specific error conditions are as follows. These condition elements are qualified by the 'urn:xmpp:tmp:jingle-errors' namespace &NSNOTE;.

@@ -808,7 +822,7 @@ PENDING o---------------------+ | -

If an entity supports Jingle, it MUST advertise that fact by returning a feature of "http://www.xmpp.org/extensions/xep-0166.html#ns" &NSNOTE; in response to a &xep0030; information request. The response MUST also include features for the application formats and transport methods supported by the responding entity, as described in the relevant specifications.

+

If an entity supports Jingle, it MUST advertise that fact by returning a feature of "urn:xmpp:tmp:jingle" &NSNOTE; in response to a &xep0030; information request. The response MUST also include features for the application formats and transport methods supported by the responding entity, as described in the relevant specifications.

... - + ... @@ -874,8 +888,8 @@ PENDING o---------------------+ |

Until this specification advances to a status of Draft, its associated namespaces shall be:

    -
  • http://www.xmpp.org/extensions/xep-0166.html#ns
    • -
  • http://www.xmpp.org/extensions/xep-0166.html#ns-errors
    • +
  • urn:xmpp:tmp:jingle
    • +
  • urn:xmpp:tmp:jingle-errors

Upon advancement of this specification, the ®ISTRAR; shall issue permanent namespaces in accordance with the process defined in Section 4 of &xep0053;.

The following namespaces are requested, and are thought to be unique per the XMPP Registrar's requirements:

@@ -925,6 +939,17 @@ PENDING o---------------------+ |

The following submission registers reasoncodes currently in use. Refer to the registry itself for a complete and current list of reasoncodes.

+ alternative-session + + the party prefers to use an existing session with the peer + rather than initiate a new session; the session ID of the + alternative session should be provided in the reasontext + attribute + + XEP-0166 + + busy the party is busy @@ -983,8 +1008,8 @@ PENDING o---------------------+ | @@ -1051,8 +1076,8 @@ PENDING o---------------------+ | diff --git a/xep-0167.xml b/xep-0167.xml index f07def24..7412363d 100644 --- a/xep-0167.xml +++ b/xep-0167.xml @@ -166,9 +166,9 @@ -

A Jingle audio session is described by a content type that contains one application format and one transport method. The application format consists of one or more encodings contained within a wrapper <description/> element qualified by the 'http://www.xmpp.org/extensions/xep-0167.html#ns' namespace &NSNOTE;. In the language of RFC 4566 each encoding is a payload-type; therefore, each <payload-type/> element specifies an encoding that can be used for the audio stream, as illustrated in the following example.

+

A Jingle audio session is described by a content type that contains one application format and one transport method. The application format consists of one or more encodings contained within a wrapper <description/> element qualified by the 'urn:xmpp:tmp:jingle:apps:audio-rtp' namespace &NSNOTE;. In the language of RFC 4566 each encoding is a payload-type; therefore, each <payload-type/> element specifies an encoding that can be used for the audio stream, as illustrated in the following example.

+ @@ -244,19 +244,19 @@ id='jingleaudio1' to='juliet@capulet.com/balcony' type='set'> - + action='session-initiate' initiator='romeo@montague.net/orchard' sid='a73sjjvkla37jfea'> - + - + @@ -275,12 +275,12 @@ id='jingleaudio2' to='romeo@montague.net/orchard' type='set'> - + action='content-accept' initiator='romeo@montague.net/orchard' sid='a73sjjvkla37jfea'> - + @@ -289,7 +289,7 @@ - + @@ -307,13 +307,13 @@ id='accept1' to='romeo@montague.net/orchard' type='set'> - - + @@ -322,7 +322,7 @@ - + -

Informational messages may be sent by either party within the context of Jingle to communicate the status of a Jingle audio session, device, or principal. The informational message MUST be an IQ-set containing a &JINGLE; element of type "session-info", where the informational message is a payload element qualified by the 'http://www.xmpp.org/extensions/xep-0167.html#ns-info' namespace; the following payload elements are defined: A <trying/> element (equivalent to the SIP 100 Trying response code) is not necessary, since each session-level action is acknowledged via XMPP IQ semantics.

+

Informational messages may be sent by either party within the context of Jingle to communicate the status of a Jingle audio session, device, or principal. The informational message MUST be an IQ-set containing a &JINGLE; element of type "session-info", where the informational message is a payload element qualified by the 'urn:xmpp:tmp:jingle:apps:audio-rtp:info' namespace; the following payload elements are defined: A <trying/> element (equivalent to the SIP 100 Trying response code) is not necessary, since each session-level action is acknowledged via XMPP IQ semantics.

Jingle Condition
@@ -423,11 +423,11 @@ a=fmtp:96 vbr=on;cng=on id='active1' to='romeo@montague.net/orchard' type='set'> - + action='session-info' initiator='romeo@montague.net/orchard' sid='a73sjjvkla37jfea'> - + ]]> @@ -436,11 +436,11 @@ a=fmtp:96 vbr=on;cng=on id='hold1' to='romeo@montague.net/orchard' type='set'> - - + ]]> @@ -449,11 +449,11 @@ a=fmtp:96 vbr=on;cng=on id='mute1' to='romeo@montague.net/orchard' type='set'> - - + ]]> @@ -462,11 +462,11 @@ a=fmtp:96 vbr=on;cng=on id='ringing1' to='romeo@montague.net/orchard' type='set'> - - + ]]> @@ -474,7 +474,7 @@ a=fmtp:96 vbr=on;cng=on -

If an entity supports Jingle audio exchanges via RTP, it MUST advertise that fact by returning a feature of "http://www.xmpp.org/extensions/xep-0167.html#ns" &NSNOTE; in response to &xep0030; information requests.

+

If an entity supports Jingle audio exchanges via RTP, it MUST advertise that fact by returning a feature of "urn:xmpp:tmp:jingle:apps:audio-rtp" &NSNOTE; in response to &xep0030; information requests.

... - - + + ... @@ -528,19 +528,19 @@ Romeo Juliet id='jingle1' to='juliet@capulet.lit/balcony' type='set'> - - + - + @@ -556,11 +556,11 @@ Romeo Juliet id='ringing1' to='romeo@montague.net/orchard' type='set'> - - + ]]> @@ -575,7 +575,7 @@ Romeo Juliet id='term1' to='romeo@montague.lit/orchard' type='set'> - - - + - + @@ -660,11 +660,11 @@ Romeo Juliet id='ringing1' to='romeo@montague.net/orchard' type='set'> - - + ]]> @@ -680,15 +680,15 @@ Romeo Juliet id='mod1' to='juliet@capulet.lit/balcony' type='set'> - - + [ ... ] - + - - + @@ -736,7 +736,7 @@ Romeo Juliet - + - - - + - + - + @@ -876,7 +876,7 @@ Romeo Juliet - + @@ -892,11 +892,11 @@ Romeo Juliet id='ringing1' to='romeo@montague.net/orchard' type='set'> - - + ]]> @@ -912,7 +912,7 @@ Romeo Juliet id='remove1' to='romeo@montague.lit/orchard' type='set'> - @@ -933,15 +933,15 @@ Romeo Juliet id='mod1' to='juliet@capulet.lit/balcony' type='set'> - - + [ ... ] - + - - + @@ -989,7 +989,7 @@ Romeo Juliet - + - - + ]]> @@ -1044,11 +1044,11 @@ Romeo Juliet id='active1' to='romeo@montague.net/orchard' type='set'> - - + ]]> @@ -1065,12 +1065,12 @@ Romeo Juliet id='add1' to='romeo@montague.lit/orchard' type='set'> - - + @@ -1079,7 +1079,7 @@ Romeo Juliet - + @@ -1096,12 +1096,12 @@ Romeo Juliet id='add2' to='juliet@capulet.lit/balcony' type='set'> - - + @@ -1110,7 +1110,7 @@ Romeo Juliet - + @@ -1130,7 +1130,7 @@ Romeo Juliet id='term1' to='juliet@capulet.lit/balcony' type='set'> - - - + - + @@ -1222,11 +1222,11 @@ Romeo Juliet id='ringing1' to='romeo@montague.net/orchard' type='set'> - - + ]]> @@ -1242,7 +1242,7 @@ Romeo Juliet id='mod1' to='romeo@montague.lit/orchard' type='set'> - @@ -1264,7 +1264,7 @@ Romeo Juliet id='mod2' to='juliet@capulet.lit/balcony' type='set'> - @@ -1285,15 +1285,15 @@ Romeo Juliet id='mod1' to='juliet@capulet.lit/balcony' type='set'> - - + [ ... ] - + - - + @@ -1341,7 +1341,7 @@ Romeo Juliet - + -

Until this specification advances to a status of Draft, its associated namespaces shall be:

    -
  • http://www.xmpp.org/extensions/xep-0167.html#ns
    • -
  • http://www.xmpp.org/extensions/xep-0167.html#ns-errors
    • -
  • http://www.xmpp.org/extensions/xep-0167.html#ns-info
    • +
  • urn:xmpp:tmp:jingle:apps:audio-rtp
    • +
  • urn:xmpp:tmp:jingle:apps:audio-rtp:errors
    • +
  • urn:xmpp:tmp:jingle:apps:audio-rtp-info

Upon advancement of this specification, the ®ISTRAR; shall issue permanent namespaces in accordance with the process defined in Section 4 of &xep0053;.

The following namespaces are requested, and are thought to be unique per the XMPP Registrar's requirements:

@@ -1451,8 +1451,8 @@ Romeo Juliet @@ -1503,8 +1503,8 @@ Romeo Juliet diff --git a/xep-0176.xml b/xep-0176.xml index 1dfc4552..297c70af 100644 --- a/xep-0176.xml +++ b/xep-0176.xml @@ -197,21 +197,21 @@ INITIATOR RESPONDER ]]> -

In order for the initiator in a Jingle exchange to start the negotiation, it MUST send a Jingle "session-initiate" stanza as described in XEP-0166. A content type MUST include one transport method. If the initiator wishes to negotiate the ice-udp transport method for an application format, it MUST include an empty &TRANSPORT; child element qualified by the 'http://www.xmpp.org/extensions/xep-0176.html#ns' namespace &NSNOTE;.

+

In order for the initiator in a Jingle exchange to start the negotiation, it MUST send a Jingle "session-initiate" stanza as described in XEP-0166. A content type MUST include one transport method. If the initiator wishes to negotiate the ice-udp transport method for an application format, it MUST include an empty &TRANSPORT; child element qualified by the 'urn:xmpp:tmp:jingle:transports:ice-tcp' namespace &NSNOTE;.

- - + [ ... ] - + @@ -357,12 +357,12 @@ INITIATOR RESPONDER id='info1' to='juliet@capulet.com/balcony' type='set'> - - + - - + - - + - - + [ ... ] - + - - + [ ... ] - + - - + - - + [ ... ] - + - - + - - + [ ... ] - + -

If an entity supports the Jingle ice-udp transport, it MUST return a feature of "http://www.xmpp.org/extensions/xep-0176.html#ns" &NSNOTE; in response to &xep0030; information requests.

+

If an entity supports the Jingle ice-udp transport, it MUST return a feature of "urn:xmpp:tmp:jingle:transports:ice-tcp" &NSNOTE; in response to &xep0030; information requests.

... - + ... @@ -830,7 +830,7 @@ INITIATOR NAT RESPONDER

Until this specification advances to a status of Draft, its associated namespaces shall be:

    -
  • http://www.xmpp.org/extensions/xep-0176.html#ns
    • +
  • urn:xmpp:tmp:jingle:transports:ice-tcp

Upon advancement of this specification, the ®ISTRAR; shall issue permanent namespaces in accordance with the process defined in Section 4 of &xep0053;.

The following namespaces are requested, and are thought to be unique per the XMPP Registrar's requirements:

@@ -862,8 +862,8 @@ INITIATOR NAT RESPONDER diff --git a/xep-0177.xml b/xep-0177.xml index c71239fc..22aeb7b2 100644 --- a/xep-0177.xml +++ b/xep-0177.xml @@ -104,19 +104,19 @@ -

In order for the initiator in a Jingle exchange to start the negotiation, it MUST send a Jingle "session-initiate" stanza as described in XEP-0166. This stanza MUST include at least one content type. If the initiator wishes to negotiate the Raw UDP transport for a given content type, it MUST include a &TRANSPORT; child element qualified by the 'http://www.xmpp.org/extensions/xep-0177.html#ns' namespace &NSNOTE;, which MUST This is required to avoid a round trip and help expedite the negotiation. include the initiator's Raw UDP candidate via the 'ip', 'port', 'generation', and 'name' attributes of the &CANDIDATE; element.

+

In order for the initiator in a Jingle exchange to start the negotiation, it MUST send a Jingle "session-initiate" stanza as described in XEP-0166. This stanza MUST include at least one content type. If the initiator wishes to negotiate the Raw UDP transport for a given content type, it MUST include a &TRANSPORT; child element qualified by the 'urn:xmpp:tmp:jingle:transports:raw-udp' namespace &NSNOTE;, which MUST This is required to avoid a round trip and help expedite the negotiation. include the initiator's Raw UDP candidate via the 'ip', 'port', 'generation', and 'name' attributes of the &CANDIDATE; element.

- - + @@ -169,12 +169,12 @@ id='jingle2' to='romeo@montague.net/orchard' type='set'> - - + @@ -197,11 +197,11 @@ id='trying1' to='romeo@montague.net/orchard' type='set'> - - + ]]> @@ -217,11 +217,11 @@ id='received1' to='juliet@capulet.com/balcony' type='set'> - - + ]]> @@ -235,7 +235,7 @@ -

Informational messages MAY be sent by either party within the context of the Raw UDP transport to communicate whether the party has attempted to send media or has received media. The informational message MUST be an IQ-set containing a &JINGLE; element of type "session-info", where the informational message is a payload element qualified by the 'http://www.xmpp.org/extensions/xep-0177.html#ns-info' namespace &NSNOTE;. The following payload elements are defined:

+

Informational messages MAY be sent by either party within the context of the Raw UDP transport to communicate whether the party has attempted to send media or has received media. The informational message MUST be an IQ-set containing a &JINGLE; element of type "session-info", where the informational message is a payload element qualified by the 'urn:xmpp:tmp:jingle:transports:raw-udp:info' namespace &NSNOTE;. The following payload elements are defined:

Element
@@ -255,7 +255,7 @@ -

If an entity supports the Jingle Raw UDP transport, it MUST return a feature of "http://www.xmpp.org/extensions/xep-0177.html#ns" &NSNOTE; in response to &xep0030; information requests.

+

If an entity supports the Jingle Raw UDP transport, it MUST return a feature of "urn:xmpp:tmp:jingle:transports:raw-udp" &NSNOTE; in response to &xep0030; information requests.

... - + ... @@ -291,8 +291,8 @@

Until this specification advances to a status of Draft, its associated namespaces shall be:

    -
  • http://www.xmpp.org/extensions/xep-0177.html#ns
    • -
  • http://www.xmpp.org/extensions/xep-0177.html#ns-info
    • +
  • urn:xmpp:tmp:jingle:transports:raw-udp
    • +
  • urn:xmpp:tmp:jingle:transports:raw-udp:info

Upon advancement of this specification, the ®ISTRAR; shall issue permanent namespaces in accordance with the process defined in Section 4 of &xep0053;.

The following namespaces are requested, and are thought to be unique per the XMPP Registrar's requirements:

@@ -313,6 +313,7 @@ ]]> + @@ -359,8 +360,8 @@ diff --git a/xep-0180.xml b/xep-0180.xml index ff9e97b7..377277cf 100644 --- a/xep-0180.xml +++ b/xep-0180.xml @@ -124,9 +124,9 @@ -

A Jingle video session is described by a content type that contains one application format and one transport method. The application format consists of one or more encodings contained within a wrapper <description/> element qualified by the 'http://www.xmpp.org/extensions/xep-0180.html#ns' namespace &NSNOTE;. In the language of RFC 4566 each encoding is a payload-type; therefore, each <payload-type/> element specifies an encoding that can be used for the audio stream, as illustrated in the following example.

+

A Jingle video session is described by a content type that contains one application format and one transport method. The application format consists of one or more encodings contained within a wrapper <description/> element qualified by the 'urn:xmpp:tmp:jingle:apps:video-rtp' namespace &NSNOTE;. In the language of RFC 4566 each encoding is a payload-type; therefore, each <payload-type/> element specifies an encoding that can be used for the audio stream, as illustrated in the following example.

+ @@ -224,12 +224,12 @@ to='juliet@capulet.com/balcony' id='jinglevideo1' type='set'> - + action='session-initiate' initiator='romeo@montague.net/orchard' sid='v1d30k1ll3dth3r4d10st4r'> - + @@ -239,7 +239,7 @@ - + @@ -252,7 +252,7 @@ type='error'> - + ]]> @@ -269,12 +269,12 @@ to='romeo@montague.net/orchard' id='jinglevideo2' type='set'> - + action='content-accept' initiator='romeo@montague.net/orchard' sid='v1d30k1ll3dth3r4d10st4r'> - + @@ -283,7 +283,7 @@ - + @@ -301,13 +301,13 @@ id='accept1' to='romeo@montague.net/orchard' type='set'> - - + @@ -316,7 +316,7 @@ - + -

If an entity supports Jingle video exchanges via RTP, it MUST advertise that fact by returning a feature of "http://www.xmpp.org/extensions/xep-0180.html#ns" in response to &xep0030; information requests &NSNOTE;.

+

If an entity supports Jingle video exchanges via RTP, it MUST advertise that fact by returning a feature of "urn:xmpp:tmp:jingle:apps:video" in response to &xep0030; information requests &NSNOTE;.

... - - + + ... @@ -454,8 +454,8 @@ delivery-method=inline; configuration=somebase16string;

Until this specification advances to a status of Draft, its associated namespaces shall be:

    -
  • http://www.xmpp.org/extensions/xep-0180.html#ns
    • -
  • http://www.xmpp.org/extensions/xep-0180.html#ns-errors
    • +
  • urn:xmpp:tmp:jingle:apps:video
    • +
  • urn:xmpp:tmp:jingle:apps:video:errors

Upon advancement of this specification, the ®ISTRAR; shall issue permanent namespaces in accordance with the process defined in Section 4 of &xep0053;.

The following namespaces are requested, and are thought to be unique per the XMPP Registrar's requirements:

@@ -484,8 +484,8 @@ delivery-method=inline; configuration=somebase16string; @@ -540,8 +540,8 @@ delivery-method=inline; configuration=somebase16string;
Element