X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=35372a71edd45e11ff61beb3b9831d1925e5a518;hb=878e437589ee448bc2e87200890cbd446accfc68;hp=95e2aa77ce70fea1c0cf545eeeae997fd65a7578;hpb=b8b1fccfad11b6eee9298cef6c81607da8d0f58c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 95e2aa77c..35372a71e 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -14,16 +14,25 @@ * --------------------------------------------------- */ +using namespace std; + +#include "inspircd_config.h" #include "inspircd.h" #include "inspircd_io.h" #include "inspircd_util.h" -#include "inspircd_config.h" #include -#include #include -#include -#include -#include + +#ifdef USE_KQUEUE +#include +#include +#include +#endif + +#ifdef USE_EPOLL +#include +#endif + #include #include #ifdef GCC3 @@ -34,11 +43,7 @@ #include #include #include -#include #include -#include -#include -#include #include "connection.h" #include "users.h" #include "servers.h" @@ -52,19 +57,23 @@ #include "xline.h" #include "commands.h" #include "inspstring.h" +#include "helperfuncs.h" +#include "hashcomp.h" -#ifdef GCC3 -#define nspace __gnu_cxx -#else -#define nspace std +#ifdef USE_KQUEUE +extern int kq; #endif -using namespace std; +#ifdef USE_EPOLL +int ep; +#endif extern int MODCOUNT; extern std::vector modules; extern std::vector factory; +extern std::vector include_stack; + extern time_t TIME; extern int LogLevel; @@ -91,12 +100,11 @@ extern int NetBufferSize; extern int MaxWhoResults; extern time_t nb_start; -extern std::vector fd_reap; extern std::vector module_names; extern int boundPortCount; extern int portCount; -extern int UDPportCount; +extern int SERVERportCount; extern int ports[MAXSOCKS]; extern int defaultRoute; @@ -109,79 +117,16 @@ extern FILE *log_file; extern userrec* fd_ref_table[65536]; -namespace nspace -{ -#ifdef GCC34 - template<> struct hash -#else - template<> struct nspace::hash -#endif - { - size_t operator()(const struct in_addr &a) const - { - size_t q; - memcpy(&q,&a,sizeof(size_t)); - return q; - } - }; -#ifdef GCC34 - template<> struct hash -#else - template<> struct nspace::hash -#endif - { - size_t operator()(const string &s) const - { - char a[MAXBUF]; - static struct hash strhash; - strlcpy(a,s.c_str(),MAXBUF); - strlower(a); - return strhash(a); - } - }; -} - -struct StrHashComp -{ - - bool operator()(const string& s1, const string& s2) const - { - char a[MAXBUF],b[MAXBUF]; - strlcpy(a,s1.c_str(),MAXBUF); - strlcpy(b,s2.c_str(),MAXBUF); - strlower(a); - strlower(b); - return (strcasecmp(a,b) == 0); - } - -}; - -struct InAddr_HashComp -{ - - bool operator()(const in_addr &s1, const in_addr &s2) const - { - size_t q; - size_t p; - - memcpy(&q,&s1,sizeof(size_t)); - memcpy(&p,&s2,sizeof(size_t)); - - return (q == p); - } - -}; - - -typedef nspace::hash_map, StrHashComp> user_hash; -typedef nspace::hash_map, StrHashComp> chan_hash; -typedef nspace::hash_map, InAddr_HashComp> address_cache; +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; extern chan_hash chanlist; -extern user_hash whowas; +extern whowas_hash whowas; extern command_table cmdlist; extern file_cache MOTD; extern file_cache RULES; @@ -195,9 +140,9 @@ 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) { }; }; @@ -385,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; }; @@ -446,7 +392,7 @@ void Server::SendToModeMask(std::string modes, int flags, std::string text) chanrec* Server::JoinUserToChannel(userrec* user, std::string cname, std::string key) { - return add_channel(user,cname.c_str(),key.c_str(),true); + return add_channel(user,cname.c_str(),key.c_str(),false); } chanrec* Server::PartUserFromChannel(userrec* user, std::string cname, std::string reason) @@ -473,7 +419,6 @@ void Server::ChangeUserNick(userrec* user, std::string nickname) void Server::QuitUser(userrec* user, std::string reason) { - send_network_quit(user->nick,reason.c_str()); kill_link(user,reason.c_str()); } @@ -620,6 +565,11 @@ std::string Server::GetNetworkName() return getnetworkname(); } +std::string Server::GetServerDescription() +{ + return getserverdesc(); +} + Admin Server::GetAdmin() { return Admin(getadminname(),getadminemail(),getadminnick()); @@ -673,17 +623,41 @@ 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()); - close(old_fd); - shutdown (old_fd,2); +#ifdef USE_KQUEUE + struct kevent ke; + EV_SET(&ke, old_fd, EVFILT_READ, EV_DELETE, 0, 0, NULL); + int i = kevent(kq, &ke, 1, 0, 0, NULL); + if (i == -1) + { + 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) { zombie->fd = alive->fd; alive->fd = FD_MAGIC_NUMBER; + alive->ClearBuffer(); Write(zombie->fd,":%s!%s@%s NICK %s",alive->nick,alive->ident,alive->host,zombie->nick); kill_link(alive,message.c_str()); + fd_ref_table[zombie->fd] = zombie; for (int i = 0; i != MAXCHANS; i++) { if (zombie->chans[i].channel != NULL) @@ -699,13 +673,11 @@ bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message) } userlist(zombie,Ptr); WriteServ(zombie->fd,"366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name); - //WriteServ(zombie->fd,"324 %s %s +%s",zombie->nick, Ptr->name,chanmodes(Ptr)); - //WriteServ(zombie->fd,"329 %s %s %d", zombie->nick, Ptr->name, Ptr->created); } } } - + return true; } void Server::AddGLine(long duration, std::string source, std::string reason, std::string hostmask) @@ -735,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) @@ -770,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) @@ -850,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); @@ -889,7 +862,7 @@ std::string ConfigReader::ReadValue(std::string tag, std::string name, int index this->error = CONF_VALUE_NOT_FOUND; return ""; } - return std::string(val); + return val; } bool ConfigReader::ReadFlag(std::string tag, std::string name, int index) @@ -922,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])) { @@ -1031,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]; }