using namespace std;
-#include <stdio.h>
-#include <vector>
-#include <deque>
-#include "globals.h"
-#include "inspircd_config.h"
-#include "hash_map.h"
#include "configreader.h"
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "commands.h"
#include "commands/cmd_whois.h"
#include "commands/cmd_stats.h"
#include "socket.h"
-
#include "inspircd.h"
#include "wildcard.h"
-#include "inspstring.h"
-#include "hashcomp.h"
#include "xline.h"
-#include "typedefs.h"
#include "cull_list.h"
#include "aes.h"
{
VersionString = "";
UserCount = OperCount = 0;
- this->SetNextPingTime(time(NULL) + 120);
+ this->SetNextPingTime(time(NULL) + 60);
this->SetPingFlag();
/* find the 'route' for this server (e.g. the one directly connected
if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameters[0]))
{
/* Yes, initiate the given connect */
- ServerInstance->WriteOpers("*** Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick,parameters[0],parameters[1]);
+ ServerInstance->SNO->WriteToSnoMask('l',"Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick,parameters[0],parameters[1]);
const char* para[1];
para[0] = parameters[1];
Creator->OnPreCommand("CONNECT", para, 1, user, true);
AES* ctx_in;
AES* ctx_out;
unsigned int keylength;
-
+ std::string ModuleList;
+ std::map<std::string,std::string> CapKeys;
+
public:
/* Because most of the I/O gubbins are encapsulated within
keylength = key.length();
if (!(keylength == 16 || keylength == 24 || keylength == 32))
{
- this->Instance->WriteOpers("*** \2ERROR\2: Key length for encryptionkey is not 16, 24 or 32 bytes in length!");
+ this->Instance->SNO->WriteToSnoMask('l',"\2ERROR\2: Key length for encryptionkey is not 16, 24 or 32 bytes in length!");
ServerInstance->Log(DEBUG,"Key length not 16, 24 or 32 characters!");
}
else
{
- this->Instance->WriteOpers("*** \2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str());
+ this->Instance->SNO->WriteToSnoMask('l',"\2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str());
ctx_in->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", keylength, keylength);
ctx_out->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
{
if (x->Name == this->myhost)
{
- this->Instance->WriteOpers("*** Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] established.");
+ this->Instance->SNO->WriteToSnoMask('l',"Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] established.");
this->SendCapabilities();
if (x->EncryptionKey != "")
{
if (!(x->EncryptionKey.length() == 16 || x->EncryptionKey.length() == 24 || x->EncryptionKey.length() == 32))
{
- this->Instance->WriteOpers("\2WARNING\2: Your encryption key is NOT 16, 24 or 32 characters in length, encryption will \2NOT\2 be enabled.");
+ this->Instance->SNO->WriteToSnoMask('l',"\2WARNING\2: Your encryption key is NOT 16, 24 or 32 characters in length, encryption will \2NOT\2 be enabled.");
}
else
{
* If that happens the connection hangs here until it's closed. Unlikely
* and rather harmless.
*/
- this->Instance->WriteOpers("*** Connection to \2"+myhost+"\2 lost link tag(!)");
+ this->Instance->SNO->WriteToSnoMask('l',"Connection to \2"+myhost+"\2 lost link tag(!)");
return true;
}
*/
if (e == I_ERR_CONNECT)
{
- this->Instance->WriteOpers("*** Connection failed: Connection refused");
+ this->Instance->SNO->WriteToSnoMask('l',"Connection failed: Connection refused");
}
}
void SendCapabilities()
{
- this->WriteLine("CAPAB "+MyCapabilities());
+ irc::commasepstream modulelist(MyCapabilities());
+
+ this->WriteLine("CAPAB START");
+
+ /* Send module names, split at 509 length */
+ std::string item = "*";
+ std::string line = "CAPAB MODULES ";
+ while ((item = modulelist.GetToken()) != "")
+ {
+ if (line.length() + item.length() + 1 > 509)
+ {
+ this->WriteLine(line);
+ line = "CAPAB MODULES ";
+ }
+
+ if (line != "CAPAB MODULES ")
+ line.append(",");
+
+ line.append(item);
+ }
+ if (line != "CAPAB MODULES ")
+ this->WriteLine(line);
+
+ int ip6 = 0;
+ int ip6support = 0;
+#ifdef IPV6
+ ip6 = 1;
+#endif
+#ifdef SUPPORT_IP6LINKS
+ ip6support = 1;
+#endif
+ this->WriteLine("CAPAB CAPABILITIES :NICKMAX="+ConvToStr(NICKMAX)+" HALFOP="+ConvToStr(this->Instance->Config->AllowHalfop)+" CHANMAX="+ConvToStr(CHANMAX)+" MAXMODES="+ConvToStr(MAXMODES)+" IDENTMAX="+ConvToStr(IDENTMAX)+" MAXQUIT="+ConvToStr(MAXQUIT)+" MAXTOPIC="+ConvToStr(MAXTOPIC)+" MAXKICK="+ConvToStr(MAXKICK)+" MAXGECOS="+ConvToStr(MAXGECOS)+" MAXAWAY="+ConvToStr(MAXAWAY)+" IP6NATIVE="+ConvToStr(ip6)+" IP6SUPPORT="+ConvToStr(ip6support));
+
+ this->WriteLine("CAPAB END");
+ }
+
+ /* Check a comma seperated list for an item */
+ bool HasItem(const std::string &list, const std::string &item)
+ {
+ irc::commasepstream seplist(list);
+
+ std::string item2 = "*";
+ while ((item2 = seplist.GetToken()) != "")
+ {
+ if (item2 == item)
+ return true;
+ }
+
+ return false;
+ }
+
+ /* Isolate and return the elements that are different between two comma seperated lists */
+ std::string ListDifference(const std::string &one, const std::string &two)
+ {
+ irc::commasepstream list_one(one);
+ std::string item = "*";
+ std::string result = "";
+ while ((item = list_one.GetToken()) != "")
+ {
+ if (!HasItem(two, item))
+ {
+ result.append(" ");
+ result.append(item);
+ }
+ }
+ return result;
}
bool Capab(std::deque<std::string> params)
{
- if (params.size() != 1)
+ if (params.size() < 1)
{
- this->WriteLine("ERROR :Invalid number of parameters for CAPAB");
+ this->WriteLine("ERROR :Invalid number of parameters for CAPAB - Mismatched version");
return false;
}
- if (params[0] != this->MyCapabilities())
+ if (params[0] == "START")
+ {
+ this->ModuleList = "";
+ this->CapKeys.clear();
+ }
+ else if (params[0] == "END")
{
- std::string quitserver = this->myhost;
- if (this->InboundServerName != "")
+ std::string reason = "";
+ int ip6support = 0;
+#ifdef SUPPORT_IP6LINKS
+ ip6support = 1;
+#endif
+ /* Compare ModuleList and check CapKeys...
+ * Maybe this could be tidier? -- Brain
+ */
+ if ((this->ModuleList != this->MyCapabilities()) && (this->ModuleList.length()))
{
- quitserver = this->InboundServerName;
+ std::string diff = ListDifference(this->ModuleList, this->MyCapabilities());
+ if (!diff.length())
+ {
+ diff = "your server:" + ListDifference(this->MyCapabilities(), this->ModuleList);
+ }
+ else
+ {
+ diff = "this server:" + diff;
+ }
+ if (diff.length() == 12)
+ reason = "Module list in CAPAB is not alphabetically ordered, cannot compare lists.";
+ else
+ reason = "Modules loaded on these servers are not correctly matched, these modules are not loaded on " + diff;
}
- this->Instance->WriteOpers("*** \2ERROR\2: Server '%s' does not have the same set of modules loaded, cannot link!",quitserver.c_str());
- this->Instance->WriteOpers("*** Our networked module set is: '%s'",this->MyCapabilities().c_str());
- this->Instance->WriteOpers("*** Other server's networked module set is: '%s'",params[0].c_str());
- this->Instance->WriteOpers("*** These lists must match exactly on both servers. Please correct these errors, and try again.");
- this->WriteLine("ERROR :CAPAB mismatch; My capabilities: '"+this->MyCapabilities()+"'");
- return false;
+ if (((this->CapKeys.find("IP6SUPPORT") == this->CapKeys.end()) && (ip6support)) || ((this->CapKeys.find("IP6SUPPORT") != this->CapKeys.end()) && (this->CapKeys.find("IP6SUPPORT")->second != ConvToStr(ip6support))))
+ reason = "We don't both support linking to IPV6 servers";
+
+ if (((this->CapKeys.find("IP6NATIVE") != this->CapKeys.end()) && (this->CapKeys.find("IP6NATIVE")->second == "1")) && (!ip6support))
+ reason = "The remote server is IPV6 native, and we don't support linking to IPV6 servers";
+
+ if (((this->CapKeys.find("NICKMAX") == this->CapKeys.end()) || ((this->CapKeys.find("NICKMAX") != this->CapKeys.end()) && (this->CapKeys.find("NICKMAX")->second != ConvToStr(NICKMAX)))))
+ reason = "Maximum nickname lengths differ or remote nickname length not specified";
+
+ 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";
+
+ if (((this->CapKeys.find("IDENTMAX") == this->CapKeys.end()) || ((this->CapKeys.find("IDENTMAX") != this->CapKeys.end()) && (this->CapKeys.find("IDENTMAX")->second != ConvToStr(IDENTMAX)))))
+ reason = "Maximum ident lengths differ or remote ident length not specified";
+
+ if (((this->CapKeys.find("CHANMAX") == this->CapKeys.end()) || ((this->CapKeys.find("CHANMAX") != this->CapKeys.end()) && (this->CapKeys.find("CHANMAX")->second != ConvToStr(CHANMAX)))))
+ reason = "Maximum channel lengths differ or remote channel length not specified";
+
+ if (((this->CapKeys.find("MAXMODES") == this->CapKeys.end()) || ((this->CapKeys.find("MAXMODES") != this->CapKeys.end()) && (this->CapKeys.find("MAXMODES")->second != ConvToStr(MAXMODES)))))
+ reason = "Maximum modes per line differ or remote modes per line not specified";
+
+ if (((this->CapKeys.find("MAXQUIT") == this->CapKeys.end()) || ((this->CapKeys.find("MAXQUIT") != this->CapKeys.end()) && (this->CapKeys.find("MAXQUIT")->second != ConvToStr(MAXQUIT)))))
+ reason = "Maximum quit lengths differ or remote quit length not specified";
+
+ if (((this->CapKeys.find("MAXTOPIC") == this->CapKeys.end()) || ((this->CapKeys.find("MAXTOPIC") != this->CapKeys.end()) && (this->CapKeys.find("MAXTOPIC")->second != ConvToStr(MAXTOPIC)))))
+ reason = "Maximum topic lengths differ or remote topic length not specified";
+
+ if (((this->CapKeys.find("MAXKICK") == this->CapKeys.end()) || ((this->CapKeys.find("MAXKICK") != this->CapKeys.end()) && (this->CapKeys.find("MAXKICK")->second != ConvToStr(MAXKICK)))))
+ reason = "Maximum kick lengths differ or remote kick length not specified";
+
+ if (((this->CapKeys.find("MAXGECOS") == this->CapKeys.end()) || ((this->CapKeys.find("MAXGECOS") != this->CapKeys.end()) && (this->CapKeys.find("MAXGECOS")->second != ConvToStr(MAXGECOS)))))
+ reason = "Maximum GECOS (fullname) lengths differ or remote GECOS length not specified";
+
+ if (((this->CapKeys.find("MAXAWAY") == this->CapKeys.end()) || ((this->CapKeys.find("MAXAWAY") != this->CapKeys.end()) && (this->CapKeys.find("MAXAWAY")->second != ConvToStr(MAXAWAY)))))
+ reason = "Maximum awaymessage lengths differ or remote awaymessage length not specified";
+
+ if (reason.length())
+ {
+ this->WriteLine("ERROR :CAPAB negotiation failed: "+reason);
+ return false;
+ }
+ }
+ else if ((params[0] == "MODULES") && (params.size() == 2))
+ {
+ if (!this->ModuleList.length())
+ {
+ this->ModuleList.append(params[1]);
+ }
+ else
+ {
+ this->ModuleList.append(",");
+ this->ModuleList.append(params[1]);
+ }
+ }
+ else if ((params[0] == "CAPABILITIES") && (params.size() == 2))
+ {
+ irc::tokenstream capabs(params[1]);
+ std::string item = "*";
+ while ((item = capabs.GetToken()) != "")
+ {
+ /* Process each key/value pair */
+ std::string::size_type equals = item.rfind('=');
+ if (equals != std::string::npos)
+ {
+ std::string var = item.substr(0, equals);
+ std::string value = item.substr(equals+1, item.length());
+ this->Instance->Log(DEBUG,"Key='%s' Value='%s'",var.c_str(),value.c_str());
+ CapKeys[var] = value;
+ }
+ }
}
return true;
while (item != "")
{
item = users.GetToken();
- /* process one channel at a time, applying modes. */
+ /* process one user at a time, applying modes. */
char* usr = (char*)item.c_str();
/* Safety check just to make sure someones not sent us an FJOIN full of spaces
* (is this even possible?) */
else
{
this->Instance->WriteOpers("ERROR: We received a user with an unknown prefix '%c'. Closed connection to avoid a desync.",mh->GetPrefix());
- this->WriteLine(std::string("ERROR :What?! You sent me a mode prefix i cant handle ('")+mh->GetModeChar()+"'). Closing connection to avoid desync.");
+ this->WriteLine(std::string("ERROR :Invalid prefix '")+mh->GetModeChar()+"' in FJOIN");
return false;
}
usr++;
/* Did they get any modes? How many times? */
for (int k = 0; k < ntimes; k++)
- mode_users[modectr++] = usr;
+ mode_users[modectr++] = strdup(usr); // XXX
who = this->Instance->FindNick(usr);
if (who)
DoOneToMany(this->Instance->Config->ServerName,"FMODE",params);
}
strcpy(mode_users[1],"+");
+ for (unsigned int f = 2; f < modectr; f++)
+ free(mode_users[f]);
modectr = 2;
}
}
+ else
+ {
+ for (unsigned int f = 2; f < modectr; f++)
+ free(mode_users[f]);
+
+ this->WriteLine("ERROR :Invalid user '"+std::string(usr)+"' in FJOIN to '"+channel+"'");
+ return false;
+ }
}
}
/* there werent enough modes built up to flush it during FJOIN,
}
DoOneToMany(this->Instance->Config->ServerName,"FMODE",params);
}
+
+ for (unsigned int f = 2; f < modectr; f++)
+ free(mode_users[f]);
}
return true;
}
/* This used to have a pretty craq'y loop doing the same thing,
* now we just let the STL do the hard work (more efficiently)
*/
- params[5] = params[5].substr(params[5].find_first_not_of('+'));
+ std::string::size_type pos_after_plus = params[5].find_first_not_of('+');
+ if (pos_after_plus != std::string::npos)
+ params[5] = params[5].substr(pos_after_plus);
const char* tempnick = params[1].c_str();
ServerInstance->Log(DEBUG,"Introduce client %s!%s@%s",tempnick,params[4].c_str(),params[2].c_str());
for (std::string::iterator v = params[5].begin(); v != params[5].end(); v++)
_new->modes[(*v)-65] = 1;
+#ifdef SUPPORT_IP6LINKS
if (params[6].find_first_of(":") != std::string::npos)
_new->SetSockAddr(AF_INET6, params[6].c_str(), 0);
else
+#endif
_new->SetSockAddr(AF_INET, params[6].c_str(), 0);
- this->Instance->WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",_new->server,_new->nick,_new->ident,_new->host, _new->GetIPString());
+ this->Instance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s]",_new->server,_new->nick,_new->ident,_new->host, _new->GetIPString());
params[7] = ":" + params[7];
DoOneToAllButSender(source,"NICK",params,source);
std::string endburst = "ENDBURST";
// Because by the end of the netburst, it could be gone!
std::string name = s->GetName();
- this->Instance->WriteOpers("*** Bursting to \2"+name+"\2.");
+ this->Instance->SNO->WriteToSnoMask('l',"Bursting to \2"+name+"\2.");
this->WriteLine(burst);
/* send our version string */
this->WriteLine(std::string(":")+this->Instance->Config->ServerName+" VERSION :"+this->Instance->GetVersionString());
this->SendXLines(s);
FOREACH_MOD_I(this->Instance,I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)TreeProtocolModule,(void*)this));
this->WriteLine(endburst);
- this->Instance->WriteOpers("*** Finished bursting to \2"+name+"\2.");
+ this->Instance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+name+"\2.");
}
/* This function is called when we receive data from a remote
{
if (params.size() < 1)
return false;
- this->Instance->WriteOpers("*** ERROR from %s: %s",(InboundServerName != "" ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str());
+ this->Instance->SNO->WriteToSnoMask('l',"ERROR from %s: %s",(InboundServerName != "" ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str());
/* we will return false to cause the socket to close. */
return false;
}
+ /* remote MOTD. leet, huh? */
+ bool Motd(std::string prefix, std::deque<std::string> ¶ms)
+ {
+ if (params.size() > 0)
+ {
+ if (this->Instance->MatchText(this->Instance->Config->ServerName, params[0]))
+ {
+ /* It's for our server */
+ string_list results;
+ userrec* source = this->Instance->FindNick(prefix);
+
+ if (source)
+ {
+ std::deque<std::string> par;
+ par.push_back(prefix);
+ par.push_back("");
+
+ if (!ServerInstance->Config->MOTD.size())
+ {
+ par[1] = std::string("::")+ServerInstance->Config->ServerName+" 422 "+source->nick+" :Message of the day file is missing.";
+ DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ return true;
+ }
+
+ par[1] = std::string("::")+ServerInstance->Config->ServerName+" 375 "+source->nick+" :"+ServerInstance->Config->ServerName+" message of the day";
+ DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+
+ for (unsigned int i = 0; i < ServerInstance->Config->MOTD.size(); i++)
+ {
+ par[1] = std::string("::")+ServerInstance->Config->ServerName+" 372 "+source->nick+" :- "+ServerInstance->Config->MOTD[i];
+ DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ }
+
+ par[1] = std::string("::")+ServerInstance->Config->ServerName+" 376 "+source->nick+" End of message of the day.";
+ DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ }
+ }
+ else
+ {
+ /* Pass it on */
+ userrec* source = this->Instance->FindNick(prefix);
+ if (source)
+ DoOneToOne(prefix, "MOTD", params, params[0]);
+ }
+ }
+ return true;
+ }
+
+ /* remote ADMIN. leet, huh? */
+ bool Admin(std::string prefix, std::deque<std::string> ¶ms)
+ {
+ if (params.size() > 0)
+ {
+ if (this->Instance->MatchText(this->Instance->Config->ServerName, params[0]))
+ {
+ /* It's for our server */
+ string_list results;
+ userrec* source = this->Instance->FindNick(prefix);
+
+ if (source)
+ {
+ std::deque<std::string> par;
+ par.push_back(prefix);
+ par.push_back("");
+
+ par[1] = std::string("::")+ServerInstance->Config->ServerName+" 256 "+source->nick+" :Administrative info for "+ServerInstance->Config->ServerName;
+ DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+
+ par[1] = std::string("::")+ServerInstance->Config->ServerName+" 257 "+source->nick+" :Name - "+ServerInstance->Config->AdminName;
+ DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+
+ par[1] = std::string("::")+ServerInstance->Config->ServerName+" 258 "+source->nick+" :Nickname - "+ServerInstance->Config->AdminNick;
+ DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+
+ par[1] = std::string("::")+ServerInstance->Config->ServerName+" 258 "+source->nick+" :E-Mail - "+ServerInstance->Config->AdminEmail;
+ DoOneToOne(this->Instance->Config->ServerName, "PUSH",par, source->server);
+ }
+ }
+ else
+ {
+ /* Pass it on */
+ userrec* source = this->Instance->FindNick(prefix);
+ if (source)
+ DoOneToOne(prefix, "ADMIN", params, params[0]);
+ }
+ }
+ return true;
+ }
+
bool Stats(std::string prefix, std::deque<std::string> ¶ms)
{
/* Get the reply to a STATS query if it matches this servername,
if (this->Instance->MatchText(this->Instance->Config->ServerName,servermask))
{
- this->Instance->WriteOpers("*** Remote rehash initiated from server \002"+prefix+"\002.");
+ this->Instance->SNO->WriteToSnoMask('l',"Remote rehash initiated from server \002"+prefix+"\002.");
this->Instance->RehashServer();
ReadConfiguration(false);
}
break;
default:
/* Just in case... */
- this->Instance->WriteOpers("*** \2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!");
+ this->Instance->SNO->WriteToSnoMask('x',"\2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!");
propogate = false;
break;
}
{
if (atoi(params[4].c_str()))
{
- this->Instance->WriteOpers("*** %s Added %cLINE on %s to expire in %lu seconds (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),atoi(params[4].c_str()),params[5].c_str());
+ this->Instance->SNO->WriteToSnoMask('x',"%s Added %cLINE on %s to expire in %lu seconds (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),atoi(params[4].c_str()),params[5].c_str());
}
else
{
- this->Instance->WriteOpers("*** %s Added permenant %cLINE on %s (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),params[5].c_str());
+ this->Instance->SNO->WriteToSnoMask('x',"%s Added permenant %cLINE on %s (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),params[5].c_str());
}
params[5] = ":" + params[5];
DoOneToAllButSender(prefix,"ADDLINE",params,prefix);
if (CheckDupe)
{
this->WriteLine("ERROR :Server "+servername+" already exists!");
- this->Instance->WriteOpers("*** Server connection from \2"+servername+"\2 denied, already exists");
+ this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+servername+"\2 denied, already exists");
return false;
}
TreeServer* Node = new TreeServer(this->Instance,servername,description,ParentOfThis,NULL);
ParentOfThis->AddChild(Node);
params[3] = ":" + params[3];
DoOneToAllButSender(prefix,"SERVER",params,prefix);
- this->Instance->WriteOpers("*** Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")");
+ this->Instance->SNO->WriteToSnoMask('l',"Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")");
return true;
}
if (hops)
{
this->WriteLine("ERROR :Server too far away for authentication");
- this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication");
+ this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server is too far away for authentication");
return false;
}
std::string description = params[3];
if (CheckDupe)
{
this->WriteLine("ERROR :Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!");
- this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
+ this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
return false;
}
// Begin the sync here. this kickstarts the
}
}
this->WriteLine("ERROR :Invalid credentials");
- this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials");
+ this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials");
return false;
}
if (hops)
{
this->WriteLine("ERROR :Server too far away for authentication");
- this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication");
+ this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server is too far away for authentication");
return false;
}
std::string description = params[3];
if (CheckDupe)
{
this->WriteLine("ERROR :Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!");
- this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
+ this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
return false;
}
/* If the config says this link is encrypted, but the remote side
if ((x->EncryptionKey != "") && (!this->ctx_in))
{
this->WriteLine("ERROR :This link requires AES encryption to be enabled. Plaintext connection refused.");
- this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, remote server did not enable AES.");
+ this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, remote server did not enable AES.");
return false;
}
- this->Instance->WriteOpers("*** Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] ("+description+")");
+ this->Instance->SNO->WriteToSnoMask('l',"Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] ("+description+")");
this->InboundServerName = sname;
this->InboundDescription = description;
// this is good. Send our details: Our server name and description and hopcount of 0,
}
}
this->WriteLine("ERROR :Invalid credentials");
- this->Instance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials");
+ this->Instance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials");
return false;
}
}
else if ((this->ctx_in) && (command == "AES"))
{
- this->Instance->WriteOpers("*** \2AES\2: Encryption already enabled on this connection yet %s is trying to enable it twice!",params[0].c_str());
+ this->Instance->SNO->WriteToSnoMask('l',"\2AES\2: Encryption already enabled on this connection yet %s is trying to enable it twice!",params[0].c_str());
}
switch (this->LinkState)
long delta = THEM-time(NULL);
if ((delta < -600) || (delta > 600))
{
- this->Instance->WriteOpers("*** \2ERROR\2: Your clocks are out by %d seconds (this is more than ten minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs(delta));
+ this->Instance->SNO->WriteToSnoMask('l',"\2ERROR\2: Your clocks are out by %d seconds (this is more than ten minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs(delta));
this->WriteLine("ERROR :Your clocks are out by "+ConvToStr(abs(delta))+" seconds (this is more than ten minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
return false;
}
else if ((delta < -60) || (delta > 60))
{
- this->Instance->WriteOpers("*** \2WARNING\2: Your clocks are out by %d seconds, please consider synching your clocks.",abs(delta));
+ this->Instance->SNO->WriteToSnoMask('l',"\2WARNING\2: Your clocks are out by %d seconds, please consider synching your clocks.",abs(delta));
}
}
this->LinkState = CONNECTED;
* When there is activity on the socket, reset the ping counter so
* that we're not wasting bandwidth pinging an active server.
*/
- route_back_again->SetNextPingTime(time(NULL) + 120);
+ route_back_again->SetNextPingTime(time(NULL) + 60);
route_back_again->SetPingFlag();
}
{
return this->Stats(prefix, params);
}
+ else if (command == "MOTD")
+ {
+ return this->Motd(prefix, params);
+ }
+ else if (command == "ADMIN")
+ {
+ return this->Admin(prefix, params);
+ }
else if (command == "SERVER")
{
return this->RemoteServer(prefix,params);
{
sourceserv = this->InboundServerName;
}
- this->Instance->WriteOpers("*** Received end of netburst from \2%s\2",sourceserv.c_str());
+ this->Instance->SNO->WriteToSnoMask('l',"Received end of netburst from \2%s\2",sourceserv.c_str());
return true;
}
else
{
if (this->LinkState == CONNECTING)
{
- this->Instance->WriteOpers("*** CONNECT: Connection to \002"+myhost+"\002 timed out.");
+ this->Instance->SNO->WriteToSnoMask('l',"CONNECT: Connection to \002"+myhost+"\002 timed out.");
}
}
}
}
TreeSocket* s = new TreeSocket(this->Instance, newsock, ip);
- this->Instance->AddSocket(s);
+ s = s; /* Whinge whinge whinge, thats all GCC ever does. */
return true;
}
};
if (newsocket->GetFd() > -1)
{
/* We're all OK */
- ServerInstance->AddSocket(newsocket);
}
else
{
/* Something barfed, show the opers */
- ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno));
+ ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno));
delete newsocket;
}
}
void OnError(ResolverError e, const std::string &errormessage)
{
/* Ooops! */
- ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s",MyLink.Name.c_str(),errormessage.c_str());
+ ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s",MyLink.Name.c_str(),errormessage.c_str());
}
};
TreeSocket* listener = new TreeSocket(ServerInstance, IP.c_str(),Port,true,10);
if (listener->GetState() == I_LISTENING)
{
- ServerInstance->AddSocket(listener);
Bindings.push_back(listener);
}
else
L.HiddenFromStats = Conf->ReadFlag("link","hidden",j);
L.NextConnectTime = time(NULL) + L.AutoConnect;
/* Bugfix by brain, do not allow people to enter bad configurations */
- if ((L.IPAddr != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port))
+ if (L.Name != ServerInstance->Config->ServerName)
{
- ValidIPs.push_back(L.IPAddr);
+ if ((L.IPAddr != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port))
+ {
+ ValidIPs.push_back(L.IPAddr);
- if (Allow.length())
- ValidIPs.push_back(Allow);
+ if (Allow.length())
+ ValidIPs.push_back(Allow);
+
+ /* Needs resolving */
+ insp_inaddr binip;
+ if (insp_aton(L.IPAddr.c_str(), &binip) < 1)
+ {
+ try
+ {
+ SecurityIPResolver* sr = new SecurityIPResolver(ServerInstance, L.IPAddr, L);
+ ServerInstance->AddResolver(sr);
+ }
+ catch (ModuleException& e)
+ {
+ ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
+ }
+ }
- /* Needs resolving */
- insp_inaddr binip;
- if (insp_aton(L.IPAddr.c_str(), &binip) < 1)
+ LinkBlocks.push_back(L);
+ ServerInstance->Log(DEBUG,"m_spanningtree: Read server %s with host %s:%d",L.Name.c_str(),L.IPAddr.c_str(),L.Port);
+ }
+ else
{
- try
+ if (L.IPAddr == "")
{
- SecurityIPResolver* sr = new SecurityIPResolver(ServerInstance, L.IPAddr, L);
- ServerInstance->AddResolver(sr);
+ ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', IP address not defined!",L.Name.c_str());
}
- catch (ModuleException& e)
+ else if (L.RecvPass == "")
{
- ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
+ ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', recvpass not defined!",L.Name.c_str());
+ }
+ else if (L.SendPass == "")
+ {
+ ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', sendpass not defined!",L.Name.c_str());
+ }
+ else if (L.Name == "")
+ {
+ ServerInstance->Log(DEFAULT,"Invalid configuration, link tag without a name!");
+ }
+ else if (!L.Port)
+ {
+ ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', no port specified!",L.Name.c_str());
}
}
-
- LinkBlocks.push_back(L);
- ServerInstance->Log(DEBUG,"m_spanningtree: Read server %s with host %s:%d",L.Name.c_str(),L.IPAddr.c_str(),L.Port);
}
else
{
- if (L.IPAddr == "")
- {
- ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', IP address not defined!",L.Name.c_str());
- }
- else if (L.RecvPass == "")
- {
- ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', recvpass not defined!",L.Name.c_str());
- }
- else if (L.SendPass == "")
- {
- ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', sendpass not defined!",L.Name.c_str());
- }
- else if (L.Name == "")
- {
- ServerInstance->Log(DEFAULT,"Invalid configuration, link tag without a name!");
- }
- else if (!L.Port)
- {
- ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', no port specified!",L.Name.c_str());
- }
+ ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', link tag has the same server name as the local server!",L.Name.c_str());
}
}
DELETE(Conf);
}
}
+ int HandleMotd(const char** parameters, int pcnt, userrec* user)
+ {
+ if (pcnt > 0)
+ {
+ /* Remote MOTD, the server is within the 1st parameter */
+ std::deque<std::string> params;
+ params.push_back(parameters[0]);
+
+ /* Send it out remotely, generate no reply yet */
+ TreeServer* s = FindServerMask(parameters[0]);
+ if (s)
+ {
+ DoOneToOne(user->nick, "MOTD", params, s->GetName());
+ }
+ else
+ {
+ user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
+ }
+ return 1;
+ }
+ return 0;
+ }
+
+ int HandleAdmin(const char** parameters, int pcnt, userrec* user)
+ {
+ if (pcnt > 0)
+ {
+ /* Remote ADMIN, the server is within the 1st parameter */
+ std::deque<std::string> params;
+ params.push_back(parameters[0]);
+
+ /* Send it out remotely, generate no reply yet */
+ TreeServer* s = FindServerMask(parameters[0]);
+ if (s)
+ {
+ DoOneToOne(user->nick, "ADMIN", params, s->GetName());
+ }
+ else
+ {
+ user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
+ }
+ return 1;
+ }
+ return 0;
+ }
+
int HandleStats(const char** parameters, int pcnt, userrec* user)
{
if (pcnt > 1)
if (sock)
{
ServerInstance->Log(DEBUG,"Splitting server %s",s->GetName().c_str());
- ServerInstance->WriteOpers("*** SQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick);
+ ServerInstance->SNO->WriteToSnoMask('l',"SQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick);
sock->Squit(s,"Server quit by "+std::string(user->nick)+"!"+std::string(user->ident)+"@"+std::string(user->host));
- ServerInstance->RemoveSocket(sock);
+ ServerInstance->SE->DelFd(sock);
+ sock->Close();
+ delete sock;
}
else
{
if (serv->AnsweredLastPing())
{
sock->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" PING "+serv->GetName());
- serv->SetNextPingTime(curtime + 120);
+ serv->SetNextPingTime(curtime + 60);
}
else
{
// they didnt answer, boot them
- ServerInstance->WriteOpers("*** Server \002%s\002 pinged out",serv->GetName().c_str());
+ ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 pinged out",serv->GetName().c_str());
sock->Squit(serv,"Ping timeout");
- ServerInstance->RemoveSocket(sock);
+ ServerInstance->SE->DelFd(sock);
+ sock->Close();
+ delete sock;
return;
}
}
if (!CheckDupe)
{
// an autoconnected server is not connected. Check if its time to connect it
- ServerInstance->WriteOpers("*** AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect);
+ ServerInstance->SNO->WriteToSnoMask('l',"AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect);
insp_inaddr binip;
TreeSocket* newsocket = new TreeSocket(ServerInstance, x->IPAddr,x->Port,false,10,x->Name.c_str());
if (newsocket->GetFd() > -1)
{
- ServerInstance->AddSocket(newsocket);
}
else
{
- ServerInstance->WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+ ServerInstance->SNO->WriteToSnoMask('l',"AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
delete newsocket;
}
}
TreeSocket* newsocket = new TreeSocket(ServerInstance,x->IPAddr,x->Port,false,10,x->Name.c_str());
if (newsocket->GetFd() > -1)
{
- ServerInstance->AddSocket(newsocket);
}
else
{
- ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+ ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
delete newsocket;
}
}
results.push_back(std::string(ServerInstance->Config->ServerName)+" 244 "+user->nick+" H * * "+LinkBlocks[i].Name.c_str());
}
results.push_back(std::string(ServerInstance->Config->ServerName)+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
- ServerInstance->WriteOpers("*** Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
+ ServerInstance->SNO->WriteToSnoMask('t',"Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
return 1;
}
return 0;
{
return this->HandleStats(parameters,pcnt,user);
}
+ else if (command == "MOTD")
+ {
+ return this->HandleMotd(parameters,pcnt,user);
+ }
+ else if (command == "ADMIN")
+ {
+ return this->HandleAdmin(parameters,pcnt,user);
+ }
else if (command == "SQUIT")
{
return this->HandleSquit(parameters,pcnt,user);
if (IS_LOCAL(user))
{
chanrec *c = (chanrec*)dest;
- std::string cname = c->name;
- if (status)
- cname = status + cname;
- std::deque<TreeServer*> list;
- GetListOfServersForChannel(c,list);
- unsigned int ucount = list.size();
- for (unsigned int i = 0; i < ucount; i++)
+ if (c)
{
- TreeSocket* Sock = list[i]->GetSocket();
- if (Sock)
- Sock->WriteLine(":"+std::string(user->nick)+" NOTICE "+cname+" :"+text);
+ std::string cname = c->name;
+ if (status)
+ cname = status + cname;
+ std::deque<TreeServer*> list;
+ GetListOfServersForChannel(c,list);
+ unsigned int ucount = list.size();
+ for (unsigned int i = 0; i < ucount; i++)
+ {
+ TreeSocket* Sock = list[i]->GetSocket();
+ if (Sock)
+ Sock->WriteLine(":"+std::string(user->nick)+" NOTICE "+cname+" :"+text);
+ }
}
}
}
if (IS_LOCAL(user))
{
chanrec *c = (chanrec*)dest;
- std::string cname = c->name;
- if (status)
- cname = status + cname;
- std::deque<TreeServer*> list;
- GetListOfServersForChannel(c,list);
- unsigned int ucount = list.size();
- for (unsigned int i = 0; i < ucount; i++)
+ if (c)
{
- TreeSocket* Sock = list[i]->GetSocket();
- if (Sock)
- Sock->WriteLine(":"+std::string(user->nick)+" PRIVMSG "+cname+" :"+text);
+ std::string cname = c->name;
+ if (status)
+ cname = status + cname;
+ std::deque<TreeServer*> list;
+ GetListOfServersForChannel(c,list);
+ unsigned int ucount = list.size();
+ for (unsigned int i = 0; i < ucount; i++)
+ {
+ TreeSocket* Sock = list[i]->GetSocket();
+ if (Sock)
+ Sock->WriteLine(":"+std::string(user->nick)+" PRIVMSG "+cname+" :"+text);
+ }
}
}
}
projects / user / henk / code / inspircd.git / blobdiff