X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=030007d1ef8ae01908d27d35ebdc76064e3c36df;hb=2a81a5a0026396e7c476f648a25016443e002d85;hp=629672b248e1b8343a1dba39f0b2f49206a376c2;hpb=262b54d0a8d203842a2b04585f08e4102bdbb7e0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 629672b24..030007d1e 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -19,7 +19,6 @@ using namespace std; #include "inspircd_config.h" #include "inspircd.h" #include "inspircd_io.h" -#include "inspircd_util.h" #include #include #include @@ -49,30 +48,23 @@ using namespace std; #include "socket.h" #include "socketengine.h" #include "typedefs.h" +#include "modules.h" +#include "command_parse.h" -extern SocketEngine* SE; extern ServerConfig *Config; +extern InspIRCd* ServerInstance; extern int MODCOUNT; extern std::vector modules; extern std::vector factory; extern std::vector module_sockets; - +extern std::vector local_users; extern time_t TIME; -extern int WHOWAS_STALE; -extern int WHOWAS_MAX; -extern time_t startup_time; -extern int boundPortCount; -extern int portCount; -extern int ports[MAXSOCKS]; - class Server; -extern userrec* fd_ref_table[65536]; +extern userrec* fd_ref_table[MAX_DESCRIPTORS]; extern user_hash clientlist; extern chan_hash chanlist; -extern whowas_hash whowas; extern command_table cmdlist; -extern address_cache IP; ExtModeList EMode; // returns true if an extended mode character is in use @@ -213,7 +205,7 @@ Module* Event::GetSource() char* Event::Send() { - FOREACH_MOD OnEvent(this); + FOREACH_MOD(I_OnEvent,OnEvent(this)); return NULL; } @@ -253,7 +245,7 @@ void Module::OnLoadModule(Module* mod,std::string name) { }; void Module::OnUnloadModule(Module* mod,std::string name) { }; void Module::OnBackgroundTimer(time_t curtime) { }; void Module::OnSendList(userrec* user, chanrec* channel, char mode) { }; -int Module::OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user) { return 0; }; +int Module::OnPreCommand(std::string command, char **parameters, int pcnt, userrec *user, bool validated) { return 0; }; bool Module::OnCheckReady(userrec* user) { return true; }; void Module::OnUserRegister(userrec* user) { }; int Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, std::string reason) { return 0; }; @@ -263,7 +255,7 @@ int Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; }; int Module::OnCheckKey(userrec* user, chanrec* chan, std::string keygiven) { return 0; }; int Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; }; int Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; }; -void Module::OnStats(char symbol) { }; +int Module::OnStats(char symbol, userrec* user) { return 0; }; int Module::OnChangeLocalUserHost(userrec* user, std::string newhost) { return 0; }; int Module::OnChangeLocalUserGECOS(userrec* user, std::string newhost) { return 0; }; int Module::OnLocalTopicChange(userrec* user, chanrec* chan, std::string topic) { return 0; }; @@ -305,6 +297,8 @@ void Module::OnDelKLine(userrec* source, std::string hostmask) { }; void Module::OnDelQLine(userrec* source, std::string nickmask) { }; void Module::OnDelELine(userrec* source, std::string hostmask) { }; void Module::OnCleanup(int target_type, void* item) { }; +void Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; }; +Priority Module::Prioritize() { return PRIORITY_DONTCARE; } /* server is a wrapper class that provides methods to all of the C-style * exports in the core @@ -323,12 +317,39 @@ void Server::AddSocket(InspSocket* sock) module_sockets.push_back(sock); } +void Server::RemoveSocket(InspSocket* sock) +{ + for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) + { + InspSocket* s = (InspSocket*)*a; + if (s == sock) + { + log(DEBUG,"Forcibly removed socket"); + ServerInstance->SE->DelFd(s->GetFd()); + s->Close(); + module_sockets.erase(a); + delete s; + return; + } + } +} + void Server::RehashServer() { WriteOpers("*** Rehashing config file"); Config->Read(false,NULL); } +ServerConfig* Server::GetConfig() +{ + return Config; +} + +std::string Server::GetVersion() +{ + return ServerInstance->GetVersionString(); +} + void Server::DelSocket(InspSocket* sock) { for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) @@ -373,10 +394,10 @@ chanuserlist Server::GetUsers(chanrec* chan) { chanuserlist userl; userl.clear(); - std::vector *list = chan->GetUsers(); - for (std::vector::iterator i = list->begin(); i != list->end(); i++) + std::map *list = chan->GetUsers(); + for (std::map::iterator i = list->begin(); i != list->end(); i++) { - char* o = *i; + char* o = i->second; userl.push_back((userrec*)o); } return userl; @@ -398,12 +419,12 @@ bool Server::IsUlined(std::string server) void Server::CallCommandHandler(std::string commandname, char** parameters, int pcnt, userrec* user) { - call_handler(commandname.c_str(),parameters,pcnt,user); + ServerInstance->Parser->CallHandler(commandname,parameters,pcnt,user); } bool Server::IsValidModuleCommand(std::string commandname, int pcnt, userrec* user) { - return is_valid_cmd(commandname.c_str(), pcnt, user); + return ServerInstance->Parser->IsValidCommand(commandname, pcnt, user); } void Server::Log(int level, std::string s) @@ -411,29 +432,29 @@ void Server::Log(int level, std::string s) log(level,"%s",s.c_str()); } -void Server::AddCommand(char* cmd, handlerfunc f, char flags, int minparams, char* source) +void Server::AddCommand(command_t *f) { - createcommand(cmd,f,flags,minparams,source); + ServerInstance->Parser->CreateCommand(f); } void Server::SendMode(char **parameters, int pcnt, userrec *user) { - server_mode(parameters,pcnt,user); + ServerInstance->ModeGrok->ServerMode(parameters,pcnt,user); } void Server::Send(int Socket, std::string s) { - Write(Socket,"%s",s.c_str()); + Write_NoFormat(Socket,s.c_str()); } void Server::SendServ(int Socket, std::string s) { - WriteServ(Socket,"%s",s.c_str()); + WriteServ_NoFormat(Socket,s.c_str()); } void Server::SendFrom(int Socket, userrec* User, std::string s) { - WriteFrom(Socket,User,"%s",s.c_str()); + WriteFrom_NoFormat(Socket,User,s.c_str()); } void Server::SendTo(userrec* Source, userrec* Dest, std::string s) @@ -446,24 +467,24 @@ void Server::SendTo(userrec* Source, userrec* Dest, std::string s) else { // otherwise it comes from the user specified - WriteTo(Source,Dest,"%s",s.c_str()); + WriteTo_NoFormat(Source,Dest,s.c_str()); } } void Server::SendChannelServerNotice(std::string ServName, chanrec* Channel, std::string text) { - WriteChannelWithServ((char*)ServName.c_str(), Channel, "%s", text.c_str()); + WriteChannelWithServ_NoFormat((char*)ServName.c_str(), Channel, text.c_str()); } void Server::SendChannel(userrec* User, chanrec* Channel, std::string s,bool IncludeSender) { if (IncludeSender) { - WriteChannel(Channel,User,"%s",s.c_str()); + WriteChannel_NoFormat(Channel,User,s.c_str()); } else { - ChanExceptSender(Channel,User,"%s",s.c_str()); + ChanExceptSender_NoFormat(Channel,User,s.c_str()); } } @@ -476,11 +497,11 @@ void Server::SendCommon(userrec* User, std::string text,bool IncludeSender) { if (IncludeSender) { - WriteCommon(User,"%s",text.c_str()); + WriteCommon_NoFormat(User,text.c_str()); } else { - WriteCommonExcept(User,"%s",text.c_str()); + WriteCommonExcept_NoFormat(User,text.c_str()); } } @@ -531,22 +552,22 @@ bool Server::IsOnChannel(userrec* User, chanrec* Chan) std::string Server::GetServerName() { - return getservername(); + return Config->ServerName; } std::string Server::GetNetworkName() { - return getnetworkname(); + return Config->Network; } std::string Server::GetServerDescription() { - return getserverdesc(); + return Config->ServerDesc; } Admin Server::GetAdmin() { - return Admin(getadminname(),getadminemail(),getadminnick()); + return Admin(Config->AdminName,Config->AdminEmail,Config->AdminNick); } @@ -596,10 +617,18 @@ int Server::CountUsers(chanrec* c) bool Server::UserToPseudo(userrec* user,std::string message) { unsigned int old_fd = user->fd; - user->fd = FD_MAGIC_NUMBER; - user->ClearBuffer(); Write(old_fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str()); - SE->DelFd(old_fd); + user->FlushWriteBuf(); + user->ClearBuffer(); + user->fd = FD_MAGIC_NUMBER; + + if (find(local_users.begin(),local_users.end(),user) != local_users.end()) + { + local_users.erase(find(local_users.begin(),local_users.end(),user)); + log(DEBUG,"Delete local user"); + } + + ServerInstance->SE->DelFd(old_fd); shutdown(old_fd,2); close(old_fd); return true; @@ -607,11 +636,21 @@ bool Server::UserToPseudo(userrec* user,std::string message) bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message) { + log(DEBUG,"PseudoToUser"); zombie->fd = alive->fd; + FOREACH_MOD(I_OnUserQuit,OnUserQuit(alive,message)); alive->fd = FD_MAGIC_NUMBER; + alive->FlushWriteBuf(); alive->ClearBuffer(); Write(zombie->fd,":%s!%s@%s NICK %s",alive->nick,alive->ident,alive->host,zombie->nick); kill_link(alive,message.c_str()); + + if (find(local_users.begin(),local_users.end(),alive) != local_users.end()) + { + local_users.erase(find(local_users.begin(),local_users.end(),alive)); + log(DEBUG,"Delete local user"); + } + fd_ref_table[zombie->fd] = zombie; for (unsigned int i = 0; i < zombie->chans.size(); i++) { @@ -632,6 +671,9 @@ bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message) } } } + if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->fd != FD_MAGIC_NUMBER)) + local_users.push_back(zombie); + return true; }