summaryrefslogtreecommitdiff
path: root/src/modules/m_spanningtree
diff options
context:
space:
mode:
authorpippijn <pippijn@e03df62e-2008-0410-955e-edbf42e46eb7>2008-06-11 11:35:23 +0000
committerpippijn <pippijn@e03df62e-2008-0410-955e-edbf42e46eb7>2008-06-11 11:35:23 +0000
commitd185decae97752368d5cf62311cbc0d1a52aa22c (patch)
tree754e7076778fabfbaacaef96da0f845110a8adef /src/modules/m_spanningtree
parent62ac378bfb9591f5c5e10076c8be73adaabcfc64 (diff)
fixed some indentation and spacing in modules
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9888 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_spanningtree')
-rw-r--r--src/modules/m_spanningtree/addline.cpp2
-rw-r--r--src/modules/m_spanningtree/capab.cpp2
-rw-r--r--src/modules/m_spanningtree/delline.cpp2
-rw-r--r--src/modules/m_spanningtree/fjoin.cpp6
-rw-r--r--src/modules/m_spanningtree/hmac.cpp2
-rw-r--r--src/modules/m_spanningtree/kill.cpp4
-rw-r--r--src/modules/m_spanningtree/main.cpp12
-rw-r--r--src/modules/m_spanningtree/netburst.cpp2
-rw-r--r--src/modules/m_spanningtree/nickcollide.cpp18
-rw-r--r--src/modules/m_spanningtree/override_admin.cpp8
-rw-r--r--src/modules/m_spanningtree/override_map.cpp10
-rw-r--r--src/modules/m_spanningtree/override_modules.cpp8
-rw-r--r--src/modules/m_spanningtree/override_motd.cpp8
-rw-r--r--src/modules/m_spanningtree/override_squit.cpp6
-rw-r--r--src/modules/m_spanningtree/override_stats.cpp10
-rw-r--r--src/modules/m_spanningtree/override_time.cpp12
-rw-r--r--src/modules/m_spanningtree/override_whois.cpp10
-rw-r--r--src/modules/m_spanningtree/postcommand.cpp10
-rw-r--r--src/modules/m_spanningtree/precommand.cpp8
-rw-r--r--src/modules/m_spanningtree/privmsg.cpp4
-rw-r--r--src/modules/m_spanningtree/treesocket2.cpp24
-rw-r--r--src/modules/m_spanningtree/uid.cpp4
22 files changed, 86 insertions, 86 deletions
diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index b7f2ad420..b9bca3109 100644
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -66,7 +66,7 @@ bool TreeSocket::AddLine(const std::string &prefix, std::deque<std::string> &par
User* u = Instance->FindNick(prefix);
Utils->DoOneToAllButSender(prefix, "ADDLINE", params, u ? u->server : prefix);
TreeServer *remoteserver = Utils->FindServer(u ? u->server : prefix);
-
+
if (!remoteserver->bursting)
{
Instance->XLines->ApplyLines();
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 9a45b8131..8037907d0 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -188,7 +188,7 @@ bool TreeSocket::Capab(const std::deque<std::string> &params)
if (((this->CapKeys.find("HALFOP") == this->CapKeys.end()) && (Instance->Config->AllowHalfop)) || ((this->CapKeys.find("HALFOP") != this->CapKeys.end()) && (this->CapKeys.find("HALFOP")->second != ConvToStr(Instance->Config->AllowHalfop))))
reason = "We don't both have halfop support enabled/disabled identically";
-
+
/* Challenge response, store their challenge for our password */
std::map<std::string,std::string>::iterator n = this->CapKeys.find("CHALLENGE");
if (Utils->ChallengeResponse && (n != this->CapKeys.end()) && (Instance->Modules->Find("m_sha256.so")))
diff --git a/src/modules/m_spanningtree/delline.cpp b/src/modules/m_spanningtree/delline.cpp
index 1b8630f66..e8c398f6b 100644
--- a/src/modules/m_spanningtree/delline.cpp
+++ b/src/modules/m_spanningtree/delline.cpp
@@ -32,7 +32,7 @@ bool TreeSocket::DelLine(const std::string &prefix, std::deque<std::string> &par
if (user)
setter = user->nick;
else
- {
+ {
TreeServer* t = Utils->FindServer(prefix);
if (t)
setter = t->GetName().c_str();
diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 33f92235a..b891443ea 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -73,7 +73,7 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
if (params.size() > 3)
params[params.size() - 1] = ":" + params[params.size() - 1];
-
+
Utils->DoOneToAllButSender(source,"FJOIN",params,source);
if (!TS)
@@ -151,7 +151,7 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p
/* Advance past the comma, to the nick */
usr++;
-
+
/* Check the user actually exists */
who = this->Instance->FindUUID(usr);
if (who)
@@ -233,4 +233,4 @@ bool TreeSocket::RemoveStatus(const std::string &prefix, std::deque<std::string>
}
return true;
}
-
+
diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index 4ad6658b8..564bef796 100644
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -145,4 +145,4 @@ bool TreeSocket::ComparePass(const std::string &ours, const std::string &theirs)
else
/* Straight string compare of plaintext */
return ours == theirs;
-}
+}
diff --git a/src/modules/m_spanningtree/kill.cpp b/src/modules/m_spanningtree/kill.cpp
index 3fca0a0cb..b8413942d 100644
--- a/src/modules/m_spanningtree/kill.cpp
+++ b/src/modules/m_spanningtree/kill.cpp
@@ -24,7 +24,7 @@
bool TreeSocket::RemoteKill(const std::string &prefix, std::deque<std::string> &params)
-{
+{
if (params.size() != 2)
return true;
@@ -32,7 +32,7 @@ bool TreeSocket::RemoteKill(const std::string &prefix, std::deque<std::string> &
if (who)
{
- /* Prepend kill source, if we don't have one */
+ /* Prepend kill source, if we don't have one */
if (*(params[1].c_str()) != '[')
{
params[1] = "[" + prefix + "] Killed (" + params[1] +")";
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index b91d76836..9688cfb7d 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -155,10 +155,10 @@ void ModuleSpanningTree::HandleLusers(const std::vector<std::string>& parameters
if (ServerInstance->Users->UnregisteredUserCount())
user->WriteNumeric(253, "%s %d :unknown connections",user->nick.c_str(),ServerInstance->Users->UnregisteredUserCount());
-
+
if (ServerInstance->ChannelCount())
user->WriteNumeric(254, "%s %ld :channels formed",user->nick.c_str(),ServerInstance->ChannelCount());
-
+
user->WriteNumeric(255, "%s :I have %d clients and %d servers",user->nick.c_str(),ServerInstance->Users->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs());
user->WriteNumeric(265, "%s :Current Local Users: %d Max: %d",user->nick.c_str(),ServerInstance->Users->LocalUserCount(),max_local);
user->WriteNumeric(266, "%s :Current Global Users: %d Max: %d",user->nick.c_str(),n_users,max_global);
@@ -221,7 +221,7 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime)
// ... if we can find a proper route to them
if (tsock)
{
- tsock->WriteLine(std::string(":") + ServerInstance->Config->GetSID() + " PING " +
+ tsock->WriteLine(std::string(":") + ServerInstance->Config->GetSID() + " PING " +
ServerInstance->Config->GetSID() + " " + s->GetID());
s->LastPingMsec = ts;
}
@@ -394,10 +394,10 @@ void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...)
else
ServerInstance->PI->SendUserNotice(user, text);
}
-
+
SendingRemoteMessage = false;
}
-
+
int ModuleSpanningTree::HandleConnect(const std::vector<std::string>& parameters, User* user)
{
for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
@@ -731,7 +731,7 @@ void ModuleSpanningTree::OnAddLine(User* user, XLine *x)
return;
char data[MAXBUF];
- snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", x->type.c_str(), x->Displayable(),
+ snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", x->type.c_str(), x->Displayable(),
ServerInstance->Config->ServerName, (unsigned long)x->set_time, (unsigned long)x->duration, x->reason);
std::deque<std::string> params;
params.push_back(data);
diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp
index 793a3cf9a..2e7aab25f 100644
--- a/src/modules/m_spanningtree/netburst.cpp
+++ b/src/modules/m_spanningtree/netburst.cpp
@@ -132,7 +132,7 @@ void TreeSocket::SendFJoins(TreeServer* Current, Channel* c)
{
modes.append("b");
params.append(" ").append(b->data);
- linesize += size;
+ linesize += size;
}
if ((params.length() >= Instance->Config->Limits.MaxModes) || (currsize > 350))
{
diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index a33b77da4..5531f9c0e 100644
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -35,15 +35,15 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
* These days, we have UID. And, so what we do is, force nick change client(s)
* involved according to timestamp rules.
*
- * RULES:
- * user@ip equal:
- * Force nick change on OLDER timestamped client
- * user@ip differ:
- * Force nick change on NEWER timestamped client
- * TS EQUAL:
- * FNC both.
- *
- * This stops abusive use of collisions, simplifies problems with loops, and so on.
+ * RULES:
+ * user@ip equal:
+ * Force nick change on OLDER timestamped client
+ * user@ip differ:
+ * Force nick change on NEWER timestamped client
+ * TS EQUAL:
+ * FNC both.
+ *
+ * This stops abusive use of collisions, simplifies problems with loops, and so on.
* -- w00t
*/
bool bChangeLocal = true;
diff --git a/src/modules/m_spanningtree/override_admin.cpp b/src/modules/m_spanningtree/override_admin.cpp
index 2122a3a24..a15cba93c 100644
--- a/src/modules/m_spanningtree/override_admin.cpp
+++ b/src/modules/m_spanningtree/override_admin.cpp
@@ -12,15 +12,15 @@
*/
/* $ModDesc: Provides a spanning tree server link protocol */
-
+
#include "inspircd.h"
#include "commands/cmd_whois.h"
#include "commands/cmd_stats.h"
#include "socket.h"
#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-
+#include "xline.h"
+#include "transport.h"
+
#include "m_spanningtree/timesynctimer.h"
#include "m_spanningtree/resolvers.h"
#include "m_spanningtree/main.h"
diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index 01423b60a..229997e5b 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -12,7 +12,7 @@
*/
/* $ModDesc: Provides a spanning tree server link protocol */
-
+
#include "inspircd.h"
#include "wildcard.h"
@@ -28,19 +28,19 @@ const std::string ModuleSpanningTree::MapOperInfo(TreeServer* Current)
time_t secs_up = ServerInstance->Time() - Current->age;
return (" [Up: " + TimeToStr(secs_up) + " Lag: " + (Current->rtt == 0 ? "<1" : ConvToStr(Current->rtt)) + "ms]");
}
-
+
// WARNING: NOT THREAD SAFE - DONT GET ANY SMART IDEAS.
void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, char matrix[128][128], float &totusers, float &totservers)
{
ServerInstance->Logs->Log("map",DEBUG,"ShowMap depth %d totusers %0.2f totservers %0.2f", depth, totusers, totservers);
if (line < 128)
- {
+ {
for (int t = 0; t < depth; t++)
{
ServerInstance->Logs->Log("map",DEBUG,"Zero to depth");
matrix[line][t] = ' ';
}
-
+
// For Aligning, we need to work out exactly how deep this thing is, and produce
// a 'Spacer' String to compensate.
char spacer[40];
@@ -51,7 +51,7 @@ void ModuleSpanningTree::ShowMap(TreeServer* Current, User* user, int depth, cha
else
{
spacer[5] = '\0';
- }
+ }
float percent;
char text[128];
diff --git a/src/modules/m_spanningtree/override_modules.cpp b/src/modules/m_spanningtree/override_modules.cpp
index 0a1dd2d3d..b06634a4d 100644
--- a/src/modules/m_spanningtree/override_modules.cpp
+++ b/src/modules/m_spanningtree/override_modules.cpp
@@ -12,15 +12,15 @@
*/
/* $ModDesc: Provides a spanning tree server link protocol */
-
+
#include "inspircd.h"
#include "commands/cmd_whois.h"
#include "commands/cmd_stats.h"
#include "socket.h"
#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-
+#include "xline.h"
+#include "transport.h"
+
#include "m_spanningtree/timesynctimer.h"
#include "m_spanningtree/resolvers.h"
#include "m_spanningtree/main.h"
diff --git a/src/modules/m_spanningtree/override_motd.cpp b/src/modules/m_spanningtree/override_motd.cpp
index 3a1182973..b312769c7 100644
--- a/src/modules/m_spanningtree/override_motd.cpp
+++ b/src/modules/m_spanningtree/override_motd.cpp
@@ -12,15 +12,15 @@
*/
/* $ModDesc: Provides a spanning tree server link protocol */
-
+
#include "inspircd.h"
#include "commands/cmd_whois.h"
#include "commands/cmd_stats.h"
#include "socket.h"
#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-
+#include "xline.h"
+#include "transport.h"
+
#include "m_spanningtree/timesynctimer.h"
#include "m_spanningtree/resolvers.h"
#include "m_spanningtree/main.h"
diff --git a/src/modules/m_spanningtree/override_squit.cpp b/src/modules/m_spanningtree/override_squit.cpp
index 02833464f..cacbc51a6 100644
--- a/src/modules/m_spanningtree/override_squit.cpp
+++ b/src/modules/m_spanningtree/override_squit.cpp
@@ -12,14 +12,14 @@
*/
/* $ModDesc: Provides a spanning tree server link protocol */
-
+
#include "inspircd.h"
#include "commands/cmd_whois.h"
#include "commands/cmd_stats.h"
#include "socket.h"
#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
+#include "xline.h"
+#include "transport.h"
#include "m_spanningtree/timesynctimer.h"
#include "m_spanningtree/resolvers.h"
diff --git a/src/modules/m_spanningtree/override_stats.cpp b/src/modules/m_spanningtree/override_stats.cpp
index ab50f7656..6c66e2d2b 100644
--- a/src/modules/m_spanningtree/override_stats.cpp
+++ b/src/modules/m_spanningtree/override_stats.cpp
@@ -12,15 +12,15 @@
*/
/* $ModDesc: Provides a spanning tree server link protocol */
-
+
#include "inspircd.h"
#include "commands/cmd_whois.h"
#include "commands/cmd_stats.h"
#include "socket.h"
#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-
+#include "xline.h"
+#include "transport.h"
+
#include "m_spanningtree/timesynctimer.h"
#include "m_spanningtree/resolvers.h"
#include "m_spanningtree/main.h"
@@ -30,7 +30,7 @@
#include "m_spanningtree/treesocket.h"
#include "m_spanningtree/rconnect.h"
#include "m_spanningtree/rsquit.h"
-
+
/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h */
int ModuleSpanningTree::HandleStats(const std::vector<std::string>& parameters, User* user)
diff --git a/src/modules/m_spanningtree/override_time.cpp b/src/modules/m_spanningtree/override_time.cpp
index b0a37b7be..0f6a1bef6 100644
--- a/src/modules/m_spanningtree/override_time.cpp
+++ b/src/modules/m_spanningtree/override_time.cpp
@@ -12,15 +12,15 @@
*/
/* $ModDesc: Provides a spanning tree server link protocol */
-
+
#include "inspircd.h"
#include "commands/cmd_whois.h"
#include "commands/cmd_stats.h"
#include "socket.h"
#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-
+#include "xline.h"
+#include "transport.h"
+
#include "m_spanningtree/timesynctimer.h"
#include "m_spanningtree/resolvers.h"
#include "m_spanningtree/main.h"
@@ -30,7 +30,7 @@
#include "m_spanningtree/treesocket.h"
#include "m_spanningtree/rconnect.h"
#include "m_spanningtree/rsquit.h"
-
+
/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h */
int ModuleSpanningTree::HandleTime(const std::vector<std::string>& parameters, User* user)
@@ -43,7 +43,7 @@ int ModuleSpanningTree::HandleTime(const std::vector<std::string>& parameters, U
// we dont' override for local server
if (found == Utils->TreeRoot)
return 0;
-
+
std::deque<std::string> params;
params.push_back(found->GetName());
params.push_back(user->uuid);
diff --git a/src/modules/m_spanningtree/override_whois.cpp b/src/modules/m_spanningtree/override_whois.cpp
index 5d9705a87..a957ee174 100644
--- a/src/modules/m_spanningtree/override_whois.cpp
+++ b/src/modules/m_spanningtree/override_whois.cpp
@@ -12,15 +12,15 @@
*/
/* $ModDesc: Provides a spanning tree server link protocol */
-
+
#include "inspircd.h"
#include "commands/cmd_whois.h"
#include "commands/cmd_stats.h"
#include "socket.h"
#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-
+#include "xline.h"
+#include "transport.h"
+
#include "m_spanningtree/timesynctimer.h"
#include "m_spanningtree/resolvers.h"
#include "m_spanningtree/main.h"
@@ -30,7 +30,7 @@
#include "m_spanningtree/treesocket.h"
#include "m_spanningtree/rconnect.h"
#include "m_spanningtree/rsquit.h"
-
+
/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h */
int ModuleSpanningTree::HandleRemoteWhois(const std::vector<std::string>& parameters, User* user)
diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index c485afe59..d63fff686 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -12,15 +12,15 @@
*/
/* $ModDesc: Provides a spanning tree server link protocol */
-
+
#include "inspircd.h"
#include "commands/cmd_whois.h"
#include "commands/cmd_stats.h"
#include "socket.h"
#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-
+#include "xline.h"
+#include "transport.h"
+
#include "m_spanningtree/timesynctimer.h"
#include "m_spanningtree/resolvers.h"
#include "m_spanningtree/main.h"
@@ -68,7 +68,7 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve
ServerInstance->Logs->Log("m_spanningtree",DEBUG,"TRANSLATION: %s - type is %d", parameters[j].c_str(), translate_to);
ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target);
-
+
if (j == (parameters.size() - 1))
params.push_back(":" + target);
else
diff --git a/src/modules/m_spanningtree/precommand.cpp b/src/modules/m_spanningtree/precommand.cpp
index e27de1dbd..631a20557 100644
--- a/src/modules/m_spanningtree/precommand.cpp
+++ b/src/modules/m_spanningtree/precommand.cpp
@@ -12,15 +12,15 @@
*/
/* $ModDesc: Provides a spanning tree server link protocol */
-
+
#include "inspircd.h"
#include "commands/cmd_whois.h"
#include "commands/cmd_stats.h"
#include "socket.h"
#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-
+#include "xline.h"
+#include "transport.h"
+
#include "m_spanningtree/timesynctimer.h"
#include "m_spanningtree/resolvers.h"
#include "m_spanningtree/main.h"
diff --git a/src/modules/m_spanningtree/privmsg.cpp b/src/modules/m_spanningtree/privmsg.cpp
index cd49001a5..a68590048 100644
--- a/src/modules/m_spanningtree/privmsg.cpp
+++ b/src/modules/m_spanningtree/privmsg.cpp
@@ -39,7 +39,7 @@ bool TreeSocket::ServerMessage(const std::string &messagetype, const std::string
}
Channel* channel = Instance->FindChan(target);
-
+
if (channel)
{
if (messagetype == "PRIVMSG")
@@ -60,7 +60,7 @@ bool TreeSocket::ServerMessage(const std::string &messagetype, const std::string
else
{
User* user = Instance->FindNick(target);
-
+
if (user)
{
if (messagetype == "PRIVMSG")
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 26785fd39..5a6a9f301 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -74,22 +74,22 @@ bool TreeSocket::ProcessLine(std::string &line)
Instance->Logs->Log("m_spanningtree",DEBUG, "S[%d] I %s", this->GetFd(), line.c_str());
this->Split(line.c_str(),params);
-
+
if (params.empty())
return true;
-
+
if ((params[0][0] == ':') && (params.size() > 1))
{
prefix = params[0].substr(1);
params.pop_front();
-
+
if (prefix.empty())
{
this->SendError("BUG (?) Empty prefix recieved.");
return false;
}
}
-
+
command = params[0].c_str();
params.pop_front();
@@ -313,8 +313,8 @@ bool TreeSocket::ProcessLine(std::string &line)
/*
* Now, check for (and parse) commands as appropriate. -- w
- */
-
+ */
+
/* Find the server that this command originated from, used in the handlers below */
TreeServer *ServerSource = Utils->FindServer(prefix);
@@ -501,7 +501,7 @@ bool TreeSocket::ProcessLine(std::string &line)
this->Instance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()));
return false;
}
-
+
ServerSource->bursting = true;
return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
}
@@ -512,7 +512,7 @@ bool TreeSocket::ProcessLine(std::string &line)
this->Instance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()));
return false;
}
-
+
ServerSource->FinishBurst();
return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
}
@@ -534,10 +534,10 @@ bool TreeSocket::ProcessLine(std::string &line)
return false;
}
}
-
+
// Insert into the parser
this->Instance->SendMode(modelist, this->Instance->FakeClient);
-
+
// Pass out to the network
return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
}
@@ -587,7 +587,7 @@ bool TreeSocket::ProcessLine(std::string &line)
}
}
}
-
+
// its a user
std::vector<std::string> strparams(params.begin(), params.end());
@@ -664,7 +664,7 @@ void TreeSocket::OnClose()
if (!quitserver.empty())
{
Utils->Creator->RemoteMessage(NULL,"Connection to '\2%s\2' failed.",quitserver.c_str());
- time_t server_uptime = Instance->Time() - this->age;
+ time_t server_uptime = Instance->Time() - this->age;
if (server_uptime)
Utils->Creator->RemoteMessage(NULL,"Connection to '\2%s\2' was established for %s", quitserver.c_str(), Utils->Creator->TimeToStr(server_uptime).c_str());
}
diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index f36d2b05c..32255b576 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -137,10 +137,10 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
Instance->Users->AddGlobalClone(_new);
bool dosend = true;
-
+
if ((this->Utils->quiet_bursts && remoteserver->bursting) || this->Instance->SilentULine(_new->server))
dosend = false;
-
+
if (dosend)
this->Instance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]", _new->server, _new->nick.c_str(), _new->ident.c_str(), _new->host.c_str(), _new->GetIPString(), _new->fullname.c_str());