aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/m_spanningtree/uid.cpp
diff options
context:
space:
mode:
authorGravatar Attila Molnar2014-07-26 16:00:24 +0200
committerGravatar Attila Molnar2014-07-26 16:00:24 +0200
commit4464121eb232a3ec6049802256012714fe786506 (patch)
tree480dda7a185d0331bc9da9a07af130f7bc274981 /src/modules/m_spanningtree/uid.cpp
parentm_spanningtree Replace WriteLine() call with Unicast() in DoCollision() (diff)
downloadinspircd++-4464121eb232a3ec6049802256012714fe786506.tar.gz
inspircd++-4464121eb232a3ec6049802256012714fe786506.tar.bz2
inspircd++-4464121eb232a3ec6049802256012714fe786506.zip
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
Diffstat (limited to 'src/modules/m_spanningtree/uid.cpp')
-rw-r--r--src/modules/m_spanningtree/uid.cpp6
1 files changed, 3 insertions, 3 deletions
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::vector<std::st
else if (collideswith)
{
// The user on this side is registered, handle the collision
- int collide = Utils->DoCollision(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.