Add sanity checks to the ssl modules so that theres no possibility of an out of range...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / main.cpp

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index f0ba16cbb63aeca8d43fb5e9f7b41fe5f47f5cdb..fdd57c4ef09a8fcbad280fb0dd925b11a53f3c6b 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -480,7 +480,7 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime)
                        {
                                if (serv->AnsweredLastPing())
                                {
-                                       sock->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" PING "+serv->GetName());
+                                       sock->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" PING "+serv->GetID());
                                        serv->SetNextPingTime(curtime + Utils->PingFreq);
                                        serv->LastPing = curtime;
                                        timeval t;
@@ -629,6 +629,15 @@ int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, userrec
  */
 void ModuleSpanningTree::RemoteMessage(userrec* user, const char* format, ...)
 {
+       /* This could cause an infinite loop, because DoOneToMany() will, on error,
+        * call TreeSocket::OnError(), which in turn will call this function to
+        * notify everyone of the error. So, drop any messages that are generated
+        * during the sending of another message. -Special */
+       static bool SendingRemoteMessage = false;
+       if (SendingRemoteMessage)
+               return;
+       SendingRemoteMessage = true;
+
        std::deque<std::string> params;
        char text[MAXBUF];
        va_list argsPtr;
@@ -657,6 +666,8 @@ void ModuleSpanningTree::RemoteMessage(userrec* user, const char* format, ...)
                        Utils->DoOneToMany(ServerInstance->Config->GetSID(), "PUSH", params);
                }
        }
+       
+       SendingRemoteMessage = false;
 }
        
 int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, userrec* user)
@@ -668,18 +679,18 @@ int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, userrec
                        TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str());
                        if (!CheckDupe)
                        {
-                               RemoteMessage(user, "*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "<hidden>" : x->IPAddr.c_str()),x->Port);
+                               RemoteMessage(user, "*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",x->Name.c_str(),(x->HiddenFromStats ? "<hidden>" : x->IPAddr.c_str()),x->Port);
                                ConnectServer(&(*x));
                                return 1;
                        }
                        else
                        {
-                               RemoteMessage(user, "*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002",user->nick,x->Name.c_str(),CheckDupe->GetParent()->GetName().c_str());
+                               RemoteMessage(user, "*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002",x->Name.c_str(),CheckDupe->GetParent()->GetName().c_str());
                                return 1;
                        }
                }
        }
-       RemoteMessage(user, "NOTICE %s :*** CONNECT: No server matching \002%s\002 could be found in the config file.",user->nick,parameters[0]);
+       RemoteMessage(user, "*** CONNECT: No server matching \002%s\002 could be found in the config file.",parameters[0]);
        return 1;
 }
 
@@ -811,6 +822,10 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const char**
                int n_translate = thiscmd->translation.size();
                TranslateType translate_to;
 
+               /* To make sure that parameters with spaces, or empty
+                * parameters, etc, are always sent properly, *always*
+                * prefix the last parameter with a :. This also removes
+                * an extra strchr() */
                for (int j = 0; j < pcnt; j++)
                {
                        std::string target;
@@ -826,8 +841,8 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const char**
 
                        ServerInstance->Log(DEBUG,"TRANSLATION: %s - type is %d", parameters[j], translate_to);
                        ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target);
-
-                       if (strchr(parameters[j],' '))
+                       
+                       if (j == (pcnt - 1))
                                params.push_back(":" + target);
                        else
                                params.push_back(target);
@@ -1042,19 +1057,18 @@ void ModuleSpanningTree::OnUserPart(userrec* user, chanrec* channel, const std::
 
 void ModuleSpanningTree::OnUserConnect(userrec* user)
 {
-       char agestr[MAXBUF];
        if (IS_LOCAL(user))
        {
                std::deque<std::string> params;
-               snprintf(agestr,MAXBUF,"%lu",(unsigned long)user->age);
                params.push_back(user->uuid);
-               params.push_back(agestr);
+               params.push_back(ConvToStr(user->age));
                params.push_back(user->nick);
                params.push_back(user->host);
                params.push_back(user->dhost);
                params.push_back(user->ident);
                params.push_back("+"+std::string(user->FormatModes()));
                params.push_back(user->GetIPString());
+               params.push_back(ConvToStr(user->signon));
                params.push_back(":"+std::string(user->fullname));
                Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params);
                // User is Local, change needs to be reflected!