plugins XEP-0045, XEP-0198: rejoin MUC rooms while a hot reconnection is done:
when resuming is not possible with stream management, a hot reconnection is done (reconnecting without restarting every plugin). This was causing trouble for joined MUC rooms, which were not accessible anymore (because they were not re-joined). This patch fixes it by clearing rooms first (to avoid considering the room joined and broadcasting the initial presence to them), then re-joining them. fix 322
This commit is contained in:
parent
cb85f61fe4
commit
9e2a35f6e5
1 changed files with 31 additions and 8 deletions
|
|
@ -35,14 +35,15 @@ import time
|
|||
log = getLogger(__name__)
|
||||
|
||||
PLUGIN_INFO = {
|
||||
C.PI_NAME: "Stream Management",
|
||||
C.PI_IMPORT_NAME: "XEP-0198",
|
||||
C.PI_TYPE: "XEP",
|
||||
C.PI_NAME: u"Stream Management",
|
||||
C.PI_IMPORT_NAME: u"XEP-0198",
|
||||
C.PI_TYPE: u"XEP",
|
||||
C.PI_MODES: C.PLUG_MODE_BOTH,
|
||||
C.PI_PROTOCOLS: ["XEP-0198"],
|
||||
C.PI_PROTOCOLS: [u"XEP-0198"],
|
||||
C.PI_DEPENDENCIES: [],
|
||||
C.PI_MAIN: "XEP_0198",
|
||||
C.PI_HANDLER: "yes",
|
||||
C.PI_RECOMMENDATIONS: [u"XEP-0045"],
|
||||
C.PI_MAIN: u"XEP_0198",
|
||||
C.PI_HANDLER: u"yes",
|
||||
C.PI_DESCRIPTION: _(u"""Implementation of Stream Management"""),
|
||||
}
|
||||
|
||||
|
|
@ -394,6 +395,10 @@ class XEP_0198(object):
|
|||
client.conn_deferred = defer.Deferred()
|
||||
else:
|
||||
log.error(u"conn_deferred should be called at this point")
|
||||
plg_0045 = self.host.plugins.get(u'XEP-0045')
|
||||
if plg_0045 is not None:
|
||||
# we have to remove joined rooms
|
||||
muc_join_args = plg_0045.popRooms(client)
|
||||
# we need to recreate roster
|
||||
client.handlers.remove(client.roster)
|
||||
client.roster = client.roster.__class__(self.host)
|
||||
|
|
@ -412,6 +417,10 @@ class XEP_0198(object):
|
|||
d.addCallback(lambda __: client.roster.got_roster)
|
||||
# initial presence must be sent manually
|
||||
d.addCallback(lambda __: client.presence.available())
|
||||
if plg_0045 is not None:
|
||||
muc_d_list = defer.DeferredList(
|
||||
[plg_0045.join(*args) for args in muc_join_args])
|
||||
d.addCallback(lambda __: muc_d_list)
|
||||
|
||||
def onReceive(self, element, client):
|
||||
if not client.is_component:
|
||||
|
|
@ -437,7 +446,7 @@ class XEP_0198(object):
|
|||
session.ack_requested = False
|
||||
if self._ack_timeout:
|
||||
if session.req_timer is None:
|
||||
log.error("reg_timer should be set")
|
||||
log.error("req_timer should be set")
|
||||
else:
|
||||
session.req_timer.cancel()
|
||||
session.req_timer = None
|
||||
|
|
|
|||
Loading…
Reference in a new issue