From 4464121eb232a3ec6049802256012714fe786506 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Sat, 26 Jul 2014 16:00:24 +0200 Subject: m_spanningtree Return a bool from DoCollision() The return value is true if the remote user or both have to change, false if only we have to change --- src/modules/m_spanningtree/uid.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/modules/m_spanningtree/uid.cpp') diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index cafaee4c0..c7a98b2f4 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -59,10 +59,10 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vectorDoCollision(collideswith, remoteserver, age_t, params[5], params[6], params[0]); - ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "*** Collision on %s, collide=%d", params[2].c_str(), collide); + bool they_change = Utils->DoCollision(collideswith, remoteserver, age_t, params[5], params[6], params[0]); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Collision on %s %d", params[2].c_str(), they_change); - if (collide != 1) + if (they_change) { // The client being introduced needs to change nick to uuid, change the nick in the message before // processing/forwarding it. -- cgit v1.3.1-10-gc9f91