pidgin/pidgin

Initiate XMPP stream management after binding a resource
release-2.x.y
2021-06-17, defanor
1d8612429d16
Parents 13a246aa0656
Children 23c929b96bdf
Initiate XMPP stream management after binding a resource

Bugs closed: PIDGIN-17520

Reviewed at https://reviews.imfreedom.org/r/759/
3 files changed, 7 insertions(+), 2 deletions(-)
  • +4 -1
    libpurple/protocols/jabber/jabber.c
  • +1 -0
    libpurple/protocols/jabber/jabber.h
  • +2 -1
    libpurple/protocols/jabber/stream_management.c
    • --- a/libpurple/protocols/jabber/jabber.c Mon Jun 14 23:02:24 2021 -0500
    +++ b/libpurple/protocols/jabber/jabber.c Thu Jun 17 20:54:12 2021 -0500
    @@ -178,6 +178,9 @@
    return;
    }
    + if (js->sm_state == SM_PLANNED) {
    + jabber_sm_enable(js);
    + }
    jabber_session_init(js);
    }
    @@ -319,7 +322,7 @@
    if (xmlnode_get_child_with_namespace(packet, "sm", NS_STREAM_MANAGEMENT)
    && (js->sm_state == SM_DISABLED) )
    {
    - jabber_sm_enable(js);
    + js->sm_state = SM_PLANNED;
    }
    }
    --- a/libpurple/protocols/jabber/jabber.h Mon Jun 14 23:02:24 2021 -0500
    +++ b/libpurple/protocols/jabber/jabber.h Thu Jun 17 20:54:12 2021 -0500
    @@ -100,6 +100,7 @@
    typedef enum {
    SM_DISABLED,
    + SM_PLANNED,
    SM_REQUESTED,
    SM_ENABLED
    } JabberStreamManagementState;
    --- a/libpurple/protocols/jabber/stream_management.c Mon Jun 14 23:02:24 2021 -0500
    +++ b/libpurple/protocols/jabber/stream_management.c Thu Jun 17 20:54:12 2021 -0500
    @@ -184,7 +184,8 @@
    void
    jabber_sm_outbound(JabberStream *js, xmlnode *packet)
    {
    - if (jabber_is_stanza(packet) && js->sm_state != SM_DISABLED) {
    + if (jabber_is_stanza(packet)
    + && (js->sm_state == SM_REQUESTED || js->sm_state == SM_ENABLED)) {
    /* Counting stanzas even if there's no confirmation that SM is
    enabled yet, so that we won't miss any. */