From ed11e05d5b6463f582dc22140794837e97796bf9 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Wed, 11 Jun 2014 15:07:27 +0200 Subject: Send the membership id when kicking a remote user and drop KICKs with mismatching membership ids This fixes the desync happening when a PART+JOIN crosses a KICK targetting the same user. --- src/modules/m_spanningtree/main.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/modules') diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 8154016e7..45f219286 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -624,6 +624,9 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s CmdBuilder params(source, "KICK"); params.push_back(memb->chan->name); params.push_back(memb->user->uuid); + // If a remote user is being kicked by us then send the membership id in the kick too + if (!IS_LOCAL(memb->user)) + params.push_int(memb->id); params.push_last(reason); params.Broadcast(); } -- cgit v1.2.3