X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=d9e18ef80665b6e772f0e704b6a4f5c04769b425;hb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;hp=d4bc5360ec4db8851ea3b9693c8d4415aac56a1a;hpb=5b0b077e2a9a051b93b7837da79351ede361bcd6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index d4bc5360e..d9e18ef80 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -36,7 +36,6 @@ using namespace std; #include "inspircd.h" #include "inspstring.h" #include "hashcomp.h" -#include "message.h" #include "xline.h" #include "typedefs.h" #include "cull_list.h" @@ -65,14 +64,12 @@ using namespace std; * we can resort to recursion to walk the tree structure. */ +using irc::sockets::MatchCIDR; + class ModuleSpanningTree; static ModuleSpanningTree* TreeProtocolModule; -extern ServerConfig* Config; extern InspIRCd* ServerInstance; -extern std::vector modules; -extern std::vector factory; -extern int MODCOUNT; /* Any socket can have one of five states at any one time. * The LISTENER state indicates a socket which is listening @@ -91,10 +88,6 @@ extern int MODCOUNT; */ enum ServerState { LISTENER, CONNECTING, WAIT_AUTH_1, WAIT_AUTH_2, CONNECTED }; -/* We need to import these from the core for use in netbursts */ -extern user_hash clientlist; -extern chan_hash chanlist; - /* Foward declarations */ class TreeServer; class TreeSocket; @@ -139,6 +132,8 @@ extern std::vector pzlines; extern std::vector pqlines; extern std::vector pelines; +std::vector ValidIPs; + class UserManager : public classbase { uid_hash uids; @@ -228,7 +223,7 @@ class TreeServer : public classbase ServerDesc = ""; VersionString = ""; UserCount = OperCount = 0; - VersionString = Srv->GetVersion(); + VersionString = ServerInstance->GetVersionString(); } /* We use this constructor only to create the 'root' item, TreeRoot, which @@ -240,7 +235,7 @@ class TreeServer : public classbase Parent = NULL; VersionString = ""; UserCount = OperCount = 0; - VersionString = Srv->GetVersion(); + VersionString = ServerInstance->GetVersionString(); Route = NULL; Socket = NULL; /* Fix by brain */ AddHashEntry(); @@ -316,7 +311,7 @@ class TreeServer : public classbase log(DEBUG,"Removing all users from server %s",this->ServerName.c_str()); const char* reason_s = reason.c_str(); std::vector time_to_die; - for (user_hash::iterator n = clientlist.begin(); n != clientlist.end(); n++) + for (user_hash::iterator n = ServerInstance->clientlist.begin(); n != ServerInstance->clientlist.end(); n++) { if (!strcmp(n->second->server, this->ServerName.c_str())) { @@ -328,7 +323,7 @@ class TreeServer : public classbase userrec* a = (userrec*)*n; log(DEBUG,"Kill %s fd=%d",a->nick,a->fd); if (!IS_LOCAL(a)) - kill_link(a,reason_s); + userrec::QuitUser(ServerInstance,a,reason_s); } return time_to_die.size(); } @@ -612,12 +607,12 @@ class cmd_rconnect : public command_t void Handle (const char** parameters, int pcnt, userrec *user) { - WriteServ(user->fd,"NOTICE %s :*** RCONNECT: Sending remote connect to \002%s\002 to connect server \002%s\002.",user->nick,parameters[0],parameters[1]); + user->WriteServ("NOTICE %s :*** RCONNECT: Sending remote connect to \002%s\002 to connect server \002%s\002.",user->nick,parameters[0],parameters[1]); /* Is this aimed at our server? */ - if (Srv->MatchText(Srv->GetServerName(),parameters[0])) + if (Srv->MatchText(ServerInstance->Config->ServerName,parameters[0])) { /* Yes, initiate the given connect */ - WriteOpers("*** Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick,parameters[0],parameters[1]); + ServerInstance->WriteOpers("*** 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); @@ -662,8 +657,8 @@ class TreeSocket : public InspSocket * most of the action, and append a few of our own values * to it. */ - TreeSocket(std::string host, int port, bool listening, unsigned long maxtime) - : InspSocket(host, port, listening, maxtime) + TreeSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime) + : InspSocket(SI, host, port, listening, maxtime) { myhost = host; this->LinkState = LISTENER; @@ -671,8 +666,8 @@ class TreeSocket : public InspSocket this->ctx_out = NULL; } - TreeSocket(std::string host, int port, bool listening, unsigned long maxtime, std::string ServerName) - : InspSocket(host, port, listening, maxtime) + TreeSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, std::string ServerName) + : InspSocket(SI, host, port, listening, maxtime) { myhost = ServerName; this->LinkState = CONNECTING; @@ -684,8 +679,8 @@ class TreeSocket : public InspSocket * we must associate it with a socket without creating a new * connection. This constructor is used for this purpose. */ - TreeSocket(int newfd, char* ip) - : InspSocket(newfd, ip) + TreeSocket(InspIRCd* SI, int newfd, char* ip) + : InspSocket(SI, newfd, ip) { this->LinkState = WAIT_AUTH_1; this->ctx_in = NULL; @@ -713,12 +708,12 @@ class TreeSocket : public InspSocket keylength = key.length(); if (!(keylength == 16 || keylength == 24 || keylength == 32)) { - WriteOpers("*** \2ERROR\2: Key length for encryptionkey is not 16, 24 or 32 bytes in length!"); + ServerInstance->WriteOpers("*** \2ERROR\2: Key length for encryptionkey is not 16, 24 or 32 bytes in length!"); log(DEBUG,"Key length not 16, 24 or 32 characters!"); } else { - WriteOpers("*** \2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str()); + ServerInstance->WriteOpers("*** \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\ @@ -741,22 +736,22 @@ class TreeSocket : public InspSocket { if (x->Name == this->myhost) { - Srv->SendOpers("*** Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "" : this->GetIP())+"] established."); + ServerInstance->WriteOpers("*** Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "" : this->GetIP())+"] established."); this->SendCapabilities(); if (x->EncryptionKey != "") { if (!(x->EncryptionKey.length() == 16 || x->EncryptionKey.length() == 24 || x->EncryptionKey.length() == 32)) { - WriteOpers("\2WARNING\2: Your encryption key is NOT 16, 24 or 32 characters in length, encryption will \2NOT\2 be enabled."); + ServerInstance->WriteOpers("\2WARNING\2: Your encryption key is NOT 16, 24 or 32 characters in length, encryption will \2NOT\2 be enabled."); } else { - this->WriteLine("AES "+Srv->GetServerName()); + this->WriteLine(std::string("AES ")+ServerInstance->Config->ServerName); this->InitAES(x->EncryptionKey,x->Name.c_str()); } } /* found who we're supposed to be connecting to, send the neccessary gubbins. */ - this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+Srv->GetServerDescription()); + this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+x->SendPass+" 0 :"+ServerInstance->Config->ServerDesc); return true; } } @@ -766,7 +761,7 @@ class TreeSocket : public InspSocket * If that happens the connection hangs here until it's closed. Unlikely * and rather harmless. */ - Srv->SendOpers("*** Connection to \2"+myhost+"\2 lost link tag(!)"); + ServerInstance->WriteOpers("*** Connection to \2"+myhost+"\2 lost link tag(!)"); return true; } @@ -778,7 +773,7 @@ class TreeSocket : public InspSocket */ if (e == I_ERR_CONNECT) { - Srv->SendOpers("*** Connection failed: Connection refused"); + ServerInstance->WriteOpers("*** Connection failed: Connection refused"); } } @@ -818,14 +813,13 @@ class TreeSocket : public InspSocket std::string MyCapabilities() { - ServerConfig* Config = Srv->GetConfig(); std::vector modlist; std::string capabilities = ""; - for (int i = 0; i <= MODCOUNT; i++) + for (int i = 0; i <= ServerInstance->GetModuleCount(); i++) { - if ((modules[i]->GetVersion().Flags & VF_STATIC) || (modules[i]->GetVersion().Flags & VF_COMMON)) - modlist.push_back(Config->module_names[i]); + if ((ServerInstance->modules[i]->GetVersion().Flags & VF_STATIC) || (ServerInstance->modules[i]->GetVersion().Flags & VF_COMMON)) + modlist.push_back(ServerInstance->Config->module_names[i]); } sort(modlist.begin(),modlist.end()); for (unsigned int i = 0; i < modlist.size(); i++) @@ -858,10 +852,10 @@ class TreeSocket : public InspSocket quitserver = this->InboundServerName; } - WriteOpers("*** \2ERROR\2: Server '%s' does not have the same set of modules loaded, cannot link!",quitserver.c_str()); - WriteOpers("*** Our networked module set is: '%s'",this->MyCapabilities().c_str()); - WriteOpers("*** Other server's networked module set is: '%s'",params[0].c_str()); - WriteOpers("*** These lists must match exactly on both servers. Please correct these errors, and try again."); + ServerInstance->WriteOpers("*** \2ERROR\2: Server '%s' does not have the same set of modules loaded, cannot link!",quitserver.c_str()); + ServerInstance->WriteOpers("*** Our networked module set is: '%s'",this->MyCapabilities().c_str()); + ServerInstance->WriteOpers("*** Other server's networked module set is: '%s'",params[0].c_str()); + ServerInstance->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; } @@ -905,11 +899,11 @@ class TreeSocket : public InspSocket DoOneToAllButSender(Current->GetParent()->GetName(),"SQUIT",params,Current->GetName()); if (Current->GetParent() == TreeRoot) { - Srv->SendOpers("Server \002"+Current->GetName()+"\002 split: "+reason); + ServerInstance->WriteOpers("Server \002"+Current->GetName()+"\002 split: "+reason); } else { - Srv->SendOpers("Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason); + ServerInstance->WriteOpers("Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason); } num_lost_servers = 0; num_lost_users = 0; @@ -918,7 +912,7 @@ class TreeSocket : public InspSocket Current->Tidy(); Current->GetParent()->DelChild(Current); DELETE(Current); - WriteOpers("Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers); + ServerInstance->WriteOpers("Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers); } else { @@ -940,7 +934,7 @@ class TreeSocket : public InspSocket std::string sourceserv; /* Are we dealing with an FMODE from a user, or from a server? */ - userrec* who = Srv->FindNick(source); + userrec* who = ServerInstance->FindNick(source); if (who) { /* FMODE from a user, set sourceserv to the users server name */ @@ -949,7 +943,7 @@ class TreeSocket : public InspSocket else { /* FMODE from a server, create a fake user to receive mode feedback */ - who = new userrec(); + who = new userrec(ServerInstance); who->fd = FD_MAGIC_NUMBER; smode = true; /* Setting this flag tells us we should free the userrec later */ sourceserv = source; /* Set sourceserv to the actual source string */ @@ -976,7 +970,7 @@ class TreeSocket : public InspSocket } /* Extract the TS value of the object, either userrec or chanrec */ - userrec* dst = Srv->FindNick(params[0]); + userrec* dst = ServerInstance->FindNick(params[0]); chanrec* chan = NULL; time_t ourTS = 0; if (dst) @@ -985,7 +979,7 @@ class TreeSocket : public InspSocket } else { - chan = Srv->FindChannel(params[0]); + chan = ServerInstance->FindChan(params[0]); if (chan) { ourTS = chan->age; @@ -1027,7 +1021,7 @@ class TreeSocket : public InspSocket */ mh = ServerInstance->ModeGrok->FindMode(*x, chan ? MODETYPE_CHANNEL : MODETYPE_USER); - if ((mh->GetNumParams(adding) > 0) && (!mh->IsListMode())) + if ((mh) && (mh->GetNumParams(adding) > 0) && (!mh->IsListMode())) { /* We only want to do special things to * modes with parameters, we are going to rewrite @@ -1141,24 +1135,33 @@ class TreeSocket : public InspSocket newparams.push_back(params[0]); newparams.push_back(ConvToStr(ourTS)); newparams.push_back(to_bounce+params_to_bounce); - DoOneToOne(Srv->GetServerName(),"FMODE",newparams,sourceserv); + DoOneToOne(ServerInstance->Config->ServerName,"FMODE",newparams,sourceserv); } if (to_keep.length()) { - n = 0; + unsigned int n = 2; + unsigned int q = 0; modelist[0] = params[0].c_str(); modelist[1] = to_keep.c_str(); - for (unsigned int q = 2; (q < params.size()) && (q < 64); q++) - modelist[q] = params_to_keep[n++].c_str(); + if (params_to_keep.size() > 2) + { + for (q = 2; (q < params_to_keep.size()) && (q < 64); q++) + { + log(DEBUG,"Item %d of %d", q, params_to_keep.size()); + modelist[n++] = params_to_keep[q].c_str(); + } + } if (smode) { + log(DEBUG,"Send mode"); Srv->SendMode(modelist, n+2, who); } else { + log(DEBUG,"Send mode client"); Srv->CallCommandHandler("MODE", modelist, n+2, who); } @@ -1272,7 +1275,7 @@ class TreeSocket : public InspSocket /* Update the parameters for FMODE with the new 'bounced' string */ newparams[2] = modebounce; /* Only send it back the way it came, no need to send it anywhere else */ - DoOneToOne(Srv->GetServerName(),"FMODE",newparams,sourceserv); + DoOneToOne(ServerInstance->Config->ServerName,"FMODE",newparams,sourceserv); log(DEBUG,"FMODE bounced intelligently, our TS less than theirs and the other server is NOT a uline."); } else @@ -1283,7 +1286,7 @@ class TreeSocket : public InspSocket */ if ((Srv->IsUlined(sourceserv)) && (TS > ourTS)) { - WriteOpers("\2WARNING!\2 U-Lined server '%s' has bad TS for '%s' (accepted change): \2SYNC YOUR CLOCKS\2 to avoid this notice",sourceserv.c_str(),params[0].c_str()); + ServerInstance->WriteOpers("\2WARNING!\2 U-Lined server '%s' has bad TS for '%s' (accepted change): \2SYNC YOUR CLOCKS\2 to avoid this notice",sourceserv.c_str(),params[0].c_str()); } /* Allow the mode, route it to either server or user command handling */ if (smode) @@ -1309,7 +1312,7 @@ class TreeSocket : public InspSocket time_t ts = atoi(params[1].c_str()); std::string nsource = source; - chanrec* c = Srv->FindChannel(params[0]); + chanrec* c = ServerInstance->FindChan(params[0]); if (c) { if ((ts >= c->topicset) || (!*c->topic)) @@ -1324,14 +1327,14 @@ class TreeSocket : public InspSocket */ if (oldtopic != params[3]) { - userrec* user = Srv->FindNick(source); + userrec* user = ServerInstance->FindNick(source); if (!user) { - WriteChannelWithServ(source.c_str(), c, "TOPIC %s :%s", c->name, c->topic); + c->WriteChannelWithServ(source.c_str(), "TOPIC %s :%s", c->name, c->topic); } else { - WriteChannel(c, user, "TOPIC %s :%s", c->name, c->topic); + c->WriteChannel(user, "TOPIC %s :%s", c->name, c->topic); nsource = user->server; } /* all done, send it on its way */ @@ -1357,7 +1360,7 @@ class TreeSocket : public InspSocket memset(&mode_users,0,sizeof(mode_users)); mode_users[0] = first; mode_users[1] = modestring; - strcpy(first,"+"); + strcpy(modestring,"+"); unsigned int modectr = 2; userrec* who = NULL; @@ -1365,7 +1368,7 @@ class TreeSocket : public InspSocket time_t TS = atoi(params[1].c_str()); char* key = ""; - chanrec* chan = Srv->FindChannel(channel); + chanrec* chan = ServerInstance->FindChan(channel); if (chan) { key = chan->key; @@ -1376,7 +1379,7 @@ class TreeSocket : public InspSocket * channel will let the other side apply their modes. */ time_t ourTS = time(NULL)+600; - chanrec* us = Srv->FindChannel(channel); + chanrec* us = ServerInstance->FindChan(channel); if (us) { ourTS = us->age; @@ -1416,10 +1419,10 @@ class TreeSocket : public InspSocket strlcat(modestring,"v",MAXBUF); break; } - who = Srv->FindNick(usr); + who = ServerInstance->FindNick(usr); if (who) { - Srv->JoinUserToChannel(who,channel,key); + chanrec::JoinUser(this->Instance, who, channel.c_str(), true, key); if (modectr >= (MAXMODES-1)) { /* theres a mode for this user. push them onto the mode queue, and flush it @@ -1432,8 +1435,9 @@ class TreeSocket : public InspSocket Srv->SendMode((const char**)mode_users,modectr,who); if (ourTS != TS) { - log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us,ourTS,TS); + log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS); us->age = TS; + ourTS = TS; } } else @@ -1450,9 +1454,10 @@ class TreeSocket : public InspSocket params.push_back(ConvToStr(us->age)); } params.push_back(mode_users[x]); + } // tell everyone to bounce the modes. bad modes, bad! - DoOneToMany(Srv->GetServerName(),"FMODE",params); + DoOneToMany(ServerInstance->Config->ServerName,"FMODE",params); } strcpy(mode_users[1],"+"); modectr = 2; @@ -1463,7 +1468,7 @@ class TreeSocket : public InspSocket /* there werent enough modes built up to flush it during FJOIN, * or, there are a number left over. flush them out. */ - if ((modectr > 2) && (who)) + if ((modectr > 2) && (who) && (us)) { if (ourTS >= TS) { @@ -1471,8 +1476,9 @@ class TreeSocket : public InspSocket Srv->SendMode((const char**)mode_users,modectr,who); if (ourTS != TS) { - log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us,ourTS,TS); + log(DEFAULT,"Channel TS for %s changed from %lu to %lu",us->name,ourTS,TS); us->age = TS; + ourTS = TS; } } else @@ -1488,7 +1494,7 @@ class TreeSocket : public InspSocket } params.push_back(mode_users[x]); } - DoOneToMany(Srv->GetServerName(),"FMODE",params); + DoOneToMany(ServerInstance->Config->ServerName,"FMODE",params); } } return true; @@ -1498,7 +1504,7 @@ class TreeSocket : public InspSocket { if (params.size() >= 2) { - chanrec* c = Srv->FindChannel(params[0]); + chanrec* c = ServerInstance->FindChan(params[0]); if (c) { time_t theirTS = atoi(params[1].c_str()); @@ -1510,7 +1516,7 @@ class TreeSocket : public InspSocket } } } - DoOneToAllButSender(Srv->GetServerName(),"SYNCTS",params,source); + DoOneToAllButSender(ServerInstance->Config->ServerName,"SYNCTS",params,source); return true; } @@ -1521,11 +1527,11 @@ class TreeSocket : public InspSocket return true; if (params.size() > 8) { - this->WriteLine(":"+Srv->GetServerName()+" KILL "+params[1]+" :Invalid client introduction ("+params[1]+"?)"); + this->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" KILL "+params[1]+" :Invalid client introduction ("+params[1]+"?)"); return true; } // NICK age nick host dhost ident +modes ip :gecos - // 0 123 4 56 7 + // 0 1 2 3 4 5 6 7 time_t age = atoi(params[0].c_str()); /* This used to have a pretty craq'y loop doing the same thing, @@ -1536,34 +1542,37 @@ class TreeSocket : public InspSocket const char* tempnick = params[1].c_str(); log(DEBUG,"Introduce client %s!%s@%s",tempnick,params[4].c_str(),params[2].c_str()); - user_hash::iterator iter = clientlist.find(tempnick); + user_hash::iterator iter = this->Instance->clientlist.find(tempnick); - if (iter != clientlist.end()) + if (iter != this->Instance->clientlist.end()) { // nick collision log(DEBUG,"Nick collision on %s!%s@%s: %lu %lu",tempnick,params[4].c_str(),params[2].c_str(),(unsigned long)age,(unsigned long)iter->second->age); - this->WriteLine(":"+Srv->GetServerName()+" KILL "+tempnick+" :Nickname collision"); + this->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" KILL "+tempnick+" :Nickname collision"); return true; } - clientlist[tempnick] = new userrec(); - clientlist[tempnick]->fd = FD_MAGIC_NUMBER; - strlcpy(clientlist[tempnick]->nick, tempnick,NICKMAX-1); - strlcpy(clientlist[tempnick]->host, params[2].c_str(),63); - strlcpy(clientlist[tempnick]->dhost, params[3].c_str(),63); - clientlist[tempnick]->server = FindServerNamePtr(source.c_str()); - strlcpy(clientlist[tempnick]->ident, params[4].c_str(),IDENTMAX); - strlcpy(clientlist[tempnick]->fullname, params[7].c_str(),MAXGECOS); - clientlist[tempnick]->registered = REG_ALL; - clientlist[tempnick]->signon = age; + userrec* _new = new userrec(this->Instance); + this->Instance->clientlist[tempnick] = _new; + _new->fd = FD_MAGIC_NUMBER; + strlcpy(_new->nick, tempnick,NICKMAX-1); + strlcpy(_new->host, params[2].c_str(),63); + strlcpy(_new->dhost, params[3].c_str(),63); + _new->server = this->Instance->FindServerNamePtr(source.c_str()); + strlcpy(_new->ident, params[4].c_str(),IDENTMAX); + strlcpy(_new->fullname, params[7].c_str(),MAXGECOS); + _new->registered = REG_ALL; + _new->signon = age; for (std::string::iterator v = params[5].begin(); v != params[5].end(); v++) - { - clientlist[tempnick]->modes[(*v)-65] = 1; - } - insp_aton(params[6].c_str(),&clientlist[tempnick]->ip4); + _new->modes[(*v)-65] = 1; - WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",clientlist[tempnick]->server,clientlist[tempnick]->nick,clientlist[tempnick]->ident,clientlist[tempnick]->host, insp_ntoa(clientlist[tempnick]->ip4)); + if (params[6].find_first_of(":") != std::string::npos) + _new->SetSockAddr(AF_INET6, params[6].c_str(), 0); + else + _new->SetSockAddr(AF_INET, params[6].c_str(), 0); + + ServerInstance->WriteOpers("*** 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); @@ -1572,7 +1581,7 @@ class TreeSocket : public InspSocket TreeServer* SourceServer = FindServer(source); if (SourceServer) { - log(DEBUG,"Found source server of %s",clientlist[tempnick]->nick); + log(DEBUG,"Found source server of %s",_new->nick); SourceServer->AddUserCount(); } @@ -1587,10 +1596,10 @@ class TreeSocket : public InspSocket { log(DEBUG,"Sending FJOINs to other server for %s",c->name); char list[MAXBUF]; - std::string individual_halfops = ":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age); + std::string individual_halfops = std::string(":")+ServerInstance->Config->ServerName+" FMODE "+c->name+" "+ConvToStr(c->age); size_t dlen, curlen; - dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age); + dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",ServerInstance->Config->ServerName,c->name,(unsigned long)c->age); int numusers = 0; char* ptr = list + dlen; @@ -1602,7 +1611,7 @@ class TreeSocket : public InspSocket for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - int x = cflags(i->second,c); + int x = c->GetStatusFlags(i->second); if ((x & UCMODE_HOP) && (x & UCMODE_OP)) { specific_halfop.push_back(i->second); @@ -1636,7 +1645,7 @@ class TreeSocket : public InspSocket if (curlen > (480-NICKMAX)) { this->WriteLine(list); - dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",Srv->GetServerName().c_str(),c->name,(unsigned long)c->age); + dlen = curlen = snprintf(list,MAXBUF,":%s FJOIN %s %lu",ServerInstance->Config->ServerName,c->name,(unsigned long)c->age); ptr = list + dlen; ptrlen = 0; numusers = 0; @@ -1644,13 +1653,13 @@ class TreeSocket : public InspSocket { modes.append("v"); params.append(specific_voice[y]->nick).append(" "); - //this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +v "+specific_voice[y]->nick); + //this->WriteLine(":"+ServerInstance->Config->ServerName+" FMODE "+c->name+" "+ConvToStr(c->age)+" +v "+specific_voice[y]->nick); } for (unsigned int y = 0; y < specific_halfop.size(); y++) { modes.append("h"); params.append(specific_halfop[y]->nick).append(" "); - //this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +h "+specific_halfop[y]->nick); + //this->WriteLine(":"+ServerInstance->Config->ServerName+" FMODE "+c->name+" "+ConvToStr(c->age)+" +h "+specific_halfop[y]->nick); } } } @@ -1661,13 +1670,13 @@ class TreeSocket : public InspSocket { modes.append("v"); params.append(specific_voice[y]->nick).append(" "); - //this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +v "+specific_voice[y]->nick); + //this->WriteLine(":"+ServerInstance->Config->ServerName+" FMODE "+c->name+" "+ConvToStr(c->age)+" +v "+specific_voice[y]->nick); } for (unsigned int y = 0; y < specific_halfop.size(); y++) { modes.append("h"); params.append(specific_halfop[y]->nick).append(" "); - //this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +h "+specific_halfop[y]->nick); + //this->WriteLine(":"+ServerInstance->Config->ServerName+" FMODE "+c->name+" "+ConvToStr(c->age)+" +h "+specific_halfop[y]->nick); } } //std::string modes = ""; @@ -1679,14 +1688,14 @@ class TreeSocket : public InspSocket } /* XXX: Send each channel mode and its params -- we'll need a method for this in ModeHandler? */ //FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(c->second,(Module*)TreeProtocolModule,(void*)this)); - this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +"+chanmodes(c,true)+modes+" "+params); + this->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" FMODE "+c->name+" "+ConvToStr(c->age)+" +"+c->ChanModes(true)+modes+" "+params); } /* Send G, Q, Z and E lines */ void SendXLines(TreeServer* Current) { char data[MAXBUF]; - std::string n = Srv->GetServerName(); + std::string n = ServerInstance->Config->ServerName; const char* sn = n.c_str(); int iterations = 0; /* Yes, these arent too nice looking, but they get the job done */ @@ -1738,9 +1747,9 @@ class TreeSocket : public InspSocket char data[MAXBUF]; std::deque list; int iterations = 0; - std::string n = Srv->GetServerName(); + std::string n = ServerInstance->Config->ServerName; const char* sn = n.c_str(); - for (chan_hash::iterator c = chanlist.begin(); c != chanlist.end(); c++, iterations++) + for (chan_hash::iterator c = this->Instance->chanlist.begin(); c != this->Instance->chanlist.end(); c++, iterations++) { SendFJoins(Current, c->second); if (*c->second->topic) @@ -1764,11 +1773,11 @@ class TreeSocket : public InspSocket char data[MAXBUF]; std::deque list; int iterations = 0; - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++, iterations++) + for (user_hash::iterator u = this->Instance->clientlist.begin(); u != this->Instance->clientlist.end(); u++, iterations++) { if (u->second->registered == REG_ALL) { - snprintf(data,MAXBUF,":%s NICK %lu %s %s %s %s +%s %s :%s",u->second->server,(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->FormatModes(),insp_ntoa(u->second->ip4),u->second->fullname); + snprintf(data,MAXBUF,":%s NICK %lu %s %s %s %s +%s %s :%s",u->second->server,(unsigned long)u->second->age,u->second->nick,u->second->host,u->second->dhost,u->second->ident,u->second->FormatModes(),u->second->GetIPString(),u->second->fullname); this->WriteLine(data); if (*u->second->oper) { @@ -1796,18 +1805,14 @@ class TreeSocket : public InspSocket */ void DoBurst(TreeServer* s) { - /* The calls here to ServerInstance-> yield the processing - * back to the core so that a large burst is split into at least 6 sections - * (possibly more) - */ std::string burst = "BURST "+ConvToStr(time(NULL)); std::string endburst = "ENDBURST"; // Because by the end of the netburst, it could be gone! std::string name = s->GetName(); - Srv->SendOpers("*** Bursting to \2"+name+"\2."); + ServerInstance->WriteOpers("*** Bursting to \2"+name+"\2."); this->WriteLine(burst); /* send our version string */ - this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+Srv->GetVersion()); + this->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" VERSION :"+this->Instance->GetVersionString()); /* Send server tree */ this->SendServers(TreeRoot,s,1); /* Send users and their oper status */ @@ -1817,7 +1822,7 @@ class TreeSocket : public InspSocket this->SendXLines(s); FOREACH_MOD(I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)TreeProtocolModule,(void*)this)); this->WriteLine(endburst); - Srv->SendOpers("*** Finished bursting to \2"+name+"\2."); + ServerInstance->WriteOpers("*** Finished bursting to \2"+name+"\2."); } /* This function is called when we receive data from a remote @@ -1913,7 +1918,7 @@ class TreeSocket : public InspSocket { if (params.size() < 1) return false; - WriteOpers("*** ERROR from %s: %s",(InboundServerName != "" ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str()); + ServerInstance->WriteOpers("*** 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; } @@ -1925,11 +1930,11 @@ class TreeSocket : public InspSocket */ if (params.size() > 1) { - if (Srv->MatchText(Srv->GetServerName(), params[1])) + if (Srv->MatchText(ServerInstance->Config->ServerName, params[1])) { /* It's for our server */ string_list results; - userrec* source = Srv->FindNick(prefix); + userrec* source = ServerInstance->FindNick(prefix); if (source) { std::deque par; @@ -1939,14 +1944,14 @@ class TreeSocket : public InspSocket for (size_t i = 0; i < results.size(); i++) { par[1] = "::" + results[i]; - DoOneToOne(Srv->GetServerName(), "PUSH",par, source->server); + DoOneToOne(ServerInstance->Config->ServerName, "PUSH",par, source->server); } } } else { /* Pass it on */ - userrec* source = Srv->FindNick(prefix); + userrec* source = ServerInstance->FindNick(prefix); if (source) DoOneToOne(prefix, "STATS", params, params[1]); } @@ -1966,7 +1971,7 @@ class TreeSocket : public InspSocket return true; } std::string opertype = params[0]; - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { u->modes[UM_OPERATOR] = 1; @@ -1984,7 +1989,7 @@ class TreeSocket : public InspSocket if (params.size() < 3) return true; - userrec* u = Srv->FindNick(params[0]); + userrec* u = ServerInstance->FindNick(params[0]); if (u) { @@ -1996,7 +2001,11 @@ class TreeSocket : public InspSocket /* This is not required as one is sent in OnUserPostNick below */ //DoOneToMany(u->nick,"NICK",par); - Srv->ChangeUserNick(u,params[1]); + if (!u->ForceNickChange(params[1].c_str())) + { + userrec::QuitUser(this->Instance, u, "Nickname collision"); + return true; + } u->age = atoi(params[2].c_str()); } } @@ -2008,11 +2017,11 @@ class TreeSocket : public InspSocket if (params.size() < 2) return true; - userrec* u = Srv->FindNick(params[0]); + userrec* u = ServerInstance->FindNick(params[0]); if (u) { - Srv->JoinUserToChannel(u,params[1],""); + chanrec::JoinUser(this->Instance, u, params[1].c_str(), false); DoOneToAllButSender(prefix,"SVSJOIN",params,prefix); } return true; @@ -2025,9 +2034,9 @@ class TreeSocket : public InspSocket std::string servermask = params[0]; - if (Srv->MatchText(Srv->GetServerName(),servermask)) + if (Srv->MatchText(ServerInstance->Config->ServerName,servermask)) { - Srv->SendOpers("*** Remote rehash initiated from server \002"+prefix+"\002."); + ServerInstance->WriteOpers("*** Remote rehash initiated from server \002"+prefix+"\002."); Srv->RehashServer(); ReadConfiguration(false); } @@ -2041,8 +2050,8 @@ class TreeSocket : public InspSocket return true; std::string nick = params[0]; - userrec* u = Srv->FindNick(prefix); - userrec* who = Srv->FindNick(nick); + userrec* u = ServerInstance->FindNick(prefix); + userrec* who = ServerInstance->FindNick(nick); if (who) { @@ -2059,8 +2068,8 @@ class TreeSocket : public InspSocket std::string reason = params[1]; params[1] = ":" + params[1]; DoOneToAllButSender(prefix,"KILL",params,sourceserv); - ::Write(who->fd, ":%s KILL %s :%s (%s)", sourceserv.c_str(), who->nick, sourceserv.c_str(), reason.c_str()); - Srv->QuitUser(who,reason); + who->Write(":%s KILL %s :%s (%s)", sourceserv.c_str(), who->nick, sourceserv.c_str(), reason.c_str()); + userrec::QuitUser(this->Instance,who,reason); } return true; } @@ -2081,7 +2090,7 @@ class TreeSocket : public InspSocket else { std::string forwardto = params[1]; - if (forwardto == Srv->GetServerName()) + if (forwardto == ServerInstance->Config->ServerName) { /* * this is a PONG for us @@ -2089,11 +2098,11 @@ class TreeSocket : public InspSocket * dump the PONG reply back to their fd. If its a server, do nowt. * Services might want to send these s->s, but we dont need to yet. */ - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { - WriteServ(u->fd,"PONG %s %s",params[0].c_str(),params[1].c_str()); + u->WriteServ("PONG %s %s",params[0].c_str(),params[1].c_str()); } } else @@ -2121,7 +2130,7 @@ class TreeSocket : public InspSocket } else if (*(params[0].c_str()) == '#') { - chanrec* c = Srv->FindChannel(params[0]); + chanrec* c = ServerInstance->FindChan(params[0]); if (c) { FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(TYPE_CHANNEL,c,params[1],params[2])); @@ -2129,7 +2138,7 @@ class TreeSocket : public InspSocket } else if (*(params[0].c_str()) != '#') { - userrec* u = Srv->FindNick(params[0]); + userrec* u = ServerInstance->FindNick(params[0]); if (u) { FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(TYPE_USER,u,params[1],params[2])); @@ -2163,11 +2172,11 @@ class TreeSocket : public InspSocket if (params.size() < 1) return true; - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { - Srv->ChangeHost(u,params[0]); + u->ChangeDisplayedHost(params[0].c_str()); DoOneToAllButSender(prefix,"FHOST",params,u->server); } return true; @@ -2203,7 +2212,7 @@ class TreeSocket : public InspSocket break; default: /* Just in case... */ - Srv->SendOpers("*** \2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!"); + ServerInstance->WriteOpers("*** \2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!"); propogate = false; break; } @@ -2213,11 +2222,11 @@ class TreeSocket : public InspSocket { if (atoi(params[4].c_str())) { - 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()); + ServerInstance->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()); } else { - WriteOpers("*** %s Added permenant %cLINE on %s (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),params[5].c_str()); + ServerInstance->WriteOpers("*** %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); @@ -2235,11 +2244,11 @@ class TreeSocket : public InspSocket if (params.size() < 1) return true; - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { - Srv->ChangeGECOS(u,params[0]); + u->ChangeName(params[0].c_str()); params[0] = ":" + params[0]; DoOneToAllButSender(prefix,"FNAME",params,u->server); } @@ -2252,7 +2261,7 @@ class TreeSocket : public InspSocket return true; log(DEBUG,"In IDLE command"); - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { @@ -2260,10 +2269,10 @@ class TreeSocket : public InspSocket // an incoming request if (params.size() == 1) { - userrec* x = Srv->FindNick(params[0]); + userrec* x = ServerInstance->FindNick(params[0]); if ((x) && (IS_LOCAL(x))) { - userrec* x = Srv->FindNick(params[0]); + userrec* x = ServerInstance->FindNick(params[0]); log(DEBUG,"Got IDLE"); char signon[MAXBUF]; char idle[MAXBUF]; @@ -2286,7 +2295,7 @@ class TreeSocket : public InspSocket else if (params.size() == 3) { std::string who_did_the_whois = params[0]; - userrec* who_to_send_to = Srv->FindNick(who_did_the_whois); + userrec* who_to_send_to = ServerInstance->FindNick(who_did_the_whois); if ((who_to_send_to) && (IS_LOCAL(who_to_send_to))) { log(DEBUG,"Got final IDLE"); @@ -2312,14 +2321,14 @@ class TreeSocket : public InspSocket if (params.size() < 2) return true; - userrec* u = Srv->FindNick(params[0]); + userrec* u = ServerInstance->FindNick(params[0]); if (!u) return true; if (IS_LOCAL(u)) { - ::Write(u->fd,"%s",params[1].c_str()); + u->Write(params[1]); } else { @@ -2337,22 +2346,22 @@ class TreeSocket : public InspSocket if (params.size() == 2) { // someone querying our time? - if (Srv->GetServerName() == params[0]) + if (ServerInstance->Config->ServerName == params[0]) { - userrec* u = Srv->FindNick(params[1]); + userrec* u = ServerInstance->FindNick(params[1]); if (u) { char curtime[256]; snprintf(curtime,256,"%lu",(unsigned long)time(NULL)); params.push_back(curtime); params[0] = prefix; - DoOneToOne(Srv->GetServerName(),"TIME",params,params[0]); + DoOneToOne(ServerInstance->Config->ServerName,"TIME",params,params[0]); } } else { // not us, pass it on - userrec* u = Srv->FindNick(params[1]); + userrec* u = ServerInstance->FindNick(params[1]); if (u) DoOneToOne(prefix,"TIME",params,params[0]); } @@ -2360,7 +2369,7 @@ class TreeSocket : public InspSocket else if (params.size() == 3) { // a response to a previous TIME - userrec* u = Srv->FindNick(params[1]); + userrec* u = ServerInstance->FindNick(params[1]); if ((u) && (IS_LOCAL(u))) { time_t rawtime = atol(params[2].c_str()); @@ -2369,7 +2378,7 @@ class TreeSocket : public InspSocket char tms[26]; snprintf(tms,26,"%s",asctime(timeinfo)); tms[24] = 0; - WriteServ(u->fd,"391 %s %s :%s",u->nick,prefix.c_str(),tms); + u->WriteServ("391 %s %s :%s",u->nick,prefix.c_str(),tms); } else { @@ -2388,13 +2397,13 @@ class TreeSocket : public InspSocket if (params.size() == 1) { std::string stufftobounce = params[0]; - this->WriteLine(":"+Srv->GetServerName()+" PONG "+stufftobounce); + this->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" PONG "+stufftobounce); return true; } else { std::string forwardto = params[1]; - if (forwardto == Srv->GetServerName()) + if (forwardto == ServerInstance->Config->ServerName) { // this is a ping for us, send back PONG to the requesting server params[1] = params[0]; @@ -2430,14 +2439,14 @@ class TreeSocket : public InspSocket if (CheckDupe) { this->WriteLine("ERROR :Server "+servername+" already exists!"); - Srv->SendOpers("*** Server connection from \2"+servername+"\2 denied, already exists"); + ServerInstance->WriteOpers("*** Server connection from \2"+servername+"\2 denied, already exists"); return false; } TreeServer* Node = new TreeServer(servername,description,ParentOfThis,NULL); ParentOfThis->AddChild(Node); params[3] = ":" + params[3]; DoOneToAllButSender(prefix,"SERVER",params,prefix); - Srv->SendOpers("*** Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")"); + ServerInstance->WriteOpers("*** Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")"); return true; } @@ -2454,7 +2463,7 @@ class TreeSocket : public InspSocket if (hops) { this->WriteLine("ERROR :Server too far away for authentication"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); return false; } std::string description = params[3]; @@ -2466,7 +2475,7 @@ class TreeSocket : public InspSocket if (CheckDupe) { this->WriteLine("ERROR :Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); return false; } // Begin the sync here. this kickstarts the @@ -2487,7 +2496,7 @@ class TreeSocket : public InspSocket } } this->WriteLine("ERROR :Invalid credentials"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); return false; } @@ -2504,7 +2513,7 @@ class TreeSocket : public InspSocket if (hops) { this->WriteLine("ERROR :Server too far away for authentication"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); return false; } std::string description = params[3]; @@ -2516,7 +2525,7 @@ class TreeSocket : public InspSocket if (CheckDupe) { this->WriteLine("ERROR :Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); + ServerInstance->WriteOpers("*** 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 @@ -2526,22 +2535,22 @@ class TreeSocket : public InspSocket if ((x->EncryptionKey != "") && (!this->ctx_in)) { this->WriteLine("ERROR :This link requires AES encryption to be enabled. Plaintext connection refused."); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, remote server did not enable AES."); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, remote server did not enable AES."); return false; } - Srv->SendOpers("*** Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "" : this->GetIP())+"] ("+description+")"); + ServerInstance->WriteOpers("*** Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "" : this->GetIP())+"] ("+description+")"); this->InboundServerName = sname; this->InboundDescription = description; // this is good. Send our details: Our server name and description and hopcount of 0, // along with the sendpass from this block. - this->WriteLine("SERVER "+Srv->GetServerName()+" "+x->SendPass+" 0 :"+Srv->GetServerDescription()); + this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+x->SendPass+" 0 :"+ServerInstance->Config->ServerDesc); // move to the next state, we are now waiting for THEM. this->LinkState = WAIT_AUTH_2; return true; } } this->WriteLine("ERROR :Invalid credentials"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); return false; } @@ -2594,7 +2603,7 @@ class TreeSocket : public InspSocket } else if ((this->ctx_in) && (command == "AES")) { - WriteOpers("*** \2AES\2: Encryption already enabled on this connection yet %s is trying to enable it twice!",params[0].c_str()); + ServerInstance->WriteOpers("*** \2AES\2: Encryption already enabled on this connection yet %s is trying to enable it twice!",params[0].c_str()); } switch (this->LinkState) @@ -2662,13 +2671,13 @@ class TreeSocket : public InspSocket long delta = THEM-time(NULL); if ((delta < -600) || (delta > 600)) { - 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)); + ServerInstance->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->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)) { - WriteOpers("*** \2WARNING\2: Your clocks are out by %d seconds, please consider synching your clocks.",abs(delta)); + ServerInstance->WriteOpers("*** \2WARNING\2: Your clocks are out by %d seconds, please consider synching your clocks.",abs(delta)); } } this->LinkState = CONNECTED; @@ -2720,7 +2729,7 @@ class TreeSocket : public InspSocket if (prefix != "") { std::string direction = prefix; - userrec* t = Srv->FindNick(prefix); + userrec* t = ServerInstance->FindNick(prefix); if (t) { direction = t->server; @@ -2874,11 +2883,13 @@ class TreeSocket : public InspSocket std::string sourceserv = this->myhost; if (params.size() == 3) { - userrec* user = Srv->FindNick(params[1]); - chanrec* chan = Srv->FindChannel(params[0]); + userrec* user = ServerInstance->FindNick(params[1]); + chanrec* chan = ServerInstance->FindChan(params[0]); if (user && chan) { - server_kick_channel(user,chan,(char*)params[2].c_str(),false); + if (!chan->ServerKickUser(user, params[2].c_str(), false)) + /* Yikes, the channels gone! */ + delete chan; } } if (this->InboundServerName != "") @@ -2912,7 +2923,7 @@ class TreeSocket : public InspSocket { sourceserv = this->InboundServerName; } - WriteOpers("*** Received end of netburst from \2%s\2",sourceserv.c_str()); + ServerInstance->WriteOpers("*** Received end of netburst from \2%s\2",sourceserv.c_str()); return true; } else @@ -2920,7 +2931,7 @@ class TreeSocket : public InspSocket // not a special inter-server command. // Emulate the actual user doing the command, // this saves us having a huge ugly parser. - userrec* who = Srv->FindNick(prefix); + userrec* who = ServerInstance->FindNick(prefix); std::string sourceserv = this->myhost; if (this->InboundServerName != "") { @@ -2934,22 +2945,22 @@ class TreeSocket : public InspSocket * already exist here. If it does, kill their copy, * and our copy. */ - userrec* x = Srv->FindNick(params[0]); + userrec* x = ServerInstance->FindNick(params[0]); if ((x) && (x != who)) { std::deque p; p.push_back(params[0]); p.push_back("Nickname collision ("+prefix+" -> "+params[0]+")"); - DoOneToMany(Srv->GetServerName(),"KILL",p); + DoOneToMany(ServerInstance->Config->ServerName,"KILL",p); p.clear(); p.push_back(prefix); p.push_back("Nickname collision"); - DoOneToMany(Srv->GetServerName(),"KILL",p); - Srv->QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")"); - userrec* y = Srv->FindNick(prefix); + DoOneToMany(ServerInstance->Config->ServerName,"KILL",p); + userrec::QuitUser(this->Instance,x,"Nickname collision ("+prefix+" -> "+params[0]+")"); + userrec* y = ServerInstance->FindNick(prefix); if (y) { - Srv->QuitUser(y,"Nickname collision"); + userrec::QuitUser(this->Instance,y,"Nickname collision"); } return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params); } @@ -2972,7 +2983,7 @@ class TreeSocket : public InspSocket // its not a user. Its either a server, or somethings screwed up. if (IsServer(prefix)) { - target = Srv->GetServerName(); + target = ServerInstance->Config->ServerName; } else { @@ -3003,7 +3014,7 @@ class TreeSocket : public InspSocket { if (this->LinkState == CONNECTING) { - Srv->SendOpers("*** CONNECT: Connection to \002"+myhost+"\002 timed out."); + ServerInstance->WriteOpers("*** CONNECT: Connection to \002"+myhost+"\002 timed out."); } } @@ -3022,7 +3033,7 @@ class TreeSocket : public InspSocket { Squit(s,"Remote host closed the connection"); } - WriteOpers("Server '\2%s\2' closed the connection.",quitserver.c_str()); + ServerInstance->WriteOpers("Server '\2%s\2' closed the connection.",quitserver.c_str()); } virtual int OnIncomingConnection(int newsock, char* ip) @@ -3032,34 +3043,22 @@ class TreeSocket : public InspSocket * IPs for which we don't have a link block. */ bool found = false; - char resolved_host[MAXBUF]; - vector::iterator i; - for (i = LinkBlocks.begin(); i != LinkBlocks.end(); i++) + + found = (std::find(ValidIPs.begin(), ValidIPs.end(), ip) != ValidIPs.end()); + if (!found) { - if (i->IPAddr == ip) - { - found = true; - break; - } - /* XXX: Fixme: blocks for a very short amount of time, - * we should cache these on rehash/startup - */ - if (CleanAndResolve(resolved_host,i->IPAddr.c_str(),true,1)) - { - if (std::string(resolved_host) == ip) - { + for (vector::iterator i = ValidIPs.begin(); i != ValidIPs.end(); i++) + if (MatchCIDR(ip, (*i).c_str())) found = true; - break; - } + + if (!found) + { + ServerInstance->WriteOpers("Server connection from %s denied (no link blocks with that IP address)", ip); + close(newsock); + return false; } } - if (!found) - { - WriteOpers("Server connection from %s denied (no link blocks with that IP address)", ip); - close(newsock); - return false; - } - TreeSocket* s = new TreeSocket(newsock, ip); + TreeSocket* s = new TreeSocket(this->Instance, newsock, ip); Srv->AddSocket(s); return true; } @@ -3080,7 +3079,7 @@ class ServernameResolver : public Resolver */ Link MyLink; public: - ServernameResolver(const std::string &hostname, Link x) : Resolver(hostname, true), MyLink(x) + ServernameResolver(InspIRCd* Instance, const std::string &hostname, Link x) : Resolver(Instance, hostname, DNS_QUERY_FORWARD), MyLink(x) { /* Nothing in here, folks */ } @@ -3094,7 +3093,7 @@ class ServernameResolver : public Resolver TreeServer* CheckDupe = FindServer(MyLink.Name.c_str()); if (!CheckDupe) /* Check that nobody tried to connect it successfully while we were resolving */ { - TreeSocket* newsocket = new TreeSocket(result,MyLink.Port,false,10,MyLink.Name.c_str()); + TreeSocket* newsocket = new TreeSocket(ServerInstance, result,MyLink.Port,false,10,MyLink.Name.c_str()); if (newsocket->GetFd() > -1) { /* We're all OK */ @@ -3103,19 +3102,39 @@ class ServernameResolver : public Resolver else { /* Something barfed, show the opers */ - WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno)); + ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno)); delete newsocket; } } } - void OnError(ResolverError e) + void OnError(ResolverError e, const std::string &errormessage) { /* Ooops! */ - WriteOpers("*** CONNECT: Error connecting \002%s\002: Unable to resolve hostname.",MyLink.Name.c_str()); + ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s",MyLink.Name.c_str(),errormessage.c_str()); } }; +class SecurityIPResolver : public Resolver +{ + private: + Link MyLink; + public: + SecurityIPResolver(InspIRCd* Instance, const std::string &hostname, Link x) : Resolver(Instance, hostname, DNS_QUERY_FORWARD), MyLink(x) + { + } + + void OnLookupComplete(const std::string &result) + { + log(DEBUG,"Security IP cache: Adding IP address '%s' for Link '%s'",result.c_str(),MyLink.Name.c_str()); + ValidIPs.push_back(result); + } + + void OnError(ResolverError e, const std::string &errormessage) + { + log(DEBUG,"Could not resolve IP associated with Link '%s': %s",MyLink.Name.c_str(),errormessage.c_str()); + } +}; void AddThisServer(TreeServer* server, std::deque &list) { @@ -3160,7 +3179,7 @@ bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string pref if ((*(params[0].c_str()) != '#') && (*(params[0].c_str()) != '$')) { // special routing for private messages/notices - userrec* d = Srv->FindNick(params[0]); + userrec* d = ServerInstance->FindNick(params[0]); if (d) { std::deque par; @@ -3181,7 +3200,7 @@ bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string pref else { log(DEBUG,"Channel privmsg going to chan %s",params[0].c_str()); - chanrec* c = Srv->FindChannel(params[0]); + chanrec* c = ServerInstance->FindChan(params[0]); if (c) { std::deque list; @@ -3304,7 +3323,7 @@ void ReadConfiguration(bool rebind) { IP = ""; } - TreeSocket* listener = new TreeSocket(IP.c_str(),Port,true,10); + TreeSocket* listener = new TreeSocket(ServerInstance, IP.c_str(),Port,true,10); if (listener->GetState() == I_LISTENING) { Srv->AddSocket(listener); @@ -3322,9 +3341,11 @@ void ReadConfiguration(bool rebind) FlatLinks = Conf->ReadFlag("options","flatlinks",0); HideULines = Conf->ReadFlag("options","hideulines",0); LinkBlocks.clear(); + ValidIPs.clear(); for (int j =0; j < Conf->Enumerate("link"); j++) { Link L; + std::string Allow = Conf->ReadValue("link","allowmask",j); L.Name = (Conf->ReadValue("link","name",j)).c_str(); L.IPAddr = Conf->ReadValue("link","ipaddr",j); L.Port = Conf->ReadInteger("link","port",j,true); @@ -3337,6 +3358,26 @@ void ReadConfiguration(bool rebind) /* Bugfix by brain, do not allow people to enter bad configurations */ if ((L.IPAddr != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port)) { + ValidIPs.push_back(L.IPAddr); + + 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); + Srv->AddResolver(sr); + } + catch (ModuleException& e) + { + log(DEBUG,"Error in resolver: %s",e.GetReason()); + } + } + LinkBlocks.push_back(L); log(DEBUG,"m_spanningtree: Read server %s with host %s:%d",L.Name.c_str(),L.IPAddr.c_str(),L.Port); } @@ -3386,7 +3427,7 @@ class ModuleSpanningTree : public Module Bindings.clear(); // Create the root of the tree - TreeRoot = new TreeServer(Srv->GetServerName(),Srv->GetServerDescription()); + TreeRoot = new TreeServer(ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc); ReadConfiguration(true); @@ -3418,7 +3459,7 @@ class ModuleSpanningTree : public Module /* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */ if ((HideULines) && (Srv->IsUlined(Current->GetName())) && (!*user->oper)) return; - WriteServ(user->fd,"364 %s %s %s :%d %s",user->nick,Current->GetName().c_str(),(FlatLinks && (!*user->oper)) ? Srv->GetServerName().c_str() : Parent.c_str(),(FlatLinks && (!*user->oper)) ? 0 : hops,Current->GetDesc().c_str()); + user->WriteServ("364 %s %s %s :%d %s",user->nick,Current->GetName().c_str(),(FlatLinks && (!*user->oper)) ? ServerInstance->Config->ServerName : Parent.c_str(),(FlatLinks && (!*user->oper)) ? 0 : hops,Current->GetDesc().c_str()); } int CountLocalServs() @@ -3434,30 +3475,30 @@ class ModuleSpanningTree : public Module void HandleLinks(const char** parameters, int pcnt, userrec* user) { ShowLinks(TreeRoot,user,0); - WriteServ(user->fd,"365 %s * :End of /LINKS list.",user->nick); + user->WriteServ("365 %s * :End of /LINKS list.",user->nick); return; } void HandleLusers(const char** parameters, int pcnt, userrec* user) { - unsigned int n_users = usercnt(); + unsigned int n_users = ServerInstance->usercnt(); /* Only update these when someone wants to see them, more efficient */ - if ((unsigned int)local_count() > max_local) - max_local = local_count(); + if ((unsigned int)ServerInstance->local_count() > max_local) + max_local = ServerInstance->local_count(); if (n_users > max_global) max_global = n_users; - WriteServ(user->fd,"251 %s :There are %d users and %d invisible on %d servers",user->nick,n_users-usercount_invisible(),usercount_invisible(),this->CountServs()); - if (usercount_opers()) - WriteServ(user->fd,"252 %s %d :operator(s) online",user->nick,usercount_opers()); - if (usercount_unknown()) - WriteServ(user->fd,"253 %s %d :unknown connections",user->nick,usercount_unknown()); - if (chancount()) - WriteServ(user->fd,"254 %s %d :channels formed",user->nick,chancount()); - WriteServ(user->fd,"254 %s :I have %d clients and %d servers",user->nick,local_count(),this->CountLocalServs()); - WriteServ(user->fd,"265 %s :Current Local Users: %d Max: %d",user->nick,local_count(),max_local); - WriteServ(user->fd,"266 %s :Current Global Users: %d Max: %d",user->nick,n_users,max_global); + user->WriteServ("251 %s :There are %d users and %d invisible on %d servers",user->nick,n_users-ServerInstance->usercount_invisible(),ServerInstance->usercount_invisible(),this->CountServs()); + if (ServerInstance->usercount_opers()) + user->WriteServ("252 %s %d :operator(s) online",user->nick,ServerInstance->usercount_opers()); + if (ServerInstance->usercount_unknown()) + user->WriteServ("253 %s %d :unknown connections",user->nick,ServerInstance->usercount_unknown()); + if (ServerInstance->chancount()) + user->WriteServ("254 %s %d :channels formed",user->nick,ServerInstance->chancount()); + user->WriteServ("254 %s :I have %d clients and %d servers",user->nick,ServerInstance->local_count(),this->CountLocalServs()); + user->WriteServ("265 %s :Current Local Users: %d Max: %d",user->nick,ServerInstance->local_count(),max_local); + user->WriteServ("266 %s :Current Global Users: %d Max: %d",user->nick,n_users,max_global); return; } @@ -3487,13 +3528,13 @@ class ModuleSpanningTree : public Module float percent; char text[80]; - if (clientlist.size() == 0) { + if (ServerInstance->clientlist.size() == 0) { // If there are no users, WHO THE HELL DID THE /MAP?!?!?! percent = 0; } else { - percent = ((float)Current->GetUserCount() / (float)clientlist.size()) * 100; + percent = ((float)Current->GetUserCount() / (float)ServerInstance->clientlist.size()) * 100; } snprintf(text, 80, "%s %s%5d [%5.2f%%]", Current->GetName().c_str(), spacer, Current->GetUserCount(), percent); totusers += Current->GetUserCount(); @@ -3532,6 +3573,10 @@ class ModuleSpanningTree : public Module params[1] = s->GetName(); DoOneToOne(user->nick, "STATS", params, s->GetName()); } + else + { + user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]); + } return 1; } return 0; @@ -3594,11 +3639,11 @@ class ModuleSpanningTree : public Module // dump the whole lot to the user. This is the easy bit, honest. for (int t = 0; t < line; t++) { - WriteServ(user->fd,"006 %s :%s",user->nick,&matrix[t][0]); + user->WriteServ("006 %s :%s",user->nick,&matrix[t][0]); } float avg_users = totusers / totservers; - WriteServ(user->fd,"270 %s :%.0f server%s and %.0f user%s, average %.2f users per server",user->nick,totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users); - WriteServ(user->fd,"007 %s :End of /MAP",user->nick); + user->WriteServ("270 %s :%.0f server%s and %.0f user%s, average %.2f users per server",user->nick,totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users); + user->WriteServ("007 %s :End of /MAP",user->nick); return; } @@ -3609,25 +3654,25 @@ class ModuleSpanningTree : public Module { if (s == TreeRoot) { - WriteServ(user->fd,"NOTICE %s :*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)",user->nick,parameters[0]); return 1; } TreeSocket* sock = s->GetSocket(); if (sock) { log(DEBUG,"Splitting server %s",s->GetName().c_str()); - WriteOpers("*** SQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick); + ServerInstance->WriteOpers("*** 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)); Srv->RemoveSocket(sock); } else { - WriteServ(user->fd,"NOTICE %s :*** SQUIT: The server \002%s\002 is not directly connected.",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** SQUIT: The server \002%s\002 is not directly connected.",user->nick,parameters[0]); } } else { - WriteServ(user->fd,"NOTICE %s :*** SQUIT: The server \002%s\002 does not exist on the network.",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** SQUIT: The server \002%s\002 does not exist on the network.",user->nick,parameters[0]); } return 1; } @@ -3646,11 +3691,11 @@ class ModuleSpanningTree : public Module std::deque params; params.push_back(found->GetName()); params.push_back(user->nick); - DoOneToOne(Srv->GetServerName(),"TIME",params,found->GetName()); + DoOneToOne(ServerInstance->Config->ServerName,"TIME",params,found->GetName()); } else { - WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]); + user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]); } } return 1; @@ -3660,7 +3705,7 @@ class ModuleSpanningTree : public Module { if ((IS_LOCAL(user)) && (pcnt > 1)) { - userrec* remote = Srv->FindNick(parameters[1]); + userrec* remote = ServerInstance->FindNick(parameters[1]); if ((remote) && (remote->fd < 0)) { std::deque params; @@ -3670,8 +3715,8 @@ class ModuleSpanningTree : public Module } else if (!remote) { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[1]); - WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, parameters[1]); + user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]); + user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[1]); return 1; } } @@ -3690,13 +3735,13 @@ class ModuleSpanningTree : public Module { if (serv->AnsweredLastPing()) { - sock->WriteLine(":"+Srv->GetServerName()+" PING "+serv->GetName()); + sock->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" PING "+serv->GetName()); serv->SetNextPingTime(curtime + 120); } else { // they didnt answer, boot them - WriteOpers("*** Server \002%s\002 pinged out",serv->GetName().c_str()); + ServerInstance->WriteOpers("*** Server \002%s\002 pinged out",serv->GetName().c_str()); sock->Squit(serv,"Ping timeout"); Srv->RemoveSocket(sock); return; @@ -3718,28 +3763,35 @@ class ModuleSpanningTree : public Module if (!CheckDupe) { // an autoconnected server is not connected. Check if its time to connect it - WriteOpers("*** AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect); + ServerInstance->WriteOpers("*** AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect); insp_inaddr binip; /* Do we already have an IP? If so, no need to resolve it. */ if (insp_aton(x->IPAddr.c_str(), &binip) > 0) { - TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str()); + TreeSocket* newsocket = new TreeSocket(ServerInstance, x->IPAddr,x->Port,false,10,x->Name.c_str()); if (newsocket->GetFd() > -1) { Srv->AddSocket(newsocket); } else { - WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); + ServerInstance->WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); delete newsocket; } } else { - ServernameResolver* snr = new ServernameResolver(x->IPAddr, *x); - Srv->AddResolver(snr); + try + { + ServernameResolver* snr = new ServernameResolver(ServerInstance,x->IPAddr, *x); + Srv->AddResolver(snr); + } + catch (ModuleException& e) + { + log(DEBUG,"Error in resolver: %s",e.GetReason()); + } } } @@ -3754,10 +3806,10 @@ class ModuleSpanningTree : public Module if (found) { std::string Version = found->GetVersion(); - WriteServ(user->fd,"351 %s :%s",user->nick,Version.c_str()); + user->WriteServ("351 %s :%s",user->nick,Version.c_str()); if (found == TreeRoot) { - std::stringstream out(Config->data005); + std::stringstream out(ServerInstance->Config->data005); std::string token = ""; std::string line5 = ""; int token_counter = 0; @@ -3770,7 +3822,7 @@ class ModuleSpanningTree : public Module if ((token_counter >= 13) || (out.eof() == true)) { - WriteServ(user->fd,"005 %s %s:are supported by this server",user->nick,line5.c_str()); + user->WriteServ("005 %s %s:are supported by this server",user->nick,line5.c_str()); line5 = ""; token_counter = 0; } @@ -3779,7 +3831,7 @@ class ModuleSpanningTree : public Module } else { - WriteServ(user->fd,"402 %s %s :No such server",user->nick,parameters[0]); + user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]); } return 1; } @@ -3793,38 +3845,45 @@ class ModuleSpanningTree : public Module TreeServer* CheckDupe = FindServer(x->Name.c_str()); if (!CheckDupe) { - WriteServ(user->fd,"NOTICE %s :*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "" : x->IPAddr.c_str()),x->Port); + user->WriteServ("NOTICE %s :*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "" : x->IPAddr.c_str()),x->Port); insp_inaddr binip; /* Do we already have an IP? If so, no need to resolve it. */ if (insp_aton(x->IPAddr.c_str(), &binip) > 0) { - TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str()); + TreeSocket* newsocket = new TreeSocket(ServerInstance,x->IPAddr,x->Port,false,10,x->Name.c_str()); if (newsocket->GetFd() > -1) { Srv->AddSocket(newsocket); } else { - WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); + ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); delete newsocket; } } else { - ServernameResolver* snr = new ServernameResolver(x->IPAddr, *x); - Srv->AddResolver(snr); + try + { + ServernameResolver* snr = new ServernameResolver(ServerInstance, x->IPAddr, *x); + Srv->AddResolver(snr); + } + catch (ModuleException& e) + { + log(DEBUG,"Error in resolver: %s",e.GetReason()); + } } return 1; } else { - WriteServ(user->fd,"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()); + 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()); return 1; } } } - WriteServ(user->fd,"NOTICE %s :*** CONNECT: No server matching \002%s\002 could be found in the config file.",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** CONNECT: No server matching \002%s\002 could be found in the config file.",user->nick,parameters[0]); return 1; } @@ -3834,11 +3893,11 @@ class ModuleSpanningTree : public Module { for (unsigned int i = 0; i < LinkBlocks.size(); i++) { - results.push_back(Srv->GetServerName()+" 213 "+user->nick+" C *@"+(LinkBlocks[i].HiddenFromStats ? "" : LinkBlocks[i].IPAddr)+" * "+LinkBlocks[i].Name.c_str()+" "+ConvToStr(LinkBlocks[i].Port)+" "+(LinkBlocks[i].EncryptionKey != "" ? 'e' : '-')+(LinkBlocks[i].AutoConnect ? 'a' : '-')+'s'); - results.push_back(Srv->GetServerName()+" 244 "+user->nick+" H * * "+LinkBlocks[i].Name.c_str()); + results.push_back(std::string(ServerInstance->Config->ServerName)+" 213 "+user->nick+" C *@"+(LinkBlocks[i].HiddenFromStats ? "" : LinkBlocks[i].IPAddr)+" * "+LinkBlocks[i].Name.c_str()+" "+ConvToStr(LinkBlocks[i].Port)+" "+(LinkBlocks[i].EncryptionKey != "" ? 'e' : '-')+(LinkBlocks[i].AutoConnect ? 'a' : '-')+'s'); + results.push_back(std::string(ServerInstance->Config->ServerName)+" 244 "+user->nick+" H * * "+LinkBlocks[i].Name.c_str()); } - results.push_back(Srv->GetServerName()+" 219 "+user->nick+" "+statschar+" :End of /STATS report"); - WriteOpers("*** Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host); + 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); return 1; } return 0; @@ -4082,7 +4141,7 @@ class ModuleSpanningTree : public Module params.push_back(channel->name); params.push_back(ts); params.push_back("@"+std::string(user->nick)); - DoOneToMany(Srv->GetServerName(),"FJOIN",params); + DoOneToMany(ServerInstance->Config->ServerName,"FJOIN",params); } } } @@ -4132,9 +4191,9 @@ class ModuleSpanningTree : public Module params.push_back(user->dhost); params.push_back(user->ident); params.push_back("+"+std::string(user->FormatModes())); - params.push_back((char*)insp_ntoa(user->ip4)); + params.push_back(user->GetIPString()); params.push_back(":"+std::string(user->fullname)); - DoOneToMany(Srv->GetServerName(),"NICK",params); + DoOneToMany(ServerInstance->Config->ServerName,"NICK",params); // User is Local, change needs to be reflected! TreeServer* SourceServer = FindServer(user->server); @@ -4189,7 +4248,7 @@ class ModuleSpanningTree : public Module params.push_back(chan->name); params.push_back(user->nick); params.push_back(":"+reason); - DoOneToMany(Srv->GetServerName(),"KICK",params); + DoOneToMany(ServerInstance->Config->ServerName,"KICK",params); } } @@ -4207,11 +4266,11 @@ class ModuleSpanningTree : public Module { std::deque params; params.push_back(parameter); - DoOneToMany(Srv->GetServerName(),"REHASH",params); + DoOneToMany(ServerInstance->Config->ServerName,"REHASH",params); // check for self - if (Srv->MatchText(Srv->GetServerName(),parameter)) + if (Srv->MatchText(ServerInstance->Config->ServerName,parameter)) { - Srv->SendOpers("*** Remote rehash initiated from server \002"+Srv->GetServerName()+"\002."); + ServerInstance->WriteOpers("*** Remote rehash initiated from server \002%s\002",ServerInstance->Config->ServerName); Srv->RehashServer(); } } @@ -4348,12 +4407,12 @@ class ModuleSpanningTree : public Module if (target_type == TYPE_USER) { userrec* u = (userrec*)target; - s->WriteLine(":"+Srv->GetServerName()+" FMODE "+u->nick+" "+ConvToStr(u->age)+" "+modeline); + s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" FMODE "+u->nick+" "+ConvToStr(u->age)+" "+modeline); } else { chanrec* c = (chanrec*)target; - s->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+modeline); + s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+modeline); } } } @@ -4366,16 +4425,16 @@ class ModuleSpanningTree : public Module if (target_type == TYPE_USER) { userrec* u = (userrec*)target; - s->WriteLine(":"+Srv->GetServerName()+" METADATA "+u->nick+" "+extname+" :"+extdata); + s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" METADATA "+u->nick+" "+extname+" :"+extdata); } else if (target_type == TYPE_OTHER) { - s->WriteLine(":"+Srv->GetServerName()+" METADATA * "+extname+" :"+extdata); + s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" METADATA * "+extname+" :"+extdata); } else if (target_type == TYPE_CHANNEL) { chanrec* c = (chanrec*)target; - s->WriteLine(":"+Srv->GetServerName()+" METADATA "+c->name+" "+extname+" :"+extdata); + s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" METADATA "+c->name+" "+extname+" :"+extdata); } } } @@ -4388,7 +4447,7 @@ class ModuleSpanningTree : public Module if (params->size() < 3) return; (*params)[2] = ":" + (*params)[2]; - DoOneToMany(Srv->GetServerName(),"METADATA",*params); + DoOneToMany(ServerInstance->Config->ServerName,"METADATA",*params); } else if (event->GetEventID() == "send_mode") { @@ -4397,21 +4456,21 @@ class ModuleSpanningTree : public Module return; // Insert the TS value of the object, either userrec or chanrec time_t ourTS = 0; - userrec* a = Srv->FindNick((*params)[0]); + userrec* a = ServerInstance->FindNick((*params)[0]); if (a) { ourTS = a->age; } else { - chanrec* a = Srv->FindChannel((*params)[0]); + chanrec* a = ServerInstance->FindChan((*params)[0]); if (a) { ourTS = a->age; } } params->insert(params->begin() + 1,ConvToStr(ourTS)); - DoOneToMany(Srv->GetServerName(),"FMODE",*params); + DoOneToMany(ServerInstance->Config->ServerName,"FMODE",*params); } }