* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
-#include "inspircd_config.h"
-//#include "inspircd.h"
#include "configreader.h"
-#include <unistd.h>
-#include <sys/errno.h>
-#include <time.h>
-#include <string>
-#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 "mode.h"
#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"
#include "dns.h"
#include "inspircd.h"
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
-extern time_t TIME;
-extern command_table cmdlist;
-
-class Server;
-
-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, int api_ver)
+: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags), API(api_ver)
{
}
return this->source;
}
-char* Event::Send()
+char* Event::Send(InspIRCd* ServerInstance)
{
FOREACH_MOD(I_OnEvent,OnEvent(this));
return NULL;
// These declarations define the behavours of the base class Module (which does nothing at all)
- Module::Module(Server* Me) { }
+ Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
Module::~Module() { }
void Module::OnUserConnect(userrec* user) { }
-void Module::OnUserQuit(userrec* user, const std::string& message) { }
+void Module::OnUserQuit(userrec* user, const std::string& message, const std::string &oper_message) { }
void Module::OnUserDisconnect(userrec* user) { }
-void Module::OnUserJoin(userrec* user, chanrec* channel) { }
-void Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) { }
-void Module::OnRehash(const std::string ¶meter) { }
+void Module::OnUserJoin(userrec* user, chanrec* channel, bool &silent) { }
+void Module::OnPostJoin(userrec* user, chanrec* channel) { }
+void Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) { }
+void Module::OnRehash(userrec* user, const std::string ¶meter) { }
void Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
-int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; }
+int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { return 0; }
void Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { };
-Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); }
+Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); }
void Module::OnOper(userrec* user, const std::string &opertype) { };
void Module::OnPostOper(userrec* user, const 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,char status) { return 0; };
-int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status) { return 0; };
+int Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; };
+int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; };
int Module::OnUserPreNick(userrec* user, const std::string &newnick) { return 0; };
void Module::OnUserPostNick(userrec* user, const std::string &oldnick) { };
int Module::OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) { return ACR_DEFAULT; };
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, const 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, const std::string &original_line) { return 0; };
+void Module::OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line) { };
bool Module::OnCheckReady(userrec* user) { return true; };
-void Module::OnUserRegister(userrec* user) { };
+int Module::OnUserRegister(userrec* user) { return 0; };
int Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { return 0; };
-void Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { };
-int Module::OnRawMode(userrec* user, chanrec* chan, char mode, const std::string ¶m, bool adding, int pcnt) { return 0; };
+void Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) { };
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::OnLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { return 0; };
void Module::OnEvent(Event* event) { return; };
char* Module::OnRequest(Request* request) { return NULL; };
-int Module::OnOperCompare(const std::string &password, const std::string &input) { return 0; };
+int Module::OnOperCompare(const std::string &password, const std::string &input, int tagnumber) { return 0; };
void Module::OnGlobalOper(userrec* user) { };
-void Module::OnGlobalConnect(userrec* user) { };
+void Module::OnPostConnect(userrec* user) { };
int Module::OnAddBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; };
int Module::OnDelBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; };
void Module::OnRawSocketAccept(int fd, const std::string &ip, int localport) { };
int Module::OnRawSocketWrite(int fd, const char* buffer, int count) { return 0; };
void Module::OnRawSocketClose(int fd) { };
+void Module::OnRawSocketConnect(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, const std::string &text, char status) { };
-void Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status) { };
+void Module::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { };
+void Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { };
void Module::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason) { };
void Module::OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { };
void Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { };
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, const std::string &modeline) { };
-void Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname) { };
-void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname) { };
-void Module::OnSyncOtherMetaData(Module* proto, void* opaque) { };
+void Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname, bool displayable) { };
+void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable) { };
+void Module::OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable) { };
void Module::OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { };
void Module::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) { };
void Module::OnWallops(userrec* user, const std::string &text) { };
Priority Module::Prioritize() { return PRIORITY_DONTCARE; }
void Module::OnSetAway(userrec* user) { };
void Module::OnCancelAway(userrec* user) { };
-
-/* server is a wrapper class that provides methods to all of the C-style
- * exports in the core
- */
-
-void Server::AddSocket(InspSocket* sock)
-{
- ServerInstance->module_sockets.push_back(sock);
-}
-
-void Server::RemoveSocket(InspSocket* sock)
-{
- for (std::vector<InspSocket*>::iterator a = ServerInstance->module_sockets.begin(); a < ServerInstance->module_sockets.end(); a++)
- {
- InspSocket* s = (InspSocket*)*a;
- if (s == sock)
- s->MarkAsClosed();
- }
-}
+int Module::OnUserList(userrec* user, chanrec* Ptr, CUList* &userlist) { return 0; };
+int Module::OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) { return 0; };
+void Module::OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list) { };
+void Module::OnGarbageCollect() { };
+void Module::OnBufferFlushed(userrec* user) { };
long InspIRCd::PriorityAfter(const std::string &modulename)
{
return iter->second;
}
-const std::string& InspIRCd::GetModuleName(Module* m)
+bool InspIRCd::PublishInterface(const std::string &InterfaceName, Module* Mod)
{
- static std::string nothing = ""; /* Prevent compiler warning */
- for (int i = 0; i <= MODCOUNT; i++)
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+
+ if (iter == Interfaces.end())
+ {
+ modulelist ml;
+ ml.push_back(Mod);
+ Interfaces[InterfaceName] = std::make_pair(0, ml);
+ return true;
+ }
+ else
+ {
+ iter->second.second.push_back(Mod);
+ return true;
+ }
+ return false;
+}
+
+bool InspIRCd::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
+{
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+
+ if (iter == Interfaces.end())
+ return false;
+
+ for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++)
{
- if (modules[i] == m)
+ if (*x == Mod)
{
- return this->Config->module_names[i];
+ iter->second.second.erase(x);
+ if (iter->second.second.empty())
+ Interfaces.erase(InterfaceName);
+ return true;
}
}
- return nothing; /* As above */
+ return false;
+}
+
+modulelist* InspIRCd::FindInterface(const std::string &InterfaceName)
+{
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter == Interfaces.end())
+ return NULL;
+ else
+ return &(iter->second.second);
+}
+
+void InspIRCd::UseInterface(const std::string &InterfaceName)
+{
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter != Interfaces.end())
+ iter->second.first++;
+
}
-void Server::RehashServer()
+void InspIRCd::DoneWithInterface(const std::string &InterfaceName)
{
- ServerInstance->WriteOpers("*** Rehashing config file");
- ServerInstance->Config->Read(false,NULL);
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter != Interfaces.end())
+ iter->second.first--;
}
-void Server::DelSocket(InspSocket* sock)
+std::pair<int,std::string> InspIRCd::GetInterfaceInstanceCount(Module* m)
{
- for (std::vector<InspSocket*>::iterator a = ServerInstance->module_sockets.begin(); a < ServerInstance->module_sockets.end(); a++)
+ for (interfacelist::iterator iter = Interfaces.begin(); iter != Interfaces.end(); iter++)
{
- if (*a == sock)
+ for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++)
{
- ServerInstance->module_sockets.erase(a);
- return;
+ if (*x == m)
+ {
+ return std::make_pair(iter->second.first, iter->first);
+ }
}
}
+ return std::make_pair(0, "");
}
-long Server::GetChannelCount()
+const std::string& InspIRCd::GetModuleName(Module* m)
{
- return (long)ServerInstance->chanlist.size();
+ static std::string nothing = ""; /* Prevent compiler warning */
+
+ if (!this->GetModuleCount())
+ return nothing;
+
+ for (int i = 0; i <= this->GetModuleCount(); i++)
+ {
+ if (this->modules[i] == m)
+ {
+ return this->Config->module_names[i];
+ }
+ }
+ return nothing; /* As above */
+}
+
+void InspIRCd::RehashServer()
+{
+ this->WriteOpers("*** Rehashing config file");
+ this->RehashUsersAndChans();
+ this->Config->Read(false,NULL);
+ this->ResetMaxBans();
+ this->Res->Rehash();
}
/* This is ugly, yes, but hash_map's arent designed to be
* m_safelist possible, initially).
*/
-chanrec* Server::GetChannelIndex(long index)
+chanrec* InspIRCd::GetChannelIndex(long index)
{
int target = 0;
- for (chan_hash::iterator n = ServerInstance->chanlist.begin(); n != ServerInstance->chanlist.end(); n++, target++)
+ for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++)
{
if (index == target)
return n->second;
return NULL;
}
-bool Server::MatchText(const std::string &sliteral, const std::string &spattern)
+bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern)
{
return match(sliteral.c_str(),spattern.c_str());
}
-bool Server::IsUlined(const std::string &server)
-{
- return is_uline(server.c_str());
-}
-
-bool Server::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
+bool InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
{
- return ServerInstance->Parser->CallHandler(commandname,parameters,pcnt,user);
+ return this->Parser->CallHandler(commandname,parameters,pcnt,user);
}
-bool Server::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user)
+bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user)
{
- return ServerInstance->Parser->IsValidCommand(commandname, pcnt, user);
+ return this->Parser->IsValidCommand(commandname, pcnt, user);
}
-void Server::AddCommand(command_t *f)
+void InspIRCd::AddCommand(command_t *f)
{
- if (!ServerInstance->Parser->CreateCommand(f))
+ if (!this->Parser->CreateCommand(f))
{
ModuleException err("Command "+std::string(f->command)+" already exists.");
throw (err);
}
}
-void Server::SendMode(const char** parameters, int pcnt, userrec *user)
+void InspIRCd::SendMode(const char** parameters, int pcnt, userrec *user)
{
- ServerInstance->ModeGrok->Process(parameters,pcnt,user,true);
+ this->Modes->Process(parameters,pcnt,user,true);
}
-void Server::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream)
+void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream)
{
std::string CompleteLine = LinePrefix;
std::string Word = "";
User->WriteServ(CompleteLine);
}
-userrec* Server::FindDescriptor(int socket)
-{
- return (socket < 65536 ? ServerInstance->fd_ref_table[socket] : NULL);
-}
-
-bool Server::AddMode(ModeHandler* mh, const unsigned char mode)
+userrec* InspIRCd::FindDescriptor(int socket)
{
- return ServerInstance->ModeGrok->AddMode(mh,mode);
+ return reinterpret_cast<userrec*>(this->SE->GetRef(socket));
}
-bool Server::AddModeWatcher(ModeWatcher* mw)
+bool InspIRCd::AddMode(ModeHandler* mh, const unsigned char mode)
{
- return ServerInstance->ModeGrok->AddModeWatcher(mw);
+ return this->Modes->AddMode(mh,mode);
}
-bool Server::DelModeWatcher(ModeWatcher* mw)
+bool InspIRCd::AddModeWatcher(ModeWatcher* mw)
{
- return ServerInstance->ModeGrok->DelModeWatcher(mw);
+ return this->Modes->AddModeWatcher(mw);
}
-bool Server::AddResolver(Resolver* r)
+bool InspIRCd::DelModeWatcher(ModeWatcher* mw)
{
- return ServerInstance->Res->AddResolverClass(r);
+ return this->Modes->DelModeWatcher(mw);
}
-bool InspIRCd::UserToPseudo(userrec* user, const std::string &message)
+bool InspIRCd::AddResolver(Resolver* r, bool cached)
{
- unsigned int old_fd = user->fd;
- user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
- user->FlushWriteBuf();
- user->ClearBuffer();
- user->fd = FD_MAGIC_NUMBER;
-
- if (find(local_users.begin(),local_users.end(),user) != local_users.end())
+ if (!cached)
+ return this->Res->AddResolverClass(r);
+ else
{
- local_users.erase(find(local_users.begin(),local_users.end(),user));
- log(DEBUG,"Delete local user");
+ r->TriggerCachedResult();
+ delete r;
+ return true;
}
-
- ServerInstance->SE->DelFd(old_fd);
- shutdown(old_fd,2);
- close(old_fd);
- return true;
}
-bool InspIRCd::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
+bool InspIRCd::UserToPseudo(userrec* user, const 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();
- // save these for later
- std::string oldnick = alive->nick;
- std::string oldhost = alive->host;
- std::string oldident = alive->ident;
- userrec::QuitUser(this,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));
- log(DEBUG,"Delete local user");
- }
- // Fix by brain - cant write the user until their fd table entry is updated
- ServerInstance->fd_ref_table[zombie->fd] = zombie;
- zombie->Write(":%s!%s@%s NICK %s",oldnick.c_str(),oldident.c_str(),oldhost.c_str(),zombie->nick);
- for (std::vector<ucrec*>::const_iterator i = zombie->chans.begin(); i != zombie->chans.end(); i++)
- {
- if (((ucrec*)(*i))->channel != NULL)
- {
- chanrec* Ptr = ((ucrec*)(*i))->channel;
- zombie->WriteFrom(zombie,"JOIN %s",Ptr->name);
- if (Ptr->topicset)
- {
- zombie->WriteServ("332 %s %s :%s", zombie->nick, Ptr->name, Ptr->topic);
- zombie->WriteServ("333 %s %s %s %d", zombie->nick, Ptr->name, Ptr->setby, Ptr->topicset);
- }
- Ptr->UserList(zombie);
- zombie->WriteServ("366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name);
- }
- }
- if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->fd != FD_MAGIC_NUMBER))
- local_users.push_back(zombie);
-
- return true;
+ throw CoreException("The InspIRCd::UsertoPseudo function should not be used in InspIRCd later than 1.0.x");
+ return false;
}
-void Server::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
+bool InspIRCd::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
{
- add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
- apply_lines(APPLY_GLINES);
+ throw CoreException("The InspIRCd::PseudotoUser function should not be used in InspIRCd later than 1.0.x");
+ return false;
}
-void Server::AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname)
+void InspIRCd::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
{
- add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
- apply_lines(APPLY_QLINES);
+ XLines->add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+ XLines->apply_lines(APPLY_GLINES);
}
-void Server::AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr)
+void InspIRCd::AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname)
{
- add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
- apply_lines(APPLY_ZLINES);
+ XLines->add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
+ XLines->apply_lines(APPLY_QLINES);
}
-void Server::AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
+void InspIRCd::AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr)
{
- add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
- apply_lines(APPLY_KLINES);
+ XLines->add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
+ XLines->apply_lines(APPLY_ZLINES);
}
-void Server::AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
+void InspIRCd::AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
{
- add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+ XLines->add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+ XLines->apply_lines(APPLY_KLINES);
}
-bool Server::DelGLine(const std::string &hostmask)
+void InspIRCd::AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
{
- return del_gline(hostmask.c_str());
+ XLines->add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
}
-bool Server::DelQLine(const std::string &nickname)
+bool InspIRCd::DelGLine(const std::string &hostmask)
{
- return del_qline(nickname.c_str());
+ return XLines->del_gline(hostmask.c_str());
}
-bool Server::DelZLine(const std::string &ipaddr)
+bool InspIRCd::DelQLine(const std::string &nickname)
{
- return del_zline(ipaddr.c_str());
+ return XLines->del_qline(nickname.c_str());
}
-bool Server::DelKLine(const std::string &hostmask)
+bool InspIRCd::DelZLine(const std::string &ipaddr)
{
- return del_kline(hostmask.c_str());
+ return XLines->del_zline(ipaddr.c_str());
}
-bool Server::DelELine(const std::string &hostmask)
+bool InspIRCd::DelKLine(const std::string &hostmask)
{
- return del_eline(hostmask.c_str());
+ return XLines->del_kline(hostmask.c_str());
}
-long Server::CalcDuration(const std::string &delta)
+bool InspIRCd::DelELine(const std::string &hostmask)
{
- return duration(delta.c_str());
+ return XLines->del_eline(hostmask.c_str());
}
/*
* XXX why on *earth* is this in modules.cpp...? I think
- * perhaps we need a server.cpp for Server:: stuff where possible. -- w00t
+ * perhaps we need a server.cpp for InspIRCd:: stuff where possible. -- w00t
*/
-bool Server::IsValidMask(const std::string &mask)
+bool InspIRCd::IsValidMask(const std::string &mask)
{
char* dest = (char*)mask.c_str();
if (strchr(dest,'!')==0)
return true;
}
-Module* Server::FindModule(const std::string &name)
+Module* InspIRCd::FindModule(const std::string &name)
{
- for (int i = 0; i <= MODCOUNT; i++)
+ for (int i = 0; i <= this->GetModuleCount(); i++)
{
- if (ServerInstance->Config->module_names[i] == name)
+ if (this->Config->module_names[i] == name)
{
- return modules[i];
+ return this->modules[i];
}
}
return NULL;
}
-ConfigReader::ConfigReader()
+ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance)
{
- // ServerInstance->Config->ClearStack();
-
/* Is there any reason to load the entire config file again here?
* it's needed if they specify another config file, but using the
* default one we can just use the global config data - pre-parsed!
*/
- //~ this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
- //~ this->readerror = ServerInstance->Config->LoadConf(CONFIG_FILE, this->cache,this->errorlog);
- //~ if (!this->readerror)
- //~ this->error = CONF_FILE_NOT_FOUND;
-
this->data = &ServerInstance->Config->config_data;
this->privatehash = false;
}
ConfigReader::~ConfigReader()
{
- //~ if (this->cache)
- //~ delete this->cache;
if (this->errorlog)
DELETE(this->errorlog);
if(this->privatehash)
}
-ConfigReader::ConfigReader(const std::string &filename)
+ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
{
ServerInstance->Config->ClearStack();
-
+
this->data = new ConfigDataHash;
this->privatehash = true;
this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
this->error = CONF_FILE_NOT_FOUND;
};
-std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index)
+
+std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds)
{
/* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
std::string result;
- if (!ServerInstance->Config->ConfValue(*this->data, tag, name, index, result))
+ if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds))
{
this->error = CONF_VALUE_NOT_FOUND;
- return "";
}
-
return result;
}
+std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index, bool allow_linefeeds)
+{
+ return ReadValue(tag, name, "", index, allow_linefeeds);
+}
+
+bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index)
+{
+ return ServerInstance->Config->ConfValueBool(*this->data, tag, name, default_value, index);
+}
+
bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
{
- return ServerInstance->Config->ConfValueBool(*this->data, tag, name, index);
+ return ReadFlag(tag, name, "", index);
}
-long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned)
+
+long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool needs_unsigned)
{
int result;
- if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, index, result))
+ if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, default_value, index, result))
{
this->error = CONF_VALUE_NOT_FOUND;
return 0;
return result;
}
+long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned)
+{
+ return ReadInteger(tag, name, "", index, needs_unsigned);
+}
+
long ConfigReader::GetError()
{
long olderr = this->error;
void ConfigReader::DumpErrors(bool bail, userrec* user)
{
- /* XXX - Duplicated code */
-
- if (bail)
- {
- printf("There were errors in your configuration:\n%s", this->errorlog->str().c_str());
- InspIRCd::Exit(ERROR);
- }
- else
- {
- std::string errors = this->errorlog->str();
- std::string::size_type start;
- unsigned int prefixlen;
-
- start = 0;
- /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */
- prefixlen = strlen(ServerInstance->Config->ServerName) + strlen(user->nick) + 11;
-
- if (user)
- {
- user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick);
-
- while(start < errors.length())
- {
- user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
- start += 510 - prefixlen;
- }
- }
- else
- {
- ServerInstance->WriteOpers("There were errors in the configuration file:");
-
- while(start < errors.length())
- {
- ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
- start += 360;
- }
- }
-
- return;
- }
+ ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user);
}
}
-FileReader::FileReader(const std::string &filename)
+FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
{
- file_cache c;
- ServerInstance->Config->ReadFile(c,filename.c_str());
- this->fc = c;
- this->CalcSize();
+ LoadFile(filename);
}
-FileReader::FileReader()
+FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance)
{
}
void FileReader::LoadFile(const std::string &filename)
{
file_cache c;
- ServerInstance->Config->ReadFile(c,filename.c_str());
- this->fc = c;
- this->CalcSize();
+ c.clear();
+ if (ServerInstance->Config->ReadFile(c,filename.c_str()))
+ {
+ this->fc = c;
+ this->CalcSize();
+ }
}
}
-std::vector<Module*> modules(255);
-std::vector<ircd_module*> factory(255);
-
-int MODCOUNT = -1;