diff options
| author |  Sadie Powell | 2021-05-11 03:53:43 +0100 |
|---|---|---|
| committer | Sadie Powell | 2021-05-11 04:07:45 +0100 |
| commit | 3ca912ad71cdc4004401e0977be73c674bb91fbc (patch) | |
| tree | cf57b43229becfc3d9c8532a2d4f18f095f024ec /src/modules/m_spanningtree | |
| parent | Optimise building the link data string. (diff) | |
| parent | Send ERR_BADCHANMASK when trying to OJOIN/SAJOIN an invalid channel. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_spanningtree')
| -rw-r--r-- | src/modules/m_spanningtree/main.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/nickcollide.cpp | 3 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/override_squit.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket.h | 4 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/utils.h | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index e8012fc55..4df743b05 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -146,7 +146,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) { if (user->IsOper()) { - ShowLinks(server, user, hops+1); + ShowLinks(server, user, hops+1); } } else diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp index f00ea2b70..0447d9548 100644 --- a/src/modules/m_spanningtree/nickcollide.cpp +++ b/src/modules/m_spanningtree/nickcollide.cpp @@ -78,8 +78,7 @@ bool SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remo * if ident@ip is equal, and theirs is newer, or * ident@ip differ, and ours is newer */ - if((SamePerson && remotets < localts) || - (!SamePerson && remotets > localts)) + if ((SamePerson && remotets < localts) || (!SamePerson && remotets > localts)) { // Only remote needs to change bChangeLocal = false; diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp index 72d34e87e..b46297b75 100644 --- a/src/modules/m_spanningtree/override_squit.cpp +++ b/src/modules/m_spanningtree/override_squit.cpp @@ -54,7 +54,7 @@ ModResult ModuleSpanningTree::HandleSquit(const CommandBase::Params& parameters, } else { - user->WriteNotice("*** SQUIT: The server \002" + parameters[0] + "\002 does not exist on the network."); + user->WriteNotice("*** SQUIT: The server \002" + parameters[0] + "\002 does not exist on the network."); } return MOD_RES_DENY; } diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h index c3a03999e..89c2b9aec 100644 --- a/src/modules/m_spanningtree/treesocket.h +++ b/src/modules/m_spanningtree/treesocket.h @@ -55,10 +55,10 @@ * CONNECTING: indicates an outbound socket which is * waiting to be writeable. * WAIT_AUTH_1: indicates the socket is outbound and - * has successfully connected, but has not + * has successfully connected, but has not * yet sent and received SERVER strings. * WAIT_AUTH_2: indicates that the socket is inbound - * but has not yet sent and received + * but has not yet sent and received * SERVER strings. * CONNECTED: represents a fully authorized, fully * connected server. diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h index fd42c57e9..532223818 100644 --- a/src/modules/m_spanningtree/utils.h +++ b/src/modules/m_spanningtree/utils.h @@ -50,7 +50,7 @@ class SpanningTreeUtilities : public Cullable CacheRefreshTimer RefreshTimer; public: - typedef std::set<TreeSocket*> TreeSocketSet; + typedef std::set<TreeSocket*> TreeSocketSet; typedef std::map<TreeSocket*, std::pair<std::string, unsigned int> > TimeoutList; /** Creator module |