diff --git a/xep-0155.xml b/xep-0155.xml index 052bbc45..f404abd1 100644 --- a/xep-0155.xml +++ b/xep-0155.xml @@ -25,6 +25,12 @@ ssn &ianpaterson; &stpeter; + + 1.2 + 2016-01-20 + XEP Editor (mam) +

Update missing 'xmppsipim' reference to RFC 7572.

+
1.2 2008-01-14 @@ -666,7 +672,7 @@ PENDING o---------------+

However, the receiving party MAY assume that the other client will not be able to continue the session. In general, if a party is not subscribing to the other party's presence then it will never assume the other party is is unable to continue a session. In that case it MUST explicitly terminate the session (see Terminating a Session) -- since its assumption could be incorrect. If after terminating the session the receiving party later receives available presence (i.e., a &PRESENCE; stanza with no 'type' attribute) from that same resource or another resource associated with the other party and the receiving party desires to restart the session, then it MUST initiate a new session (including a newly-generated ThreadID) with the other party. It MUST NOT renegotiate parameters for the terminated session. (Note: This is consistent with the handling of chat states as specified in XEP-0085.)

-

When mapping instant messaging flows to SIP, implementations SHOULD adhere to &xmppsipim;.

+

When mapping instant messaging flows to SIP, implementations SHOULD adhere to &rfc7572;.

In addition, the following mappings apply to chat session negotiation:

-

The first scenario is addressed by &xep0174;. The second and third scenarios are addressed by &xep0247;. Both of those technologies result in the establishment of a direct or mediated connection between two endpoints, such as a direct TCP connection, a bytestream through SOCKS5 (&xep0065;) or XMPP itself (&xep0047;), or other future transport methods such as &ice-tcp;.

+

The first scenario is addressed by &xep0174;. The second and third scenarios are addressed by &xep0247;. Both of those technologies result in the establishment of a direct or mediated connection between two endpoints, such as a direct TCP connection, a bytestream through SOCKS5 (&xep0065;) or XMPP itself (&xep0047;), or other future transport methods such as &rfc6544;.

Once two endpoints have opened a direct or mediated connection, they can establish an XML stream over that connection for end-to-end "("e2e") communication. We call this an "e2e stream".

diff --git a/xep.ent b/xep.ent index 5c2b364b..26ffce20 100644 --- a/xep.ent +++ b/xep.ent @@ -566,6 +566,7 @@ THE SOFTWARE. RFC 4571 RFC 4571: Framing Real-time Transport Protocol (RTP) and RTP Control Protocol (RTCP) Packets over Connection-Oriented Transport <http://tools.ietf.org/html/rfc4571>." > RFC 4572 RFC 4572: Connection-Oriented Media Transport over the Transport Layer Security (TLS) Protocol in the Session Description Protocol (SDP) <http://tools.ietf.org/html/rfc4572>." > RFC 4575 RFC 4575: A Session Initiation Protocol (SIP) Event Package for Conference State <http://tools.ietf.org/html/rfc4575>." > +RFC 4579 RFC 4579: Session Initiation Protocol (SIP) Call Control - Conferencing for User Agents <http://tools.ietf.org/html/rfc4579>." > RFC 4585 RFC 4585: Extended RTP Profile for Real-time Transport Control Protocol (RTCP)-Based Feedback (RTP/AVPF) <http://tools.ietf.org/html/rfc4585>." > RFC 4616 RFC 4616: The PLAIN Simple Authentication and Security Layer (SASL) Mechanism <http://tools.ietf.org/html/rfc4616>." > RFC 4622 RFC 4622: Internationalized Resource Identifiers (IRIs) and Uniform Resource Identifiers (URIs) for the Extensible Messaging and Presence Protocol (XMPP) <http://tools.ietf.org/html/rfc4622>." > @@ -640,6 +641,7 @@ THE SOFTWARE. RFC 6763 RFC 6763: DNS-Based Service Discovery <http://tools.ietf.org/html/rfc6763>." > RFC 6920 RFC 6920: Naming Things with Hashes <http://tools.ietf.org/html/rfc6920>." > RFC 7081 RFC 7081: CUSAX: Combined Use of the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP) <http://tools.ietf.org/html/rfc7081>." > +RFC 7572 RFC 7572: Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): Instant Messaging <http://tools.ietf.org/html/rfc7572>." > RFC 7622 RFC 7622: Extensible Messaging and Presence Protocol (XMPP): Address Format <http://tools.ietf.org/html/rfc7622>." > @@ -697,6 +699,7 @@ THE SOFTWARE. IANA Service Location Protocol, Version 2 (SLPv2) Templates IANA registry of parameters related to the Service Location Protocol templates <http://www.iana.org/assignments/svrloc-templates.htm>." > IANA Secure Shell Protocol Parameters Registry IANA registry of parameters related to secure shell <http://www.iana.org/assignments/ssh-parameters>." > +Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): Media Sessions Interworking between the Session Initiation Protocol (SIP) and the Extensible Messaging and Presence Protocol (XMPP): Media Sessions <https://tools.ietf.org/html/draft-ietf-stox-media>." >