-/*
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ * E-mail:
+ * <brain@chatspike.net>
+ * <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
+
+#include "inspircd_config.h"
+#include "inspircd.h"
+#include "inspircd_io.h"
+#include "inspircd_util.h"
+#include <unistd.h>
+#include <sys/errno.h>
+
+#ifdef USE_KQUEUE
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/time.h>
+#endif
+
+#ifdef USE_EPOLL
+#include <sys/epoll.h>
+#endif
+
+#include <time.h>
+#include <string>
+#ifdef GCC3
+#include <ext/hash_map>
+#else
+#include <hash_map>
+#endif
+#include <map>
+#include <sstream>
+#include <vector>
+#include <deque>
+#include "users.h"
+#include "ctables.h"
+#include "globals.h"
+#include "modules.h"
+#include "dynamic.h"
+#include "wildcard.h"
+#include "message.h"
+#include "mode.h"
+#include "xline.h"
+#include "commands.h"
+#include "inspstring.h"
+#include "helperfuncs.h"
+#include "hashcomp.h"
+#include "socket.h"
+#ifdef USE_KQUEUE
+extern int kq;
+#endif
-*/
+#ifdef USE_EPOLL
+int ep;
+#endif
+extern int MODCOUNT;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
+
+extern std::vector<std::string> include_stack;
+
+extern std::vector<InspSocket*> module_sockets;
+
+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<std::string> module_names;
+
+extern int boundPortCount;
+extern int portCount;
+
+extern int ports[MAXSOCKS];
+
+
+
+extern std::stringstream config_f;
-#include <typeinfo>
-#include <iostream>
-#include "globals.h"
-#include "modules.h"
-#include "ctables.h"
-#include "inspircd_io.h"
-#include "wildcard.h"
-#include "mode.h"
-#include "message.h"
+
+extern FILE *log_file;
+
+extern userrec* fd_ref_table[65536];
+
+typedef nspace::hash_map<std::string, userrec*, nspace::hash<string>, irc::StrHashComp> user_hash;
+typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, irc::StrHashComp> chan_hash;
+typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, irc::InAddr_HashComp> address_cache;
+typedef nspace::hash_map<std::string, WhoWasUser*, nspace::hash<string>, irc::StrHashComp> whowas_hash;
+typedef std::deque<command_t> command_table;
+
+
+extern user_hash clientlist;
+extern chan_hash chanlist;
+extern whowas_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
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<ExtMode> ExtModeList;
typedef ExtModeList::iterator ExtModeListIter;
+
ExtModeList EMode;
// returns true if an extended mode character is in use
bool ModeDefined(char modechar, int type)
{
- log(DEBUG,"Size of extmodes vector is %d",EMode.size());
for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
{
- log(DEBUG,"i->modechar==%c, modechar=%c, i->type=%d, type=%d",i->modechar,modechar,i->type,type);
if ((i->modechar == modechar) && (i->type == type))
{
return true;
return false;
}
+bool ModeIsListMode(char modechar, int type)
+{
+ for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
+ {
+ if ((i->modechar == modechar) && (i->type == type) && (i->list == true))
+ {
+ return true;
+ }
+ }
+ return false;
+}
+
bool ModeDefinedOper(char modechar, int type)
{
- log(DEBUG,"Size of extmodes vector is %d",EMode.size());
for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
{
- log(DEBUG,"i->modechar==%c, modechar=%c, i->type=%d, type=%d",i->modechar,modechar,i->type,type);
if ((i->modechar == modechar) && (i->type == type) && (i->needsoper == true))
{
return true;
return true;
}
+// turns a mode into a listmode
+void ModeMakeList(char modechar)
+{
+ for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
+ {
+ if ((i->modechar == modechar) && (i->type == MT_CHANNEL))
+ {
+ i->list = true;
+ return;
+ }
+ }
+ return;
+}
// version is a simple class for holding a modules version number
-Version::Version(int major, int minor, int revision, int build) : Major(major), Minor(minor), Revision(revision), Build(build) { };
+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) { };
-Module::Module() { }
-Module::~Module() { }
-void Module::OnUserConnect(userrec* user) { }
-void Module::OnUserQuit(userrec* user) { }
-void Module::OnUserJoin(userrec* user, chanrec* channel) { }
-void Module::OnUserPart(userrec* user, chanrec* channel) { }
-void Module::OnPacketTransmit(char *p) { }
-void Module::OnPacketReceive(char *p) { }
-void Module::OnRehash() { }
-void Module::OnServerRaw(std::string &raw, bool inbound) { }
-int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; }
-bool Module::OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) { return false; }
-Version Module::GetVersion() { return Version(1,0,0,0); }
-void Module::OnOper(userrec* user) { };
-void Module::OnInfo(userrec* user) { };
-void Module::OnWhois(userrec* source, userrec* dest) { };
-int Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text) { return 0; };
-int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text) { return 0; };
-int Module::OnUserPreNick(userrec* user, std::string newnick) { return 0; };
+Request::Request(char* anydata, Module* src, Module* dst) : data(anydata), source(src), dest(dst) { };
+
+char* Request::GetData()
+{
+ return this->data;
+}
+
+Module* Request::GetSource()
+{
+ return this->source;
+}
+
+Module* Request::GetDest()
+{
+ return this->dest;
+}
+
+char* Request::Send()
+{
+ if (this->dest)
+ {
+ return dest->OnRequest(this);
+ }
+ else
+ {
+ return NULL;
+ }
+}
+
+Event::Event(char* anydata, Module* src, std::string eventid) : data(anydata), source(src), id(eventid) { };
+
+char* Event::GetData()
+{
+ return this->data;
+}
+
+Module* Event::GetSource()
+{
+ return this->source;
+}
+
+char* Event::Send()
+{
+ FOREACH_MOD OnEvent(this);
+ return NULL;
+}
+
+std::string Event::GetEventID()
+{
+ return this->id;
+}
+
+
+// These declarations define the behavours of the base class Module (which does nothing at all)
+ Module::Module() { }
+ Module::~Module() { }
+void Module::OnUserConnect(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::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, 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; };
+int Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text) { return 0; };
+int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text) { return 0; };
+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; };
+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; };
+void Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason) { };
+int Module::OnRawMode(userrec* user, chanrec* chan, char mode, std::string param, bool adding, int pcnt) { return 0; };
+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::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; };
+void Module::OnEvent(Event* event) { return; };
+char* Module::OnRequest(Request* request) { return NULL; };
+int Module::OnOperCompare(std::string password, std::string input) { return 0; };
+void Module::OnGlobalOper(userrec* user) { };
+void Module::OnGlobalConnect(userrec* user) { };
+int Module::OnAddBan(userrec* source, chanrec* channel,std::string banmask) { return 0; };
+int Module::OnDelBan(userrec* source, chanrec* channel,std::string banmask) { return 0; };
+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; };
+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) { };
// server is a wrapper class that provides methods to all of the C-style
// exports in the core
{
}
+void Server::AddSocket(InspSocket* sock)
+{
+ module_sockets.push_back(sock);
+}
+
+void Server::DelSocket(InspSocket* sock)
+{
+ for (std::vector<InspSocket*>::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());
bool Server::MatchText(std::string sliteral, std::string spattern)
{
char literal[MAXBUF],pattern[MAXBUF];
- strncpy(literal,sliteral.c_str(),MAXBUF);
- strncpy(pattern,spattern.c_str(),MAXBUF);
+ strlcpy(literal,sliteral.c_str(),MAXBUF);
+ strlcpy(pattern,spattern.c_str(),MAXBUF);
return match(literal,pattern);
}
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)
return del_channel(user,cname.c_str(),reason.c_str(),false);
}
+chanuserlist Server::GetUsers(chanrec* chan)
+{
+ chanuserlist userl;
+ userl.clear();
+ std::vector<char*> *list = chan->GetUsers();
+ for (std::vector<char*>::iterator i = list->begin(); i != list->end(); i++)
+ {
+ char* o = *i;
+ userl.push_back((userrec*)o);
+ }
+ return userl;
+}
void Server::ChangeUserNick(userrec* user, std::string nickname)
{
force_nickchange(user,nickname.c_str());
void Server::QuitUser(userrec* user, std::string reason)
{
- send_network_quit(user->nick,reason.c_str());
kill_link(user,reason.c_str());
}
+bool Server::IsUlined(std::string server)
+{
+ return is_uline(server.c_str());
+}
+
void Server::CallCommandHandler(std::string commandname, char** parameters, int pcnt, userrec* user)
{
call_handler(commandname.c_str(),parameters,pcnt,user);
log(level,"%s",s.c_str());
}
-void Server::AddCommand(char* cmd, handlerfunc f, char flags, int minparams)
+void Server::AddCommand(char* cmd, handlerfunc f, char flags, int minparams, char* source)
{
- createcommand(cmd,f,flags,minparams);
+ createcommand(cmd,f,flags,minparams,source);
}
void Server::SendMode(char **parameters, int pcnt, userrec *user)
}
}
+void Server::SendChannelServerNotice(std::string ServName, chanrec* Channel, std::string text)
+{
+ WriteChannelWithServ((char*)ServName.c_str(), Channel, "%s", text.c_str());
+}
+
void Server::SendChannel(userrec* User, chanrec* Channel, std::string s,bool IncludeSender)
{
if (IncludeSender)
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());
return cmode(User,Chan);
}
+bool Server::IsOnChannel(userrec* User, chanrec* Chan)
+{
+ return has_channel(User,Chan);
+}
+
std::string Server::GetServerName()
{
return getservername();
return getnetworkname();
}
+std::string Server::GetServerDescription()
+{
+ return getserverdesc();
+}
+
Admin Server::GetAdmin()
{
return Admin(getadminname(),getadminemail(),getadminnick());
bool Server::AddExtendedMode(char modechar, int type, bool requires_oper, int params_when_on, int params_when_off)
{
- if (type == MT_SERVER)
+ if (((modechar >= 'A') && (modechar <= 'Z')) || ((modechar >= 'a') && (modechar <= 'z')))
{
- log(DEBUG,"*** API ERROR *** Modes of type MT_SERVER are reserved for future expansion");
- return false;
- }
- if (((params_when_on>0) || (params_when_off>0)) && (type == MT_CLIENT))
- {
- log(DEBUG,"*** API ERROR *** Parameters on MT_CLIENT modes are not supported");
- return false;
+ if (type == MT_SERVER)
+ {
+ log(DEBUG,"*** API ERROR *** Modes of type MT_SERVER are reserved for future expansion");
+ return false;
+ }
+ if (((params_when_on>0) || (params_when_off>0)) && (type == MT_CLIENT))
+ {
+ log(DEBUG,"*** API ERROR *** Parameters on MT_CLIENT modes are not supported");
+ return false;
+ }
+ if ((params_when_on>1) || (params_when_off>1))
+ {
+ log(DEBUG,"*** API ERROR *** More than one parameter for an MT_CHANNEL mode is not yet supported");
+ return false;
+ }
+ return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off);
}
- if ((params_when_on>1) || (params_when_off>1))
+ else
{
- log(DEBUG,"*** API ERROR *** More than one parameter for an MT_CHANNEL mode is not yet supported");
- return false;
+ log(DEBUG,"*** API ERROR *** Muppet modechar detected.");
}
- return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off);
+ return false;
+}
+
+bool Server::AddExtendedListMode(char modechar)
+{
+ bool res = DoAddExtendedMode(modechar,MT_CHANNEL,false,1,1);
+ if (res)
+ ModeMakeList(modechar);
+ return res;
}
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());
+#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)
+ {
+ if (zombie->chans[i].channel->name)
+ {
+ chanrec* Ptr = zombie->chans[i].channel;
+ WriteFrom(zombie->fd,zombie,"JOIN %s",Ptr->name);
+ if (Ptr->topicset)
+ {
+ WriteServ(zombie->fd,"332 %s %s :%s", zombie->nick, Ptr->name, Ptr->topic);
+ WriteServ(zombie->fd,"333 %s %s %s %d", zombie->nick, Ptr->name, Ptr->setby, Ptr->topicset);
+ }
+ userlist(zombie,Ptr);
+ WriteServ(zombie->fd,"366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name);
+
+ }
+ }
+ }
+ return true;
+}
+
+void Server::AddGLine(long duration, std::string source, std::string reason, std::string hostmask)
+{
+ add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+}
+
+void Server::AddQLine(long duration, std::string source, std::string reason, std::string nickname)
+{
+ add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
+}
+
+void Server::AddZLine(long duration, std::string source, std::string reason, std::string ipaddr)
+{
+ add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
+}
+
+void Server::AddKLine(long duration, std::string source, std::string reason, std::string hostmask)
+{
+ add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+}
+
+void Server::AddELine(long duration, std::string source, std::string reason, std::string hostmask)
+{
+ add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+}
+
+bool Server::DelGLine(std::string hostmask)
+{
+ return del_gline(hostmask.c_str());
+}
+
+bool Server::DelQLine(std::string nickname)
+{
+ return del_qline(nickname.c_str());
+}
+
+bool Server::DelZLine(std::string ipaddr)
+{
+ return del_zline(ipaddr.c_str());
+}
+
+bool Server::DelKLine(std::string hostmask)
+{
+ return del_kline(hostmask.c_str());
+}
+
+bool Server::DelELine(std::string hostmask)
+{
+ return del_eline(hostmask.c_str());
+}
+
+long Server::CalcDuration(std::string delta)
+{
+ return duration(delta.c_str());
+}
+
+bool Server::IsValidMask(std::string mask)
+{
+ const char* dest = mask.c_str();
+ if (strchr(dest,'!')==0)
+ return false;
+ if (strchr(dest,'@')==0)
+ return false;
+ for (unsigned int i = 0; i < strlen(dest); i++)
+ if (dest[i] < 32)
+ return false;
+ for (unsigned int i = 0; i < strlen(dest); i++)
+ if (dest[i] > 126)
+ return false;
+ 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 (unsigned int i = 0; i < strlen(dest); i++)
+ if (dest[i] == '@')
+ c++;
+ if (c>1)
+ return false;
+
+ return true;
+}
+
+Module* Server::FindModule(std::string name)
+{
+ for (int i = 0; i <= MODCOUNT; i++)
+ {
+ if (module_names[i] == name)
+ {
+ return modules[i];
+ }
+ }
+ return NULL;
+}
+
ConfigReader::ConfigReader()
{
+ include_stack.clear();
this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
- this->error = LoadConf(CONFIG_FILE,this->cache);
+ this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out);
+ this->readerror = LoadConf(CONFIG_FILE,this->cache,this->errorlog);
+ if (!this->readerror)
+ this->error = CONF_FILE_NOT_FOUND;
}
{
if (this->cache)
delete this->cache;
+ if (this->errorlog)
+ delete this->errorlog;
}
ConfigReader::ConfigReader(std::string filename)
{
this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
- this->error = LoadConf(filename.c_str(),this->cache);
+ this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out);
+ this->readerror = LoadConf(filename.c_str(),this->cache,this->errorlog);
+ if (!this->readerror)
+ this->error = CONF_FILE_NOT_FOUND;
};
std::string ConfigReader::ReadValue(std::string tag, std::string name, int index)
char val[MAXBUF];
char t[MAXBUF];
char n[MAXBUF];
- strncpy(t,tag.c_str(),MAXBUF);
- strncpy(n,name.c_str(),MAXBUF);
- ReadConf(cache,t,n,index,val);
- return std::string(val);
+ strlcpy(t,tag.c_str(),MAXBUF);
+ strlcpy(n,name.c_str(),MAXBUF);
+ int res = ReadConf(cache,t,n,index,val);
+ if (!res)
+ {
+ this->error = CONF_VALUE_NOT_FOUND;
+ return "";
+ }
+ return val;
+}
+
+bool ConfigReader::ReadFlag(std::string tag, std::string name, int index)
+{
+ char val[MAXBUF];
+ char t[MAXBUF];
+ char n[MAXBUF];
+ strlcpy(t,tag.c_str(),MAXBUF);
+ strlcpy(n,name.c_str(),MAXBUF);
+ int res = ReadConf(cache,t,n,index,val);
+ if (!res)
+ {
+ this->error = CONF_VALUE_NOT_FOUND;
+ return false;
+ }
+ std::string s = val;
+ return ((s == "yes") || (s == "YES") || (s == "true") || (s == "TRUE") || (s == "1"));
+}
+
+long ConfigReader::ReadInteger(std::string tag, std::string name, int index, bool needs_unsigned)
+{
+ char val[MAXBUF];
+ char t[MAXBUF];
+ char n[MAXBUF];
+ strlcpy(t,tag.c_str(),MAXBUF);
+ strlcpy(n,name.c_str(),MAXBUF);
+ int res = ReadConf(cache,t,n,index,val);
+ if (!res)
+ {
+ this->error = CONF_VALUE_NOT_FOUND;
+ return 0;
+ }
+ for (unsigned int i = 0; i < strlen(val); i++)
+ {
+ if (!isdigit(val[i]))
+ {
+ this->error = CONF_NOT_A_NUMBER;
+ return 0;
+ }
+ }
+ if ((needs_unsigned) && (atoi(val)<0))
+ {
+ this->error = CONF_NOT_UNSIGNED;
+ return 0;
+ }
+ return atoi(val);
+}
+
+long ConfigReader::GetError()
+{
+ long olderr = this->error;
+ this->error = 0;
+ return olderr;
+}
+
+void ConfigReader::DumpErrors(bool bail, userrec* user)
+{
+ if (bail)
+ {
+ printf("There were errors in your configuration:\n%s",errorlog->str().c_str());
+ exit(0);
+ }
+ else
+ {
+ char dataline[1024];
+ if (user)
+ {
+ WriteServ(user->fd,"NOTICE %s :There were errors in the configuration file:",user->nick);
+ while (!errorlog->eof())
+ {
+ errorlog->getline(dataline,1024);
+ WriteServ(user->fd,"NOTICE %s :%s",user->nick,dataline);
+ }
+ }
+ else
+ {
+ WriteOpers("There were errors in the configuration file:",user->nick);
+ while (!errorlog->eof())
+ {
+ errorlog->getline(dataline,1024);
+ WriteOpers(dataline);
+ }
+ }
+ return;
+ }
}
bool ConfigReader::Verify()
{
- return this->error;
+ return this->readerror;
}
std::string FileReader::GetLine(int x)
{
- if ((x<0) || (x>fc.size()))
+ if ((x<0) || ((unsigned)x>fc.size()))
return "";
return fc[x];
}