X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=030007d1ef8ae01908d27d35ebdc76064e3c36df;hb=2a81a5a0026396e7c476f648a25016443e002d85;hp=8b7f277310c504d6f9d0e3b56630bac4d18210d1;hpb=a643172dd76776544773eeb4aa49b79a98ac5ca1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 8b7f27731..030007d1e 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -14,16 +14,13 @@ * --------------------------------------------------- */ +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 #include #include #ifdef GCC3 @@ -34,14 +31,8 @@ #include #include #include -#include #include -#include -#include -#include -#include "connection.h" #include "users.h" -#include "servers.h" #include "ctables.h" #include "globals.h" #include "modules.h" @@ -52,159 +43,28 @@ #include "xline.h" #include "commands.h" #include "inspstring.h" +#include "helperfuncs.h" +#include "hashcomp.h" +#include "socket.h" +#include "socketengine.h" +#include "typedefs.h" +#include "modules.h" +#include "command_parse.h" -#ifdef GCC3 -#define nspace __gnu_cxx -#else -#define nspace std -#endif - -using namespace std; - +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 LogLevel; -extern char ServerName[MAXBUF]; -extern char Network[MAXBUF]; -extern char ServerDesc[MAXBUF]; -extern char AdminName[MAXBUF]; -extern char AdminEmail[MAXBUF]; -extern char AdminNick[MAXBUF]; -extern char diepass[MAXBUF]; -extern char restartpass[MAXBUF]; -extern char motd[MAXBUF]; -extern char rules[MAXBUF]; -extern char list[MAXBUF]; -extern char PrefixQuit[MAXBUF]; -extern char DieValue[MAXBUF]; - -extern int debugging; -extern int WHOWAS_STALE; -extern int WHOWAS_MAX; -extern int DieDelay; -extern time_t startup_time; -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 ports[MAXSOCKS]; -extern int defaultRoute; - -extern std::vector auth_cookies; -extern std::stringstream config_f; - -extern serverrec* me[32]; - -extern FILE *log_file; - - -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 std::deque command_table; - +class Server; +extern userrec* fd_ref_table[MAX_DESCRIPTORS]; extern user_hash clientlist; extern chan_hash chanlist; -extern user_hash whowas; extern command_table cmdlist; -extern file_cache MOTD; -extern file_cache RULES; -extern address_cache IP; - - -// class type for holding an extended mode character - internal to core - -class ExtMode : public classbase -{ -public: - char modechar; - int type; - 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 ExtModeList::iterator ExtModeListIter; - - ExtModeList EMode; // returns true if an extended mode character is in use @@ -345,7 +205,7 @@ Module* Event::GetSource() char* Event::Send() { - FOREACH_MOD OnEvent(this); + FOREACH_MOD(I_OnEvent,OnEvent(this)); return NULL; } @@ -356,21 +216,21 @@ std::string Event::GetEventID() // These declarations define the behavours of the base class Module (which does nothing at all) - Module::Module() { } + + Module::Module(Server* Me) { } Module::~Module() { } void Module::OnUserConnect(userrec* user) { } -void Module::OnUserQuit(userrec* user) { } +void Module::OnUserQuit(userrec* user, std::string message) { } void Module::OnUserDisconnect(userrec* user) { } void Module::OnUserJoin(userrec* user, chanrec* channel) { } void Module::OnUserPart(userrec* user, chanrec* channel) { } -void Module::OnPacketTransmit(std::string &data, std::string serv) { } -void Module::OnPacketReceive(std::string &data, std::string serv) { } -void Module::OnRehash() { } +void Module::OnRehash(std::string parameter) { } void Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { } int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; } int Module::OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) { return false; } +void Module::OnMode(userrec* user, void* dest, int target_type, std::string text) { }; Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); } -void Module::OnOper(userrec* user) { }; +void Module::OnOper(userrec* user, std::string opertype) { }; void Module::OnInfo(userrec* user) { }; void Module::OnWhois(userrec* source, userrec* dest) { }; int Module::OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel) { return 0; }; @@ -379,14 +239,13 @@ int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::stri int Module::OnUserPreNick(userrec* user, std::string newnick) { return 0; }; void Module::OnUserPostNick(userrec* user, std::string oldnick) { }; int Module::OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) { return ACR_DEFAULT; }; -string_list Module::OnUserSync(userrec* user) { string_list empty; return empty; } -string_list Module::OnChannelSync(chanrec* chan) { string_list empty; return empty; } 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; }; +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; }; @@ -396,11 +255,10 @@ 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; }; -int Module::OnMeshToken(char token,string_list params,serverrec* source,serverrec* reply, std::string tcp_host,std::string ipaddr,int port) { return 0; }; void Module::OnEvent(Event* event) { return; }; char* Module::OnRequest(Request* request) { return NULL; }; int Module::OnOperCompare(std::string password, std::string input) { return 0; }; @@ -412,10 +270,39 @@ void Module::OnRawSocketAccept(int fd, std::string ip, int localport) { }; int Module::OnRawSocketWrite(int fd, char* buffer, int count) { return 0; }; void Module::OnRawSocketClose(int fd) { }; int Module::OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { return 0; }; - -// server is a wrapper class that provides methods to all of the C-style -// exports in the core -// +void Module::OnUserMessage(userrec* user, void* dest, int target_type, std::string text) { }; +void Module::OnUserNotice(userrec* user, void* dest, int target_type, std::string text) { }; +void Module::OnRemoteKill(userrec* source, userrec* dest, std::string reason) { }; +void Module::OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { }; +void Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, std::string topic) { }; +void Module::OnGetServerDescription(std::string servername,std::string &description) { }; +void Module::OnSyncUser(userrec* user, Module* proto, void* opaque) { }; +void Module::OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { }; +void Module::ProtoSendMode(void* opaque, int target_type, void* target, std::string modeline) { }; +void Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, std::string extname) { }; +void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, std::string extname) { }; +void Module::OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata) { }; +void Module::ProtoSendMetaData(void* opaque, int target_type, void* target, std::string extname, std::string extdata) { }; +void Module::OnWallops(userrec* user, std::string text) { }; +void Module::OnChangeHost(userrec* user, std::string newhost) { }; +void Module::OnChangeName(userrec* user, std::string gecos) { }; +void Module::OnAddGLine(long duration, userrec* source, std::string reason, std::string hostmask) { }; +void Module::OnAddZLine(long duration, userrec* source, std::string reason, std::string ipmask) { }; +void Module::OnAddKLine(long duration, userrec* source, std::string reason, std::string hostmask) { }; +void Module::OnAddQLine(long duration, userrec* source, std::string reason, std::string nickmask) { }; +void Module::OnAddELine(long duration, userrec* source, std::string reason, std::string hostmask) { }; +void Module::OnDelGLine(userrec* source, std::string hostmask) { }; +void Module::OnDelZLine(userrec* source, std::string ipmask) { }; +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 + */ Server::Server() { @@ -425,6 +312,56 @@ Server::~Server() { } +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++) + { + if (*a == sock) + { + module_sockets.erase(a); + return; + } + } +} + void Server::SendOpers(std::string s) { WriteOpers("%s",s.c_str()); @@ -445,7 +382,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) @@ -457,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; @@ -472,7 +409,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()); } @@ -483,7 +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 ServerInstance->Parser->IsValidCommand(commandname, pcnt, user); } void Server::Log(int level, std::string s) @@ -491,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) @@ -526,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()); } } @@ -556,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()); } } @@ -589,6 +530,11 @@ userrec* Server::FindNick(std::string nick) return Find(nick); } +userrec* Server::FindDescriptor(int socket) +{ + return (socket < 65536 ? fd_ref_table[socket] : NULL); +} + chanrec* Server::FindChannel(std::string channel) { return FindChan(channel.c_str()); @@ -606,17 +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 Config->ServerDesc; } Admin Server::GetAdmin() { - return Admin(getadminname(),getadminemail(),getadminnick()); + return Admin(Config->AdminName,Config->AdminEmail,Config->AdminNick); } @@ -666,19 +617,42 @@ int Server::CountUsers(chanrec* c) bool Server::UserToPseudo(userrec* user,std::string message) { unsigned int old_fd = user->fd; - user->fd = FD_MAGIC_NUMBER; Write(old_fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str()); - close(old_fd); - shutdown (old_fd,2); + 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; } 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()); - for (int i = 0; i != MAXCHANS; i++) + + 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++) { if (zombie->chans[i].channel != NULL) { @@ -693,13 +667,14 @@ 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); } } } + if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->fd != FD_MAGIC_NUMBER)) + local_users.push_back(zombie); + return true; } void Server::AddGLine(long duration, std::string source, std::string reason, std::string hostmask) @@ -729,27 +704,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) @@ -764,20 +739,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) @@ -786,55 +761,11 @@ bool Server::IsValidMask(std::string mask) return true; } -void Server::MeshSendAll(std::string text) -{ - NetSendToAll((char*)text.c_str()); -} - -void Server::MeshSendCommon(userrec* user, std::string text) -{ - if (user) - NetSendToCommon(user,(char*)text.c_str()); -} - -void Server::MeshSendAllAlive(std::string text) -{ - NetSendToAllAlive((char*)text.c_str()); -} - -void Server::MeshSendUnicast(std::string destination, std::string text) -{ - NetSendToOne((char*)destination.c_str(),(char*)text.c_str()); -} - -void Server::MeshSendAllExcept(std::string target, std::string text) -{ - NetSendToAllExcept(target.c_str(),(char*)text.c_str()); -} - -bool Server::MeshCheckChan(chanrec *c,std::string servername) -{ - if (c) - { - return ChanAnyOnThisServer(c,(char*)servername.c_str()); - } - else return false; -} - -bool Server::MeshCheckCommon(userrec* u,std::string servername) -{ - if (u) - { - return CommonOnThisServer(u,(char*)servername.c_str()); - } - else return false; -} - Module* Server::FindModule(std::string name) { for (int i = 0; i <= MODCOUNT; i++) { - if (module_names[i] == name) + if (Config->module_names[i] == name) { return modules[i]; } @@ -844,9 +775,10 @@ Module* Server::FindModule(std::string name) ConfigReader::ConfigReader() { + Config->ClearStack(); 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); + this->readerror = Config->LoadConf(CONFIG_FILE,this->cache,this->errorlog); if (!this->readerror) this->error = CONF_FILE_NOT_FOUND; } @@ -863,9 +795,10 @@ ConfigReader::~ConfigReader() ConfigReader::ConfigReader(std::string filename) { + Config->ClearStack(); 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(filename.c_str(),this->cache,this->errorlog); + this->readerror = Config->LoadConf(filename.c_str(),this->cache,this->errorlog); if (!this->readerror) this->error = CONF_FILE_NOT_FOUND; }; @@ -877,13 +810,13 @@ std::string ConfigReader::ReadValue(std::string tag, std::string name, int index char n[MAXBUF]; strlcpy(t,tag.c_str(),MAXBUF); strlcpy(n,name.c_str(),MAXBUF); - int res = ReadConf(cache,t,n,index,val); + int res = Config->ReadConf(cache,t,n,index,val); if (!res) { this->error = CONF_VALUE_NOT_FOUND; return ""; } - return std::string(val); + return val; } bool ConfigReader::ReadFlag(std::string tag, std::string name, int index) @@ -893,7 +826,7 @@ bool ConfigReader::ReadFlag(std::string tag, std::string name, int index) char n[MAXBUF]; strlcpy(t,tag.c_str(),MAXBUF); strlcpy(n,name.c_str(),MAXBUF); - int res = ReadConf(cache,t,n,index,val); + int res = Config->ReadConf(cache,t,n,index,val); if (!res) { this->error = CONF_VALUE_NOT_FOUND; @@ -910,13 +843,13 @@ long ConfigReader::ReadInteger(std::string tag, std::string name, int index, boo char n[MAXBUF]; strlcpy(t,tag.c_str(),MAXBUF); strlcpy(n,name.c_str(),MAXBUF); - int res = ReadConf(cache,t,n,index,val); + int res = Config->ReadConf(cache,t,n,index,val); if (!res) { 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])) { @@ -974,12 +907,12 @@ void ConfigReader::DumpErrors(bool bail, userrec* user) int ConfigReader::Enumerate(std::string tag) { - return EnumConf(cache,tag.c_str()); + return Config->EnumConf(cache,tag.c_str()); } int ConfigReader::EnumerateValues(std::string tag, int index) { - return EnumValues(cache, tag.c_str(), index); + return Config->EnumValues(cache, tag.c_str(), index); } bool ConfigReader::Verify() @@ -1025,7 +958,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]; }