diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2015-04-20 17:40:12 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2015-04-20 17:40:12 +0200 |
| commit | 8f5efbc7aa33b792e02d01e3288f553e6e98ccaa (patch) | |
| tree | 54a67ebd11fac07d630fa03acad7797b2f781e80 /src/modules/m_spanningtree | |
| parent | dda1d696c1316b09d65763b4f12bc2b63cfbbe72 (diff) | |
| parent | 1548078e5dc304814669cd1ea052f92be9d1ac40 (diff) | |
Merge insp20
Diffstat (limited to 'src/modules/m_spanningtree')
| -rw-r--r-- | src/modules/m_spanningtree/fjoin.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treeserver.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp index 25c1f6678..e29aa09d7 100644 --- a/src/modules/m_spanningtree/fjoin.cpp +++ b/src/modules/m_spanningtree/fjoin.cpp @@ -129,8 +129,8 @@ CmdResult CommandFJoin::Handle(User* srcuser, std::vector<std::string>& params) time_t ourTS = chan->age; if (TS != ourTS) { - ServerInstance->SNO->WriteToSnoMask('d', "Merge FJOIN received for %s, ourTS: %lu, TS: %lu, difference: %lu", - chan->name.c_str(), (unsigned long)ourTS, (unsigned long)TS, (unsigned long)(ourTS - TS)); + ServerInstance->SNO->WriteToSnoMask('d', "Merge FJOIN received for %s, ourTS: %lu, TS: %lu, difference: %ld", + chan->name.c_str(), (unsigned long)ourTS, (unsigned long)TS, (long)(ourTS - TS)); /* If our TS is less than theirs, we dont accept their modes */ if (ourTS < TS) { diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index d0c6401cd..afd86c0ce 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -40,7 +40,7 @@ TreeServer::TreeServer() , Socket(NULL), sid(ServerInstance->Config->GetSID()), behind_bursting(0), isdead(false) , pingtimer(this) , ServerUser(ServerInstance->FakeClient) - , age(ServerInstance->Time()), UserCount(ServerInstance->Users.GetLocalUsers().size()) + , age(ServerInstance->Time()), UserCount(ServerInstance->Users.LocalUserCount()) , OperCount(0), rtt(0), StartBurst(0), Hidden(false) { AddHashEntry(); |