X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=e5c7518e784e53f5f2abfedac472c61277640a4b;hb=e48c7e038abe2954ecec30f465c811f017793332;hp=270d7ef82ac9352dd39e8b5a181a843db51d6075;hpb=4426a2fc448f332e42a7e6ff778e5047bb588c98;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 270d7ef82..e5c7518e7 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -30,26 +30,19 @@ #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); @@ -60,11 +53,14 @@ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me) 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_OnCancelAway, I_OnPostCommand + I_OnStats, I_ProtoSendMetaData, I_OnEvent, I_OnSetAway, I_OnPostCommand }; - ServerInstance->Modules->Attach(eventlist, this, 29); + ServerInstance->Modules->Attach(eventlist, this, 28); + + delete ServerInstance->PI; + ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance); - for (std::vector::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++) + for (std::vector::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) { this->OnPostConnect((*i)); } @@ -98,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()); @@ -114,14 +110,14 @@ 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->Users->UserCount(); @@ -149,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->Users->OperCount()) - user->WriteServ("252 %s %d :operator(s) online",user->nick,ServerInstance->Users->OperCount()); + user->WriteNumeric(252, "%s %d :operator(s) online",user->nick,ServerInstance->Users->OperCount()); if (ServerInstance->Users->UnregisteredUserCount()) - user->WriteServ("253 %s %d :unknown connections",user->nick,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->Users->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs()); - user->WriteServ("265 %s :Current Local Users: %d Max: %d",user->nick,ServerInstance->Users->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; } @@ -197,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); @@ -223,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) @@ -315,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); @@ -330,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; } @@ -385,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++) { @@ -409,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); @@ -429,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); } } @@ -683,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); @@ -753,14 +746,14 @@ void ModuleSpanningTree::OnOper(User* user, const std::string &opertype) } } -void ModuleSpanningTree::OnAddLine(XLine* line, User* user) +void ModuleSpanningTree::OnAddLine(User* user, XLine *x) { - if (line->type == "K") + if (!x->IsBurstable()) return; char data[MAXBUF]; - snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", line->type.c_str(), line->Displayable(), ServerInstance->Config->ServerName, line->set_time, - line->duration, line->reason); + 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); @@ -776,13 +769,13 @@ void ModuleSpanningTree::OnAddLine(XLine* line, User* user) } } -void ModuleSpanningTree::OnDelLine(XLine* line, User* user) +void ModuleSpanningTree::OnDelLine(User* user, XLine *x) { - if (line->type == "K") + if (x->type == "K") return; char data[MAXBUF]; - snprintf(data,MAXBUF,"%s %s", line->type.c_str(), line->Displayable()); + snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable()); std::deque params; params.push_back(data); @@ -828,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) @@ -895,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; @@ -908,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") @@ -932,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); } @@ -993,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); @@ -1004,7 +1006,7 @@ ModuleSpanningTree::~ModuleSpanningTree() Version ModuleSpanningTree::GetVersion() { - return Version(1,1,0,2,VF_VENDOR,API_VERSION); + return Version(1,2,0,2,VF_VENDOR,API_VERSION); } /* It is IMPORTANT that m_spanningtree is the last module in the chain