plugin XEP-0167, XEP-0176: transport-info and ICE candidate sending are delayed if session is not active yet

This commit is contained in:
Goffi 2023-08-21 15:19:45 +02:00
commit d60b79b18f

View file

@ -55,9 +55,6 @@ IQ_SET : Final = '/iq[@type="set"]'
NS_JINGLE : Final = "urn:xmpp:jingle:1"
NS_JINGLE_ERROR : Final = "urn:xmpp:jingle:errors:1"
JINGLE_REQUEST : Final = f'{IQ_SET}/jingle[@xmlns="{NS_JINGLE}"]'
STATE_PENDING : Final = "PENDING"
STATE_ACTIVE : Final = "ACTIVE"
STATE_ENDED : Final = "ENDED"
CONFIRM_TXT : Final = D_(
"{entity} want to start a jingle session with you, do you accept ?"
)
@ -89,6 +86,10 @@ class XEP_0166:
REASON_FAILED_TRANSPORT : Final = "failed-transport"
REASON_CONNECTIVITY_ERROR : Final = "connectivity-error"
STATE_PENDING : Final = "PENDING"
STATE_ACTIVE : Final = "ACTIVE"
STATE_ENDED : Final = "ENDED"
# standard actions
A_SESSION_INITIATE : Final = "session-initiate"
@ -194,7 +195,7 @@ class XEP_0166:
session_data = {
"id": sid,
"state": STATE_PENDING,
"state": XEP_0166.STATE_PENDING,
"initiator": client.jid if role == XEP_0166.ROLE_INITIATOR else peer_jid,
"role": role,
"local_jid": local_jid or client.jid,
@ -502,7 +503,8 @@ class XEP_0166:
content_elt["creator"] = content_data["creator"]
if context_elt is not None:
pass
if context_elt.parent is None:
content_elt.addChild(context_elt)
elif action == XEP_0166.A_TRANSPORT_INFO:
context_elt = transport_elt = content_elt.addElement(
"transport", content_data["transport"].namespace
@ -1191,7 +1193,7 @@ class XEP_0166:
d_list.addCallback(lambda __: iq_elt.send())
def change_state(__, session):
session["state"] = STATE_ACTIVE
session["state"] = XEP_0166.STATE_ACTIVE
d_list.addCallback(change_state, session)
d_list.addCallback(
@ -1279,7 +1281,7 @@ class XEP_0166:
# at this point we can send the <iq/> result to confirm reception of the request
client.send(xmlstream.toResponse(request, "result"))
# and change the state
session["state"] = STATE_ACTIVE
session["state"] = XEP_0166.STATE_ACTIVE
session["jingle_elt"] = jingle_elt
await defer.DeferredList(self._call_plugins(