/* $ModDesc: Provides a spanning tree server link protocol */
#include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "commands/cmd_whois.h"
#include "commands/cmd_stats.h"
#include "socket.h"
const std::string ModuleSpanningTree::MapOperInfo(TreeServer* Current)
{
time_t secs_up = ServerInstance->Time() - Current->age;
- return (" [Up: " + TimeToStr(secs_up) + " Lag: "+ConvToStr(Current->rtt)+"s]");
+ return (" [Up: " + TimeToStr(secs_up) + " Lag: "+ConvToStr(Current->rtt)+"ms]");
}
// WARNING: NOT THREAD SAFE - DONT GET ANY SMART IDEAS.
if (s)
{
params[0] = s->GetName();
- Utils->DoOneToOne(user->nick, "MOTD", params, s->GetName());
+ Utils->DoOneToOne(user->uuid, "MOTD", params, s->GetName());
}
else
user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
if (s)
{
params[0] = s->GetName();
- Utils->DoOneToOne(user->nick, "ADMIN", params, s->GetName());
+ Utils->DoOneToOne(user->uuid, "ADMIN", params, s->GetName());
}
else
user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
if (s)
{
params[0] = s->GetName();
- Utils->DoOneToOne(user->nick, "MODULES", params, s->GetName());
+ Utils->DoOneToOne(user->uuid, "MODULES", params, s->GetName());
}
else
user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
if (s)
{
params[1] = s->GetName();
- Utils->DoOneToOne(user->nick, "STATS", params, s->GetName());
+ Utils->DoOneToOne(user->uuid, "STATS", params, s->GetName());
}
else
{
std::deque<std::string> params;
params.push_back(found->GetName());
- params.push_back(user->nick);
- Utils->DoOneToOne(ServerInstance->Config->ServerName,"TIME",params,found->GetName());
+ params.push_back(user->uuid);
+ Utils->DoOneToOne(ServerInstance->Config->GetSID(),"TIME",params,found->GetName());
}
else
{
{
std::deque<std::string> params;
params.push_back(parameters[1]);
- Utils->DoOneToOne(user->nick,"IDLE",params,remote->server);
+ Utils->DoOneToOne(user->uuid,"IDLE",params,remote->server);
return 1;
}
else if (!remote)
{
if (serv->AnsweredLastPing())
{
- sock->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" PING "+serv->GetName());
- serv->SetNextPingTime(curtime + 60);
+ sock->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" PING "+serv->GetName());
+ serv->SetNextPingTime(curtime + Utils->PingFreq);
serv->LastPing = curtime;
+ timeval t;
+ gettimeofday(&t, NULL);
+ long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
+ serv->LastPingMsec = ts;
serv->Warned = false;
}
else
return;
}
}
- else if ((Utils->PingWarnTime) && (!serv->Warned) && (curtime >= serv->NextPingTime() - (60 - Utils->PingWarnTime)) && (!serv->AnsweredLastPing()))
+ else if ((Utils->PingWarnTime) && (!serv->Warned) && (curtime >= serv->NextPingTime() - (Utils->PingFreq - Utils->PingWarnTime)) && (!serv->AnsweredLastPing()))
{
/* The server hasnt responded, send a warning to opers */
ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not responded to PING for %d seconds, high latency.", serv->GetName().c_str(), Utils->PingWarnTime);
}
else
{
- ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
- delete newsocket;
+ RemoteMessage(NULL, "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+ if (ServerInstance->SocketCull.find(newsocket) == ServerInstance->SocketCull.end())
+ ServerInstance->SocketCull[newsocket] = newsocket;
Utils->DoFailOver(x);
}
}
}
catch (ModuleException& e)
{
- ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason());
+ RemoteMessage(NULL, "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason());
Utils->DoFailOver(x);
}
}
}
return 1;
}
+
+/* This method will attempt to get a link message out to as many people as is required.
+ * If a user is provided, and that user is local, then the user is sent the message using
+ * WriteServ (they are the local initiator of that message). If the user is remote, they are
+ * sent that message remotely via PUSH.
+ * If the user is NULL, then the notice is sent locally via WriteToSnoMask with snomask 'l',
+ * and remotely via SNONOTICE with mask 'l'.
+ */
+void ModuleSpanningTree::RemoteMessage(userrec* user, const char* format, ...)
+{
+ std::deque<std::string> params;
+ char text[MAXBUF];
+ va_list argsPtr;
+
+ va_start(argsPtr, format);
+ vsnprintf(text, MAXBUF, format, argsPtr);
+ va_end(argsPtr);
+
+ if (!user)
+ {
+ /* No user, target it generically at everyone */
+ ServerInstance->SNO->WriteToSnoMask('l', "%s", text);
+ params.push_back("l");
+ params.push_back(std::string(":") + text);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(), "SNONOTICE", params);
+ }
+ else
+ {
+ if (IS_LOCAL(user))
+ user->WriteServ("NOTICE %s :%s", user->nick, text);
+ else
+ {
+ params.push_back(user->uuid);
+ params.push_back(std::string("::") + ServerInstance->Config->ServerName + " NOTICE " + user->nick + " :*** From " +
+ ServerInstance->Config->ServerName+ ": " + text);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(), "PUSH", params);
+ }
+ }
+}
int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, userrec* user)
{
TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str());
if (!CheckDupe)
{
- user->WriteServ("NOTICE %s :*** 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)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "<hidden>" : x->IPAddr.c_str()),x->Port);
ConnectServer(&(*x));
return 1;
}
else
{
- user->WriteServ("NOTICE %s :*** 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",user->nick,x->Name.c_str(),CheckDupe->GetParent()->GetName().c_str());
return 1;
}
}
}
- user->WriteServ("NOTICE %s :*** CONNECT: No server matching \002%s\002 could be found in the config file.",user->nick,parameters[0]);
+ RemoteMessage(user, "NOTICE %s :*** CONNECT: No server matching \002%s\002 could be found in the config file.",user->nick,parameters[0]);
return 1;
}
std::deque<std::string> params;
params.push_back(ConvToStr(ServerInstance->Time(false)));
params.push_back("FORCE");
- Utils->DoOneToMany(Utils->TreeRoot->GetName(), "TIMESET", params);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(), "TIMESET", params);
}
}
{
if ((result == CMD_SUCCESS) && (ServerInstance->IsValidModuleCommand(command, pcnt, user)))
{
+ /* Safe, we know its non-null because IsValidModuleCommand returned true */
+ command_t* thiscmd = ServerInstance->Parser->GetHandler(command);
// this bit of code cleverly routes all module commands
// to all remote severs *automatically* so that modules
// can just handle commands locally, without having
// commands and linking protocols.
std::deque<std::string> params;
params.clear();
+ int n_translate = thiscmd->translation.size();
+ TranslateType translate_to;
+
for (int j = 0; j < pcnt; j++)
{
- if (strchr(parameters[j],' '))
+ std::string target;
+
+ /* Map all items to UUIDs where neccessary */
+ if (j < n_translate)
{
- params.push_back(":" + std::string(parameters[j]));
+ /* We have a translation mapping for this index */
+ translate_to = thiscmd->translation[j] != TR_END ? thiscmd->translation[j] : TR_TEXT;
}
else
- {
- params.push_back(std::string(parameters[j]));
- }
+ translate_to = TR_TEXT;
+
+ ServerInstance->Log(DEBUG,"TRANSLATION: %s - type is %d", parameters[j], translate_to);
+ ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target);
+
+ if (strchr(parameters[j],' '))
+ params.push_back(":" + target);
+ else
+ params.push_back(target);
}
- Utils->DoOneToMany(user->nick,command,params);
+ Utils->DoOneToMany(user->uuid, command, params);
}
}
if (IS_LOCAL(source))
{
std::deque<std::string> params;
- params.push_back(dest->nick);
+ params.push_back(dest->uuid);
params.push_back(channel->name);
- Utils->DoOneToMany(source->nick,"INVITE",params);
+ Utils->DoOneToMany(source->uuid,"INVITE",params);
}
}
std::deque<std::string> params;
params.push_back(chan->name);
params.push_back(":"+topic);
- Utils->DoOneToMany(user->nick,"TOPIC",params);
+ Utils->DoOneToMany(user->uuid,"TOPIC",params);
}
void ModuleSpanningTree::OnWallops(userrec* user, const std::string &text)
{
std::deque<std::string> params;
params.push_back(":"+text);
- Utils->DoOneToMany(user->nick,"WALLOPS",params);
+ Utils->DoOneToMany(user->uuid,"WALLOPS",params);
}
}
{
std::deque<std::string> params;
params.clear();
- params.push_back(d->nick);
+ params.push_back(d->uuid);
params.push_back(":"+text);
- Utils->DoOneToOne(user->nick,"NOTICE",params,d->server);
+ Utils->DoOneToOne(user->uuid,"NOTICE",params,d->server);
}
}
else if (target_type == TYPE_CHANNEL)
{
TreeSocket* Sock = i->second->GetSocket();
if (Sock)
- Sock->WriteLine(":"+std::string(user->nick)+" NOTICE "+cname+" :"+text);
+ Sock->WriteLine(":"+std::string(user->uuid)+" NOTICE "+cname+" :"+text);
}
}
}
std::deque<std::string> par;
par.push_back(target);
par.push_back(":"+text);
- Utils->DoOneToMany(user->nick,"NOTICE",par);
+ Utils->DoOneToMany(user->uuid,"NOTICE",par);
}
}
}
{
std::deque<std::string> params;
params.clear();
- params.push_back(d->nick);
+ params.push_back(d->uuid);
params.push_back(":"+text);
- Utils->DoOneToOne(user->nick,"PRIVMSG",params,d->server);
+ Utils->DoOneToOne(user->uuid,"PRIVMSG",params,d->server);
}
}
else if (target_type == TYPE_CHANNEL)
{
TreeSocket* Sock = i->second->GetSocket();
if (Sock)
- Sock->WriteLine(":"+std::string(user->nick)+" PRIVMSG "+cname+" :"+text);
+ Sock->WriteLine(":"+std::string(user->uuid)+" PRIVMSG "+cname+" :"+text);
}
}
}
std::deque<std::string> par;
par.push_back(target);
par.push_back(":"+text);
- Utils->DoOneToMany(user->nick,"PRIVMSG",par);
+ Utils->DoOneToMany(user->uuid,"PRIVMSG",par);
}
}
}
// new joining permissions for the user.
params.push_back(channel->name);
params.push_back(ConvToStr(channel->age));
- params.push_back(std::string(channel->GetAllPrefixChars(user))+","+std::string(user->nick));
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"FJOIN",params);
+ params.push_back(std::string(channel->GetAllPrefixChars(user))+","+std::string(user->uuid));
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
/* First user in, sync the modes for the channel */
params.pop_back();
params.push_back(channel->ChanModes(true));
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"FMODE",params);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",params);
}
else
{
std::deque<std::string> params;
params.push_back(channel->name);
params.push_back(ConvToStr(channel->age));
- Utils->DoOneToMany(user->nick,"JOIN",params);
+ Utils->DoOneToMany(user->uuid,"JOIN",params);
}
}
}
return;
std::deque<std::string> params;
params.push_back(newhost);
- Utils->DoOneToMany(user->nick,"FHOST",params);
+ Utils->DoOneToMany(user->uuid,"FHOST",params);
}
void ModuleSpanningTree::OnChangeName(userrec* user, const std::string &gecos)
return;
std::deque<std::string> params;
params.push_back(gecos);
- Utils->DoOneToMany(user->nick,"FNAME",params);
+ Utils->DoOneToMany(user->uuid,"FNAME",params);
}
void ModuleSpanningTree::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent)
params.push_back(channel->name);
if (!partmessage.empty())
params.push_back(":"+partmessage);
- Utils->DoOneToMany(user->nick,"PART",params);
+ Utils->DoOneToMany(user->uuid,"PART",params);
}
}
{
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(user->nick);
params.push_back(user->host);
params.push_back("+"+std::string(user->FormatModes()));
params.push_back(user->GetIPString());
params.push_back(":"+std::string(user->fullname));
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"NICK",params);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params);
// User is Local, change needs to be reflected!
TreeServer* SourceServer = Utils->FindServer(user->server);
if (SourceServer)
if (oper_message != reason)
{
params.push_back(":"+oper_message);
- Utils->DoOneToMany(user->nick,"OPERQUIT",params);
+ Utils->DoOneToMany(user->uuid,"OPERQUIT",params);
}
params.clear();
params.push_back(":"+reason);
- Utils->DoOneToMany(user->nick,"QUIT",params);
+ Utils->DoOneToMany(user->uuid,"QUIT",params);
}
// Regardless, We need to modify the user Counts..
TreeServer* SourceServer = Utils->FindServer(user->server);
{
std::deque<std::string> params;
params.push_back(user->nick);
- Utils->DoOneToMany(oldnick,"NICK",params);
+
+ /** IMPORTANT: We don't update the TS if the oldnick is just a case change of the newnick!
+ */
+ if (irc::string(user->nick) != assign(oldnick))
+ user->age = ServerInstance->Time(true);
+
+ params.push_back(ConvToStr(user->age));
+ Utils->DoOneToMany(user->uuid,"NICK",params);
}
}
{
std::deque<std::string> params;
params.push_back(chan->name);
- params.push_back(user->nick);
+ params.push_back(user->uuid);
params.push_back(":"+reason);
- Utils->DoOneToMany(source->nick,"KICK",params);
+ Utils->DoOneToMany(source->uuid,"KICK",params);
}
else if (!source)
{
std::deque<std::string> params;
params.push_back(chan->name);
- params.push_back(user->nick);
+ params.push_back(user->uuid);
params.push_back(":"+reason);
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"KICK",params);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(),"KICK",params);
}
}
{
std::deque<std::string> params;
params.push_back(":"+reason);
- Utils->DoOneToMany(dest->nick,"OPERQUIT",params);
+ Utils->DoOneToMany(dest->uuid,"OPERQUIT",params);
params.clear();
- params.push_back(dest->nick);
+ params.push_back(dest->uuid);
params.push_back(":"+reason);
dest->SetOperQuit(operreason);
- Utils->DoOneToMany(source->nick,"KILL",params);
+ Utils->DoOneToMany(source->uuid,"KILL",params);
}
void ModuleSpanningTree::OnRehash(userrec* user, const std::string ¶meter)
{
std::deque<std::string> params;
params.push_back(parameter);
- Utils->DoOneToMany(user ? user->nick : ServerInstance->Config->ServerName, "REHASH", params);
+ Utils->DoOneToMany(user ? user->nick : ServerInstance->Config->GetSID(), "REHASH", params);
// check for self
if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameter))
{
{
std::deque<std::string> params;
params.push_back(opertype);
- Utils->DoOneToMany(user->nick,"OPERTYPE",params);
+ Utils->DoOneToMany(user->uuid,"OPERTYPE",params);
}
}
(unsigned long)duration, reason.c_str());
std::deque<std::string> params;
params.push_back(data);
- Utils->DoOneToMany(ServerInstance->Config->ServerName, "ADDLINE", params);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ADDLINE", params);
}
else
{
params.push_back(host);
params.push_back(sduration);
params.push_back(":"+reason);
- Utils->DoOneToMany(source->nick,stype,params);
+ Utils->DoOneToMany(source->uuid,stype,params);
}
else
{
std::deque<std::string> params;
params.push_back(host);
- Utils->DoOneToMany(source->nick,stype,params);
+ Utils->DoOneToMany(source->uuid,stype,params);
}
}
}
{
std::deque<std::string> params;
std::string command;
+ std::string output_text;
+
+ ServerInstance->Parser->TranslateUIDs(TR_SPACENICKLIST, text, output_text);
if (target_type == TYPE_USER)
{
userrec* u = (userrec*)dest;
- params.push_back(u->nick);
- params.push_back(text);
+ params.push_back(u->uuid);
+ params.push_back(output_text);
command = "MODE";
}
else
chanrec* c = (chanrec*)dest;
params.push_back(c->name);
params.push_back(ConvToStr(c->age));
- params.push_back(text);
+ params.push_back(output_text);
command = "FMODE";
}
- Utils->DoOneToMany(user->nick, command, params);
+
+ Utils->DoOneToMany(user->uuid, command, params);
}
}
{
std::deque<std::string> params;
params.push_back(":"+std::string(user->awaymsg));
- Utils->DoOneToMany(user->nick,"AWAY",params);
+ Utils->DoOneToMany(user->uuid,"AWAY",params);
}
}
{
std::deque<std::string> params;
params.clear();
- Utils->DoOneToMany(user->nick,"AWAY",params);
+ Utils->DoOneToMany(user->uuid,"AWAY",params);
}
}
void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline)
{
TreeSocket* s = (TreeSocket*)opaque;
+ std::string output_text;
+
+ ServerInstance->Parser->TranslateUIDs(TR_SPACENICKLIST, modeline, output_text);
+
if (target)
{
if (target_type == TYPE_USER)
{
userrec* u = (userrec*)target;
- s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" FMODE "+u->nick+" "+ConvToStr(u->age)+" "+modeline);
+ s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+u->uuid+" "+ConvToStr(u->age)+" "+output_text);
}
else
{
chanrec* c = (chanrec*)target;
- s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+modeline);
+ s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text);
}
}
}
if (target_type == TYPE_USER)
{
userrec* u = (userrec*)target;
- s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" METADATA "+u->nick+" "+extname+" :"+extdata);
+ s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
}
else if (target_type == TYPE_CHANNEL)
{
chanrec* c = (chanrec*)target;
- s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" METADATA "+c->name+" "+extname+" :"+extdata);
+ s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata);
}
}
if (target_type == TYPE_OTHER)
{
- s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" METADATA * "+extname+" :"+extdata);
+ s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
}
}
if (params->size() < 3)
return;
(*params)[2] = ":" + (*params)[2];
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"METADATA",*params);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(),"METADATA",*params);
}
else if (event->GetEventID() == "send_topic")
{
(*params)[1] = ":" + (*params)[1];
params->insert(params->begin() + 1,ServerInstance->Config->ServerName);
params->insert(params->begin() + 1,ConvToStr(ServerInstance->Time(true)));
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"FTOPIC",*params);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC",*params);
}
else if (event->GetEventID() == "send_mode")
{
return;
// Insert the TS value of the object, either userrec or chanrec
time_t ourTS = 0;
+ std::string output_text;
+
+ /* Warning: in-place translation is only safe for type TR_NICK */
+ for (size_t n = 0; n < params->size(); n++)
+ ServerInstance->Parser->TranslateUIDs(TR_NICK, (*params)[n], (*params)[n]);
+
userrec* a = ServerInstance->FindNick((*params)[0]);
if (a)
{
ourTS = a->age;
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"MODE",*params);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",*params);
return;
}
else
{
ourTS = a->age;
params->insert(params->begin() + 1,ConvToStr(ourTS));
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"FMODE",*params);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",*params);
}
}
}
{
if (params->size() < 2)
return;
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"MODE",*params);
+ std::string output_text;
+
+ /* Warning: in-place translation is only safe for type TR_NICK */
+ for (size_t n = 0; n < params->size(); n++)
+ ServerInstance->Parser->TranslateUIDs(TR_NICK, (*params)[n], (*params)[n]);
+
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",*params);
}
else if (event->GetEventID() == "send_opers")
{
if (params->size() < 1)
return;
(*params)[0] = ":" + (*params)[0];
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"OPERNOTICE",*params);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(),"OPERNOTICE",*params);
}
else if (event->GetEventID() == "send_modeset")
{
if (params->size() < 2)
return;
(*params)[1] = ":" + (*params)[1];
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"MODENOTICE",*params);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODENOTICE",*params);
}
else if (event->GetEventID() == "send_snoset")
{
if (params->size() < 2)
return;
(*params)[1] = ":" + (*params)[1];
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"SNONOTICE",*params);
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(),"SNONOTICE",*params);
}
else if (event->GetEventID() == "send_push")
{
if (!a)
return;
-
+
+ (*params)[0] = a->uuid;
(*params)[1] = ":" + (*params)[1];
- Utils->DoOneToOne(ServerInstance->Config->ServerName, "PUSH", *params, a->server);
+ Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", *params, a->server);
}
}
projects / user / henk / code / inspircd.git / blobdiff