X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=35372a71edd45e11ff61beb3b9831d1925e5a518;hb=878e437589ee448bc2e87200890cbd446accfc68;hp=414cce617526203dd876c2d6d409f0ad24272d21;hpb=ab01aaeeee9aed655df2eec2522072233fe3aa57;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 414cce617..35372a71e 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -16,17 +16,23 @@ using namespace std; +#include "inspircd_config.h" #include "inspircd.h" #include "inspircd_io.h" #include "inspircd_util.h" -#include "inspircd_config.h" #include #include + #ifdef USE_KQUEUE #include #include #include #endif + +#ifdef USE_EPOLL +#include +#endif + #include #include #ifdef GCC3 @@ -58,9 +64,15 @@ using namespace std; extern int kq; #endif +#ifdef USE_EPOLL +int ep; +#endif + extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; +extern std::vector modules; +extern std::vector factory; + +extern std::vector include_stack; extern time_t TIME; @@ -88,7 +100,7 @@ extern int NetBufferSize; extern int MaxWhoResults; extern time_t nb_start; -extern std::vector module_names; +extern std::vector module_names; extern int boundPortCount; extern int portCount; @@ -105,11 +117,11 @@ extern FILE *log_file; extern userrec* fd_ref_table[65536]; -typedef nspace::hash_map, irc::StrHashComp, __single_client_alloc> user_hash; -typedef nspace::hash_map, irc::StrHashComp, __single_client_alloc> chan_hash; -typedef nspace::hash_map, irc::InAddr_HashComp, __single_client_alloc> address_cache; -typedef nspace::hash_map, irc::StrHashComp, __single_client_alloc> whowas_hash; -typedef std::deque command_table; +typedef nspace::hash_map, irc::StrHashComp> user_hash; +typedef nspace::hash_map, irc::StrHashComp> chan_hash; +typedef nspace::hash_map, irc::InAddr_HashComp> address_cache; +typedef nspace::hash_map, irc::StrHashComp> whowas_hash; +typedef std::deque command_table; extern user_hash clientlist; @@ -128,14 +140,14 @@ class ExtMode : public classbase public: char modechar; int type; + bool needsoper; int params_when_on; int params_when_off; - bool needsoper; bool list; ExtMode(char mc, int ty, bool oper, int p_on, int p_off) : modechar(mc), type(ty), needsoper(oper), params_when_on(p_on), params_when_off(p_off) { }; }; -typedef std::vector ExtModeList; +typedef std::vector ExtModeList; typedef ExtModeList::iterator ExtModeListIter; @@ -318,6 +330,7 @@ string_list Module::OnChannelSync(chanrec* chan) { string_list empty; return emp void Module::On005Numeric(std::string &output) { }; int Module::OnKill(userrec* source, userrec* dest, std::string reason) { return 0; }; 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; }; @@ -391,8 +404,8 @@ 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::vector *list = chan->GetUsers(); + for (std::vector::iterator i = list->begin(); i != list->end(); i++) { char* o = *i; userl.push_back((userrec*)o); @@ -621,8 +634,20 @@ bool Server::UserToPseudo(userrec* user,std::string message) log(DEBUG,"kqueue: Failed to remove user from queue!"); } #endif +#ifdef USE_EPOLL + struct epoll_event ev; + ev.events = EPOLLIN | EPOLLET; + ev.data.fd = old_fd; + int i = epoll_ctl(ep, EPOLL_CTL_DEL, old_fd, &ev); + if (i < 0) + { + log(DEBUG,"epoll: List deletion failure!"); + } +#endif + shutdown(old_fd,2); close(old_fd); + return true; } bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message) @@ -652,7 +677,7 @@ bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message) } } } - + return true; } void Server::AddGLine(long duration, std::string source, std::string reason, std::string hostmask) @@ -682,27 +707,27 @@ void Server::AddELine(long duration, std::string source, std::string reason, std bool Server::DelGLine(std::string hostmask) { - del_gline(hostmask.c_str()); + return del_gline(hostmask.c_str()); } bool Server::DelQLine(std::string nickname) { - del_qline(nickname.c_str()); + return del_qline(nickname.c_str()); } bool Server::DelZLine(std::string ipaddr) { - del_zline(ipaddr.c_str()); + return del_zline(ipaddr.c_str()); } bool Server::DelKLine(std::string hostmask) { - del_kline(hostmask.c_str()); + return del_kline(hostmask.c_str()); } bool Server::DelELine(std::string hostmask) { - del_eline(hostmask.c_str()); + return del_eline(hostmask.c_str()); } long Server::CalcDuration(std::string delta) @@ -717,20 +742,20 @@ bool Server::IsValidMask(std::string mask) return false; if (strchr(dest,'@')==0) return false; - for (int i = 0; i < strlen(dest); i++) + for (unsigned int i = 0; i < strlen(dest); i++) if (dest[i] < 32) return false; - for (int i = 0; i < strlen(dest); i++) + for (unsigned int i = 0; i < strlen(dest); i++) if (dest[i] > 126) return false; - int c = 0; - for (int i = 0; i < strlen(dest); i++) + unsigned int c = 0; + for (unsigned int i = 0; i < strlen(dest); i++) if (dest[i] == '!') c++; if (c>1) return false; c = 0; - for (int i = 0; i < strlen(dest); i++) + for (unsigned int i = 0; i < strlen(dest); i++) if (dest[i] == '@') c++; if (c>1) @@ -797,6 +822,7 @@ Module* Server::FindModule(std::string name) ConfigReader::ConfigReader() { + include_stack.clear(); this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out); this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out); this->readerror = LoadConf(CONFIG_FILE,this->cache,this->errorlog); @@ -869,7 +895,7 @@ long ConfigReader::ReadInteger(std::string tag, std::string name, int index, boo this->error = CONF_VALUE_NOT_FOUND; return 0; } - for (int i = 0; i < strlen(val); i++) + for (unsigned int i = 0; i < strlen(val); i++) { if (!isdigit(val[i])) { @@ -978,7 +1004,7 @@ bool FileReader::Exists() std::string FileReader::GetLine(int x) { - if ((x<0) || (x>fc.size())) + if ((x<0) || ((unsigned)x>fc.size())) return ""; return fc[x]; } @@ -989,8 +1015,8 @@ int FileReader::FileSize() } -std::vector modules(255); -std::vector factory(255); +std::vector modules(255); +std::vector factory(255); int MODCOUNT = -1;