X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree.cpp;h=6ced44c9f7ce2ba0ee5c634981a838ee30a30f6b;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=9957f88a6d55bce6497ae99f28da91c94be13b6b;hpb=83be005aa1f65eb9b33a6bec176e5c44076087cc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index 9957f88a6..6ced44c9f 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -30,6 +30,7 @@ using namespace std; #include "modules.h" #include "commands.h" #include "commands/cmd_whois.h" +#include "commands/cmd_stats.h" #include "socket.h" #include "helperfuncs.h" #include "inspircd.h" @@ -111,6 +112,9 @@ static Server* Srv; typedef nspace::hash_map, irc::StrHashComp> server_hash; server_hash serverlist; +typedef nspace::hash_map uid_hash; +typedef nspace::hash_map sid_hash; + /* More forward declarations */ bool DoOneToOne(std::string prefix, std::string command, std::deque ¶ms, std::string target); bool DoOneToAllButSender(std::string prefix, std::string command, std::deque ¶ms, std::string omit); @@ -135,6 +139,56 @@ extern std::vector pzlines; extern std::vector pqlines; extern std::vector pelines; +std::vector ValidIPs; + +class UserManager : public classbase +{ + uid_hash uids; + sid_hash sids; + public: + UserManager() + { + uids.clear(); + sids.clear(); + } + + std::string UserToUID(userrec* user) + { + return ""; + } + + std::string UIDToUser(const std::string &UID) + { + return ""; + } + + std::string CreateAndAdd(userrec* user) + { + return ""; + } + + std::string CreateAndAdd(const std::string &servername) + { + return ""; + } + + std::string ServerToSID(const std::string &servername) + { + return ""; + } + + std::string SIDToServer(const std::string &SID) + { + return ""; + } + + userrec* FindByID(const std::string &UID) + { + return NULL; + } +}; + + /* Each server in the tree is represented by one class of * type TreeServer. A locally connected TreeServer can * have a class of type TreeSocket associated with it, for @@ -276,7 +330,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(a,reason_s); } return time_to_die.size(); } @@ -560,7 +614,7 @@ 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])) { @@ -975,7 +1029,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 @@ -1094,19 +1148,28 @@ class TreeSocket : public InspSocket 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); } @@ -1275,11 +1338,11 @@ class TreeSocket : public InspSocket userrec* user = Srv->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 */ @@ -1305,7 +1368,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; @@ -1367,7 +1430,7 @@ class TreeSocket : public InspSocket who = Srv->FindNick(usr); if (who) { - Srv->JoinUserToChannel(who,channel,key); + chanrec::JoinUser(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 @@ -1380,8 +1443,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 @@ -1398,6 +1462,7 @@ 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); @@ -1411,7 +1476,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) { @@ -1419,8 +1484,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 @@ -1473,7 +1539,7 @@ class TreeSocket : public InspSocket 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, @@ -1509,9 +1575,13 @@ class TreeSocket : public InspSocket { clientlist[tempnick]->modes[(*v)-65] = 1; } - inet_aton(params[6].c_str(),&clientlist[tempnick]->ip4); - WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",clientlist[tempnick]->server,clientlist[tempnick]->nick,clientlist[tempnick]->ident,clientlist[tempnick]->host, inet_ntoa(clientlist[tempnick]->ip4)); + if (params[6].find_first_of(":") != std::string::npos) + clientlist[tempnick]->SetSockAddr(AF_INET6, params[6].c_str(), 0); + else + clientlist[tempnick]->SetSockAddr(AF_INET, params[6].c_str(), 0); + + WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",clientlist[tempnick]->server,clientlist[tempnick]->nick,clientlist[tempnick]->ident,clientlist[tempnick]->host, clientlist[tempnick]->GetIPString()); params[7] = ":" + params[7]; DoOneToAllButSender(source,"NICK",params,source); @@ -1716,7 +1786,7 @@ class TreeSocket : public InspSocket { 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(),inet_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) { @@ -1866,6 +1936,43 @@ class TreeSocket : public InspSocket return false; } + bool Stats(std::string prefix, std::deque ¶ms) + { + /* Get the reply to a STATS query if it matches this servername, + * and send it back as a load of PUSH queries + */ + if (params.size() > 1) + { + if (Srv->MatchText(Srv->GetServerName(), params[1])) + { + /* It's for our server */ + string_list results; + userrec* source = Srv->FindNick(prefix); + if (source) + { + std::deque par; + par.push_back(prefix); + par.push_back(""); + DoStats(*(params[0].c_str()), source, results); + for (size_t i = 0; i < results.size(); i++) + { + par[1] = "::" + results[i]; + DoOneToOne(Srv->GetServerName(), "PUSH",par, source->server); + } + } + } + else + { + /* Pass it on */ + userrec* source = Srv->FindNick(prefix); + if (source) + DoOneToOne(prefix, "STATS", params, params[1]); + } + } + return true; + } + + /* Because the core won't let users or even SERVERS set +o, * we use the OPERTYPE command to do this. */ @@ -1907,7 +2014,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(u, "Nickname collision"); + return true; + } u->age = atoi(params[2].c_str()); } } @@ -1923,7 +2034,7 @@ class TreeSocket : public InspSocket if (u) { - Srv->JoinUserToChannel(u,params[1],""); + chanrec::JoinUser(u, params[1].c_str(), false); DoOneToAllButSender(prefix,"SVSJOIN",params,prefix); } return true; @@ -1970,8 +2081,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(who,reason); } return true; } @@ -2004,7 +2115,7 @@ class TreeSocket : public InspSocket 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 @@ -2230,15 +2341,7 @@ class TreeSocket : public InspSocket if (IS_LOCAL(u)) { - // push the raw to the user - if (Srv->IsUlined(prefix)) - { - ::Write(u->fd,"%s",params[1].c_str()); - } - else - { - log(DEBUG,"PUSH from non-ulined server dropped into the bit-bucket: :%s PUSH %s :%s",prefix.c_str(),params[0].c_str(),params[1].c_str()); - } + u->Write(params[1]); } else { @@ -2288,7 +2391,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 { @@ -2680,6 +2783,10 @@ class TreeSocket : public InspSocket { return this->ForceJoin(prefix,params); } + else if (command == "STATS") + { + return this->Stats(prefix, params); + } else if (command == "SERVER") { return this->RemoteServer(prefix,params); @@ -2793,7 +2900,9 @@ class TreeSocket : public InspSocket chanrec* chan = Srv->FindChannel(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 != "") @@ -2860,11 +2969,11 @@ class TreeSocket : public InspSocket p.push_back(prefix); p.push_back("Nickname collision"); DoOneToMany(Srv->GetServerName(),"KILL",p); - Srv->QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")"); + userrec::QuitUser(x,"Nickname collision ("+prefix+" -> "+params[0]+")"); userrec* y = Srv->FindNick(prefix); if (y) { - Srv->QuitUser(y,"Nickname collision"); + userrec::QuitUser(y,"Nickname collision"); } return DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params); } @@ -2947,39 +3056,99 @@ 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)) - { - 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) + { + 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); Srv->AddSocket(s); return true; } }; +/** This class is used to resolve server hostnames during /connect and autoconnect. + * As of 1.1, the resolver system is seperated out from InspSocket, so we must do this + * resolver step first ourselves if we need it. This is totally nonblocking, and will + * callback to OnLookupComplete or OnError when completed. Once it has completed we + * will have an IP address which we can then use to continue our connection. + */ +class ServernameResolver : public Resolver +{ + private: + /** A copy of the Link tag info for what we're connecting to. + * We take a copy, rather than using a pointer, just in case the + * admin takes the tag away and rehashes while the domain is resolving. + */ + Link MyLink; + public: + ServernameResolver(const std::string &hostname, Link x) : Resolver(hostname, DNS_QUERY_FORWARD), MyLink(x) + { + /* Nothing in here, folks */ + } + + void OnLookupComplete(const std::string &result) + { + /* Initiate the connection, now that we have an IP to use. + * Passing a hostname directly to InspSocket causes it to + * just bail and set its FD to -1. + */ + 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()); + if (newsocket->GetFd() > -1) + { + /* We're all OK */ + Srv->AddSocket(newsocket); + } + else + { + /* Something barfed, show the opers */ + WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno)); + delete newsocket; + } + } + } + + void OnError(ResolverError e, const std::string &errormessage) + { + /* Ooops! */ + 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(const std::string &hostname, Link x) : Resolver(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) { for (unsigned int c = 0; c < list.size(); c++) @@ -3185,9 +3354,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); @@ -3200,6 +3371,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(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); } @@ -3281,7 +3472,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)) ? Srv->GetServerName().c_str() : Parent.c_str(),(FlatLinks && (!*user->oper)) ? 0 : hops,Current->GetDesc().c_str()); } int CountLocalServs() @@ -3297,7 +3488,7 @@ 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; } @@ -3311,16 +3502,16 @@ class ModuleSpanningTree : public Module 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()); + user->WriteServ("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()); + user->WriteServ("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()); + user->WriteServ("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("254 %s %d :channels formed",user->nick,chancount()); + user->WriteServ("254 %s :I have %d clients and %d servers",user->nick,local_count(),this->CountLocalServs()); + user->WriteServ("265 %s :Current Local Users: %d Max: %d",user->nick,local_count(),max_local); + user->WriteServ("266 %s :Current Global Users: %d Max: %d",user->nick,n_users,max_global); return; } @@ -3380,6 +3571,30 @@ class ModuleSpanningTree : public Module } } + int HandleStats(const char** parameters, int pcnt, userrec* user) + { + if (pcnt > 1) + { + /* Remote STATS, the server is within the 2nd parameter */ + std::deque params; + params.push_back(parameters[0]); + params.push_back(parameters[1]); + /* Send it out remotely, generate no reply yet */ + TreeServer* s = FindServerMask(parameters[1]); + if (s) + { + 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; + } + // Ok, prepare to be confused. // After much mulling over how to approach this, it struck me that // the 'usual' way of doing a /MAP isnt the best way. Instead of @@ -3437,11 +3652,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; } @@ -3452,7 +3667,7 @@ 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(); @@ -3465,12 +3680,12 @@ class ModuleSpanningTree : public Module } 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; } @@ -3493,7 +3708,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; @@ -3513,8 +3728,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; } } @@ -3562,16 +3777,36 @@ class ModuleSpanningTree : public Module { // 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); - TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str()); - if (newsocket->GetFd() > -1) + + 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) { - Srv->AddSocket(newsocket); + TreeSocket* newsocket = new TreeSocket(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)); + delete newsocket; + } } else { - WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); - DELETE(newsocket); + try + { + ServernameResolver* snr = new ServernameResolver(x->IPAddr, *x); + Srv->AddResolver(snr); + } + catch (ModuleException& e) + { + log(DEBUG,"Error in resolver: %s",e.GetReason()); + } } + } } } @@ -3584,7 +3819,7 @@ 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); @@ -3600,7 +3835,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; } @@ -3609,7 +3844,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; } @@ -3623,41 +3858,59 @@ 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); - TreeSocket* newsocket = new TreeSocket(x->IPAddr,x->Port,false,10,x->Name.c_str()); - if (newsocket->GetFd() > -1) + 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) { - Srv->AddSocket(newsocket); + TreeSocket* newsocket = new TreeSocket(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)); + delete newsocket; + } } else { - WriteServ(user->fd,"NOTICE %s :*** CONNECT: Error connecting \002%s\002: %s.",user->nick,x->Name.c_str(),strerror(errno)); - DELETE(newsocket); + try + { + ServernameResolver* snr = new ServernameResolver(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; } - virtual int OnStats(char statschar, userrec* user) + virtual int OnStats(char statschar, userrec* user, string_list &results) { if (statschar == 'c') { for (unsigned int i = 0; i < LinkBlocks.size(); i++) { - WriteServ(user->fd,"213 %s C *@%s * %s %d 0 %c%c%c",user->nick,(LinkBlocks[i].HiddenFromStats ? "" : LinkBlocks[i].IPAddr).c_str(),LinkBlocks[i].Name.c_str(),LinkBlocks[i].Port,(LinkBlocks[i].EncryptionKey != "" ? 'e' : '-'),(LinkBlocks[i].AutoConnect ? 'a' : '-'),'s'); - WriteServ(user->fd,"244 %s H * * %s",user->nick,LinkBlocks[i].Name.c_str()); + 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()); } - WriteServ(user->fd,"219 %s %c :End of /STATS report",user->nick,statschar); - WriteOpers("*** Notice: Stats '%c' requested by %s (%s@%s)",statschar,user->nick,user->ident,user->host); + 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); return 1; } return 0; @@ -3673,6 +3926,10 @@ class ModuleSpanningTree : public Module { return this->HandleConnect(parameters,pcnt,user); } + else if (command == "STATS") + { + return this->HandleStats(parameters,pcnt,user); + } else if (command == "SQUIT") { return this->HandleSquit(parameters,pcnt,user); @@ -3947,7 +4204,7 @@ 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*)inet_ntoa(user->ip4)); + params.push_back(user->GetIPString()); params.push_back(":"+std::string(user->fullname)); DoOneToMany(Srv->GetServerName(),"NICK",params);