X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=a0e15076465bc856c3ba694df7d06ada0007657d;hb=922d4ebf7a27a6577d6b4f91e0f42ccdfa989455;hp=a054e9b87d34c94570fe43acc2254a22a0a379e7;hpb=c307344610c7484ccd5b42d90eedfc19d72bb74b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index a054e9b87..a0e150764 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -43,6 +43,7 @@ #include "typedefs.h" #include "modules.h" #include "command_parse.h" +#include "dns.h" extern ServerConfig *Config; extern InspIRCd* ServerInstance; @@ -63,17 +64,40 @@ featurelist Features; // version is a simple class for holding a modules version number -Version::Version(int major, int minor, int revision, int build, int flags) : Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags) { }; +Version::Version(int major, int minor, int revision, int build, int flags) +: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags) +{ +} // admin is a simple class for holding a server's administrative info -Admin::Admin(std::string name, std::string email, std::string nick) : Name(name), Email(email), Nick(nick) { }; +Admin::Admin(std::string name, std::string email, std::string nick) +: Name(name), Email(email), Nick(nick) +{ +} -Request::Request(char* anydata, Module* src, Module* dst) : data(anydata), source(src), dest(dst) { }; +Request::Request(char* anydata, Module* src, Module* dst) +: data(anydata), source(src), dest(dst) +{ + /* Ensure that because this module doesnt support ID strings, it doesnt break modules that do + * by passing them uninitialized pointers (could happen) + */ + id = '\0'; +} + +Request::Request(Module* src, Module* dst, const char* idstr) +: id(idstr), source(src), dest(dst) +{ +}; char* Request::GetData() { - return (char*)this->data; + return this->data; +} + +const char* Request::GetId() +{ + return this->id; } Module* Request::GetSource() @@ -151,7 +175,7 @@ int Module::OnKill(userrec* source, userrec* dest, const std::string &reason) { void Module::OnLoadModule(Module* mod,const std::string &name) { }; void Module::OnUnloadModule(Module* mod,const std::string &name) { }; void Module::OnBackgroundTimer(time_t curtime) { }; -int Module::OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated) { return 0; }; +int Module::OnPreCommand(const std::string &command, const 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, const std::string &reason) { return 0; }; @@ -161,7 +185,7 @@ int Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; }; int Module::OnCheckKey(userrec* user, chanrec* chan, const std::string &keygiven) { return 0; }; int Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; }; int Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; }; -int Module::OnStats(char symbol, userrec* user) { return 0; }; +int Module::OnStats(char symbol, userrec* user, string_list &results) { return 0; }; int Module::OnChangeLocalUserHost(userrec* user, const std::string &newhost) { return 0; }; int Module::OnChangeLocalUserGECOS(userrec* user, const std::string &newhost) { return 0; }; int Module::OnLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { return 0; }; @@ -376,16 +400,6 @@ void Server::SendToModeMask(const std::string &modes, int flags, const std::stri WriteMode(modes.c_str(),flags,"%s",text.c_str()); } -chanrec* Server::JoinUserToChannel(userrec* user, const std::string &cname, const std::string &key) -{ - return add_channel(user,cname.c_str(),key.c_str(),false); -} - -chanrec* Server::PartUserFromChannel(userrec* user, const std::string &cname, const std::string &reason) -{ - return del_channel(user,cname.c_str(),reason.c_str(),false); -} - chanuserlist Server::GetUsers(chanrec* chan) { chanuserlist userl; @@ -395,34 +409,13 @@ chanuserlist Server::GetUsers(chanrec* chan) userl.push_back(i->second); return userl; } -void Server::ChangeUserNick(userrec* user, const std::string &nickname) -{ - force_nickchange(user,nickname.c_str()); -} - -void Server::KickUser(userrec* source, userrec* target, chanrec* chan, const std::string &reason) -{ - if (source) - { - kick_channel(source,target,chan,(char*)reason.c_str()); - } - else - { - server_kick_channel(target,chan,(char*)reason.c_str(),true); - } -} - -void Server::QuitUser(userrec* user, const std::string &reason) -{ - kill_link(user,reason.c_str()); -} bool Server::IsUlined(const std::string &server) { return is_uline(server.c_str()); } -bool Server::CallCommandHandler(const std::string &commandname, char** parameters, int pcnt, userrec* user) +bool Server::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user) { return ServerInstance->Parser->CallHandler(commandname,parameters,pcnt,user); } @@ -446,9 +439,9 @@ void Server::AddCommand(command_t *f) } } -void Server::SendMode(char **parameters, int pcnt, userrec *user) +void Server::SendMode(const char** parameters, int pcnt, userrec *user) { - //ServerInstance->ModeGrok->ServerMode(parameters,pcnt,user); + ServerInstance->ModeGrok->Process(parameters,pcnt,user,true); } void Server::Send(int Socket, const std::string &s) @@ -480,23 +473,6 @@ void Server::SendTo(userrec* Source, userrec* Dest, const std::string &s) } } -void Server::SendChannelServerNotice(const std::string &ServName, chanrec* Channel, const std::string &text) -{ - WriteChannelWithServ_NoFormat((char*)ServName.c_str(), Channel, text.c_str()); -} - -void Server::SendChannel(userrec* User, chanrec* Channel, const std::string &s, bool IncludeSender) -{ - if (IncludeSender) - { - WriteChannel_NoFormat(Channel,User,s.c_str()); - } - else - { - ChanExceptSender_NoFormat(Channel,User,0,s.c_str()); - } -} - bool Server::CommonChannels(userrec* u1, userrec* u2) { return (common_channels(u1,u2) != 0); @@ -596,6 +572,21 @@ bool Server::AddMode(ModeHandler* mh, const unsigned char mode) return ServerInstance->ModeGrok->AddMode(mh,mode); } +bool Server::AddModeWatcher(ModeWatcher* mw) +{ + return ServerInstance->ModeGrok->AddModeWatcher(mw); +} + +bool Server::DelModeWatcher(ModeWatcher* mw) +{ + return ServerInstance->ModeGrok->DelModeWatcher(mw); +} + +bool Server::AddResolver(Resolver* r) +{ + return ServerInstance->Res->AddResolverClass(r); +} + int Server::CountUsers(chanrec* c) { return usercount(c); @@ -633,7 +624,7 @@ bool Server::PseudoToUser(userrec* alive, userrec* zombie, const std::string &me std::string oldnick = alive->nick; std::string oldhost = alive->host; std::string oldident = alive->ident; - kill_link(alive,message.c_str()); + userrec::QuitUser(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)); @@ -921,17 +912,43 @@ FileReader::FileReader(const std::string &filename) file_cache c; readfile(c,filename.c_str()); this->fc = c; + this->CalcSize(); } FileReader::FileReader() { } +std::string FileReader::Contents() +{ + std::string x = ""; + for (file_cache::iterator a = this->fc.begin(); a != this->fc.end(); a++) + { + x.append(*a); + x.append("\r\n"); + } + return x; +} + +unsigned long FileReader::ContentSize() +{ + return this->contentsize; +} + +void FileReader::CalcSize() +{ + unsigned long n = 0; + for (file_cache::iterator a = this->fc.begin(); a != this->fc.end(); a++) + n += (a->length() + 2); + this->contentsize = n; +} + void FileReader::LoadFile(const std::string &filename) { file_cache c; readfile(c,filename.c_str()); this->fc = c; + this->CalcSize(); }