X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=e5c7518e784e53f5f2abfedac472c61277640a4b;hb=e48c7e038abe2954ecec30f465c811f017793332;hp=7a0c0a2e1ba4c4b4b18fea85c2652780e5ab661f;hpb=8691870bf726a898b11cc4173e42db5b6f597cf3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 7a0c0a2e1..e5c7518e7 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -30,28 +30,40 @@ #include "m_spanningtree/treesocket.h" #include "m_spanningtree/rconnect.h" #include "m_spanningtree/rsquit.h" +#include "m_spanningtree/protocolinterface.h" -/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h */ +/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h m_spanningtree/protocolinterface.h */ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me) : Module(Me), max_local(0), max_global(0) { ServerInstance->Modules->UseInterface("BufferedSocketHook"); - Utils = new SpanningTreeUtilities(Me, this); + Utils = new SpanningTreeUtilities(ServerInstance, this); command_rconnect = new cmd_rconnect(ServerInstance, this, Utils); ServerInstance->AddCommand(command_rconnect); command_rsquit = new cmd_rsquit(ServerInstance, this, Utils); ServerInstance->AddCommand(command_rsquit); - if (Utils->EnableTimeSync) - { - SyncTimer = new TimeSyncTimer(ServerInstance, this); - ServerInstance->Timers->AddTimer(SyncTimer); - } - else - SyncTimer = NULL; - RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils); ServerInstance->Timers->AddTimer(RefreshTimer); + + Implementation eventlist[] = + { + I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostLocalTopicChange, + I_OnWallops, I_OnUserNotice, I_OnUserMessage, I_OnBackgroundTimer, + I_OnUserJoin, I_OnChangeHost, I_OnChangeName, I_OnUserPart, I_OnPostConnect, + I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash, + I_OnOper, I_OnAddLine, I_OnDelLine, I_ProtoSendMode, I_OnMode, + I_OnStats, I_ProtoSendMetaData, I_OnEvent, I_OnSetAway, I_OnPostCommand + }; + ServerInstance->Modules->Attach(eventlist, this, 28); + + delete ServerInstance->PI; + ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance); + + for (std::vector::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) + { + this->OnPostConnect((*i)); + } } void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) @@ -82,7 +94,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) else if ((Current->Hidden) && (!IS_OPER(user))) return; - user->WriteServ("364 %s %s %s :%d %s", user->nick,Current->GetName().c_str(), + user->WriteNumeric(364, "%s %s %s :%d %s", user->nick,Current->GetName().c_str(), (Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName : Parent.c_str(), (Utils->FlatLinks && (!IS_OPER(user))) ? 0 : hops, Current->GetDesc().c_str()); @@ -98,20 +110,20 @@ int ModuleSpanningTree::CountServs() return Utils->serverlist.size(); } -void ModuleSpanningTree::HandleLinks(const char** parameters, int pcnt, User* user) +void ModuleSpanningTree::HandleLinks(const char* const* parameters, int pcnt, User* user) { ShowLinks(Utils->TreeRoot,user,0); - user->WriteServ("365 %s * :End of /LINKS list.",user->nick); + user->WriteNumeric(365, "%s * :End of /LINKS list.",user->nick); return; } -void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, User* user) +void ModuleSpanningTree::HandleLusers(const char* const* parameters, int pcnt, User* user) { - unsigned int n_users = ServerInstance->UserCount(); + unsigned int n_users = ServerInstance->Users->UserCount(); /* Only update these when someone wants to see them, more efficient */ - if ((unsigned int)ServerInstance->LocalUserCount() > max_local) - max_local = ServerInstance->LocalUserCount(); + if ((unsigned int)ServerInstance->Users->LocalUserCount() > max_local) + max_local = ServerInstance->Users->LocalUserCount(); if (n_users > max_global) max_global = n_users; @@ -133,23 +145,23 @@ void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, User* u } } } - user->WriteServ("251 %s :There are %d users and %d invisible on %d servers",user->nick, - n_users-ServerInstance->ModeCount('i'), - ServerInstance->ModeCount('i'), + user->WriteNumeric(251, "%s :There are %d users and %d invisible on %d servers",user->nick, + n_users-ServerInstance->Users->ModeCount('i'), + ServerInstance->Users->ModeCount('i'), ulined_count ? this->CountServs() - ulined_count : this->CountServs()); - if (ServerInstance->OperCount()) - user->WriteServ("252 %s %d :operator(s) online",user->nick,ServerInstance->OperCount()); + if (ServerInstance->Users->OperCount()) + user->WriteNumeric(252, "%s %d :operator(s) online",user->nick,ServerInstance->Users->OperCount()); - if (ServerInstance->UnregisteredUserCount()) - user->WriteServ("253 %s %d :unknown connections",user->nick,ServerInstance->UnregisteredUserCount()); + if (ServerInstance->Users->UnregisteredUserCount()) + user->WriteNumeric(253, "%s %d :unknown connections",user->nick,ServerInstance->Users->UnregisteredUserCount()); if (ServerInstance->ChannelCount()) - user->WriteServ("254 %s %d :channels formed",user->nick,ServerInstance->ChannelCount()); + user->WriteNumeric(254, "%s %ld :channels formed",user->nick,ServerInstance->ChannelCount()); - user->WriteServ("255 %s :I have %d clients and %d servers",user->nick,ServerInstance->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs()); - user->WriteServ("265 %s :Current Local Users: %d Max: %d",user->nick,ServerInstance->LocalUserCount(),max_local); - user->WriteServ("266 %s :Current Global Users: %d Max: %d",user->nick,n_users,max_global); + user->WriteNumeric(255, "%s :I have %d clients and %d servers",user->nick,ServerInstance->Users->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs()); + user->WriteNumeric(265, "%s :Current Local Users: %d Max: %d",user->nick,ServerInstance->Users->LocalUserCount(),max_local); + user->WriteNumeric(266, "%s :Current Global Users: %d Max: %d",user->nick,n_users,max_global); return; } @@ -181,7 +193,6 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) { sock->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" PING "+serv->GetID()); serv->SetNextPingTime(curtime + Utils->PingFreq); - serv->LastPing = curtime; timeval t; gettimeofday(&t, NULL); long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000); @@ -207,11 +218,19 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) } } - /* Cancel remote burst mode on any servers which still have it enabled due to latency/lack of data. + /* + * Cancel remote burst mode on any servers which still have it enabled due to latency/lack of data. * This prevents lost REMOTECONNECT notices + * XXX this should probably not do this until server has been bursting for, say, 60 seconds or something */ for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++) - Utils->SetRemoteBursting(i->second, false); + { + if (i->second->bursting) + { + ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not finished burst, forcing end of burst.", i->second->GetName().c_str()); + i->second->FinishBurst(); + } + } } void ModuleSpanningTree::ConnectServer(Link* x) @@ -299,14 +318,14 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime) } } -int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, User* user) +int ModuleSpanningTree::HandleVersion(const char* const* parameters, int pcnt, User* user) { // we've already checked if pcnt > 0, so this is safe TreeServer* found = Utils->FindServerMask(parameters[0]); if (found) { std::string Version = found->GetVersion(); - user->WriteServ("351 %s :%s",user->nick,Version.c_str()); + user->WriteNumeric(351, "%s :%s",user->nick,Version.c_str()); if (found == Utils->TreeRoot) { ServerInstance->Config->Send005(user); @@ -314,7 +333,7 @@ int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, User* u } else { - user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]); + user->WriteNumeric(402, "%s %s :No such server",user->nick,parameters[0]); } return 1; } @@ -369,7 +388,7 @@ void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...) SendingRemoteMessage = false; } -int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, User* user) +int ModuleSpanningTree::HandleConnect(const char* const* parameters, int pcnt, User* user) { for (std::vector::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++) { @@ -393,17 +412,6 @@ int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, User* u return 1; } -void ModuleSpanningTree::BroadcastTimeSync() -{ - if (Utils->MasterTime) - { - std::deque params; - params.push_back(ConvToStr(ServerInstance->Time(false))); - params.push_back("FORCE"); - Utils->DoOneToMany(ServerInstance->Config->GetSID(), "TIMESET", params); - } -} - void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,std::string &description) { TreeServer* s = Utils->FindServer(servername); @@ -413,13 +421,14 @@ void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,st } } -void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel) +void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, time_t expiry) { if (IS_LOCAL(source)) { std::deque params; params.push_back(dest->uuid); params.push_back(channel->name); + params.push_back(ConvToStr(expiry)); Utils->DoOneToMany(source->uuid,"INVITE",params); } } @@ -546,7 +555,7 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime) DoPingChecks(curtime); } -void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool &silent) +void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) { // Only do this for local users if (IS_LOCAL(user)) @@ -563,7 +572,7 @@ void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool &silent) Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params); /* First user in, sync the modes for the channel */ params.pop_back(); - params.push_back(channel->ChanModes(true)); + params.push_back(std::string("+") + channel->ChanModes(true)); Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",params); } else @@ -608,7 +617,7 @@ void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, const std::str } } -void ModuleSpanningTree::OnUserConnect(User* user) +void ModuleSpanningTree::OnPostConnect(User* user) { if (IS_LOCAL(user)) { @@ -624,12 +633,12 @@ void ModuleSpanningTree::OnUserConnect(User* user) params.push_back(ConvToStr(user->signon)); params.push_back(":"+std::string(user->fullname)); Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params); - // User is Local, change needs to be reflected! - TreeServer* SourceServer = Utils->FindServer(user->server); - if (SourceServer) - { - SourceServer->AddUserCount(); - } + } + + TreeServer* SourceServer = Utils->FindServer(user->server); + if (SourceServer) + { + SourceServer->SetUserCount(1); // increment by 1 } } @@ -648,11 +657,12 @@ void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const params.push_back(":"+reason); Utils->DoOneToMany(user->uuid,"QUIT",params); } + // Regardless, We need to modify the user Counts.. TreeServer* SourceServer = Utils->FindServer(user->server); if (SourceServer) { - SourceServer->DelUserCount(); + SourceServer->SetUserCount(-1); // decrement by 1 } } @@ -666,7 +676,7 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick) /** IMPORTANT: We don't update the TS if the oldnick is just a case change of the newnick! */ if (irc::string(user->nick) != assign(oldnick)) - user->age = ServerInstance->Time(true); + user->age = ServerInstance->Time(); params.push_back(ConvToStr(user->age)); Utils->DoOneToMany(user->uuid,"NICK",params); @@ -715,11 +725,11 @@ void ModuleSpanningTree::OnRehash(User* user, const std::string ¶meter) // check for self if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameter)) { - ServerInstance->WriteOpers("*** Remote rehash initiated locally by \002%s\002", user ? user->nick : ServerInstance->Config->ServerName); + ServerInstance->SNO->WriteToSnoMask('A', "Remote rehash initiated locally by \002%s\002", user ? user->nick : ServerInstance->Config->ServerName); ServerInstance->RehashServer(); } } - Utils->ReadConfiguration(false); + Utils->ReadConfiguration(true); InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance); } @@ -736,83 +746,49 @@ void ModuleSpanningTree::OnOper(User* user, const std::string &opertype) } } -void ModuleSpanningTree::OnLine(User* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason) +void ModuleSpanningTree::OnAddLine(User* user, XLine *x) { - if (!source) + if (!x->IsBurstable()) + return; + + char data[MAXBUF]; + snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", x->type.c_str(), x->Displayable(), + ServerInstance->Config->ServerName, (unsigned long)x->set_time, (unsigned long)x->duration, x->reason); + std::deque params; + params.push_back(data); + + if (!user) { /* Server-set lines */ - char data[MAXBUF]; - snprintf(data,MAXBUF,"%c %s %s %lu %lu :%s", linetype, host.c_str(), ServerInstance->Config->ServerName, (unsigned long)ServerInstance->Time(false), - (unsigned long)duration, reason.c_str()); - std::deque params; - params.push_back(data); Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ADDLINE", params); } - else + else if (IS_LOCAL(user)) { - if (IS_LOCAL(source)) - { - char type[8]; - snprintf(type,8,"%cLINE",linetype); - std::string stype = type; - if (adding) - { - char sduration[MAXBUF]; - snprintf(sduration,MAXBUF,"%ld",duration); - std::deque params; - params.push_back(host); - params.push_back(sduration); - params.push_back(":"+reason); - Utils->DoOneToMany(source->uuid,stype,params); - } - else - { - std::deque params; - params.push_back(host); - Utils->DoOneToMany(source->uuid,stype,params); - } - } + /* User-set lines */ + Utils->DoOneToMany(user->uuid, "ADDLINE", params); } } -void ModuleSpanningTree::OnAddGLine(long duration, User* source, const std::string &reason, const std::string &hostmask) -{ - OnLine(source,hostmask,true,'G',duration,reason); -} - -void ModuleSpanningTree::OnAddZLine(long duration, User* source, const std::string &reason, const std::string &ipmask) -{ - OnLine(source,ipmask,true,'Z',duration,reason); -} - -void ModuleSpanningTree::OnAddQLine(long duration, User* source, const std::string &reason, const std::string &nickmask) +void ModuleSpanningTree::OnDelLine(User* user, XLine *x) { - OnLine(source,nickmask,true,'Q',duration,reason); -} - -void ModuleSpanningTree::OnAddELine(long duration, User* source, const std::string &reason, const std::string &hostmask) -{ - OnLine(source,hostmask,true,'E',duration,reason); -} - -void ModuleSpanningTree::OnDelGLine(User* source, const std::string &hostmask) -{ - OnLine(source,hostmask,false,'G',0,""); -} - -void ModuleSpanningTree::OnDelZLine(User* source, const std::string &ipmask) -{ - OnLine(source,ipmask,false,'Z',0,""); -} + if (x->type == "K") + return; -void ModuleSpanningTree::OnDelQLine(User* source, const std::string &nickmask) -{ - OnLine(source,nickmask,false,'Q',0,""); -} + char data[MAXBUF]; + snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable()); + std::deque params; + params.push_back(data); -void ModuleSpanningTree::OnDelELine(User* source, const std::string &hostmask) -{ - OnLine(source,hostmask,false,'E',0,""); + if (!user) + { + /* Server-unset lines */ + Utils->DoOneToMany(ServerInstance->Config->GetSID(), "DELLINE", params); + } + else if (IS_LOCAL(user)) + { + /* User-unset lines */ + Utils->DoOneToMany(user->uuid, "DELLINE", params); + } } void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const std::string &text) @@ -845,24 +821,25 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const s } } -void ModuleSpanningTree::OnSetAway(User* user) +int ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg) { if (IS_LOCAL(user)) { - std::deque params; - params.push_back(":"+std::string(user->awaymsg)); - Utils->DoOneToMany(user->uuid,"AWAY",params); + if (awaymsg.empty()) + { + std::deque params; + params.clear(); + Utils->DoOneToMany(user->uuid,"AWAY",params); + } + else + { + std::deque params; + params.push_back(":" + awaymsg); + Utils->DoOneToMany(user->uuid,"AWAY",params); + } } -} -void ModuleSpanningTree::OnCancelAway(User* user) -{ - if (IS_LOCAL(user)) - { - std::deque params; - params.clear(); - Utils->DoOneToMany(user->uuid,"AWAY",params); - } + return 0; } void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) @@ -912,7 +889,14 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, int target_type, void* void ModuleSpanningTree::OnEvent(Event* event) { std::deque* params = (std::deque*)event->GetData(); - if (event->GetEventID() == "send_metadata") + if (event->GetEventID() == "send_encap") + { + if (params->size() < 2) + return; + + Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ENCAP", *params); + } + else if (event->GetEventID() == "send_metadata") { if (params->size() < 3) return; @@ -925,7 +909,7 @@ void ModuleSpanningTree::OnEvent(Event* event) return; (*params)[1] = ":" + (*params)[1]; params->insert(params->begin() + 1,ServerInstance->Config->ServerName); - params->insert(params->begin() + 1,ConvToStr(ServerInstance->Time(true))); + params->insert(params->begin() + 1,ConvToStr(ServerInstance->Time())); Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC",*params); } else if (event->GetEventID() == "send_mode") @@ -949,10 +933,10 @@ void ModuleSpanningTree::OnEvent(Event* event) } else { - Channel* a = ServerInstance->FindChan((*params)[0]); - if (a) + Channel* c = ServerInstance->FindChan((*params)[0]); + if (c) { - ourTS = a->age; + ourTS = c->age; params->insert(params->begin() + 1,ConvToStr(ourTS)); Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",*params); } @@ -1010,9 +994,10 @@ void ModuleSpanningTree::OnEvent(Event* event) ModuleSpanningTree::~ModuleSpanningTree() { /* This will also free the listeners */ + delete ServerInstance->PI; + ServerInstance->PI = new ProtocolInterface(ServerInstance); + delete Utils; - if (SyncTimer) - ServerInstance->Timers->DelTimer(SyncTimer); ServerInstance->Timers->DelTimer(RefreshTimer); @@ -1021,18 +1006,7 @@ ModuleSpanningTree::~ModuleSpanningTree() Version ModuleSpanningTree::GetVersion() { - return Version(1,1,0,2,VF_VENDOR,API_VERSION); -} - -void ModuleSpanningTree::Implements(char* List) -{ - List[I_OnPreCommand] = List[I_OnGetServerDescription] = List[I_OnUserInvite] = List[I_OnPostLocalTopicChange] = 1; - List[I_OnWallops] = List[I_OnUserNotice] = List[I_OnUserMessage] = List[I_OnBackgroundTimer] = 1; - List[I_OnUserJoin] = List[I_OnChangeHost] = List[I_OnChangeName] = List[I_OnUserPart] = List[I_OnUserConnect] = 1; - List[I_OnUserQuit] = List[I_OnUserPostNick] = List[I_OnUserKick] = List[I_OnRemoteKill] = List[I_OnRehash] = 1; - List[I_OnOper] = List[I_OnAddGLine] = List[I_OnAddZLine] = List[I_OnAddQLine] = List[I_OnAddELine] = 1; - List[I_OnDelGLine] = List[I_OnDelZLine] = List[I_OnDelQLine] = List[I_OnDelELine] = List[I_ProtoSendMode] = List[I_OnMode] = 1; - List[I_OnStats] = List[I_ProtoSendMetaData] = List[I_OnEvent] = List[I_OnSetAway] = List[I_OnCancelAway] = List[I_OnPostCommand] = 1; + return Version(1,2,0,2,VF_VENDOR,API_VERSION); } /* It is IMPORTANT that m_spanningtree is the last module in the chain @@ -1042,9 +1016,9 @@ void ModuleSpanningTree::Implements(char* List) * Therefore, we return PRIORITY_LAST to make sure we end up at the END of * the module call queue. */ -Priority ModuleSpanningTree::Prioritize() +void ModuleSpanningTree::Prioritize() { - return PRIORITY_LAST; + ServerInstance->Modules->SetPriority(this, PRIO_LAST); } MODULE_INIT(ModuleSpanningTree)