*/
#include "inspircd_config.h"
-#include "inspircd.h"
+//#include "inspircd.h"
#include "configreader.h"
#include <unistd.h>
#include <sys/errno.h>
#include "modules.h"
#include "dynamic.h"
#include "wildcard.h"
-#include "message.h"
#include "mode.h"
#include "xline.h"
#include "commands.h"
#include "modules.h"
#include "command_parse.h"
#include "dns.h"
+#include "inspircd.h"
-extern ServerConfig *Config;
extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
-extern std::vector<InspSocket*> module_sockets;
-extern std::vector<userrec*> local_users;
extern time_t TIME;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
-extern user_hash clientlist;
-extern chan_hash chanlist;
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)
{
}
-// 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)
-{
-}
-
Request::Request(char* anydata, Module* src, Module* dst)
: data(anydata), source(src), dest(dst)
{
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, char* buffer, int count) { return 0; };
+int Module::OnRawSocketWrite(int fd, const 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, const std::string &text, char status) { };
* exports in the core
*/
-Server::Server()
-{
-}
-
-Server::~Server()
-{
-}
-
void Server::AddSocket(InspSocket* sock)
{
- module_sockets.push_back(sock);
+ ServerInstance->module_sockets.push_back(sock);
}
void Server::RemoveSocket(InspSocket* sock)
{
- for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
+ for (std::vector<InspSocket*>::iterator a = ServerInstance->module_sockets.begin(); a < ServerInstance->module_sockets.end(); a++)
{
InspSocket* s = (InspSocket*)*a;
if (s == sock)
}
}
-long Server::PriorityAfter(const std::string &modulename)
+long InspIRCd::PriorityAfter(const std::string &modulename)
{
- for (unsigned int j = 0; j < Config->module_names.size(); j++)
+ for (unsigned int j = 0; j < this->Config->module_names.size(); j++)
{
- if (Config->module_names[j] == modulename)
+ if (this->Config->module_names[j] == modulename)
{
return ((j << 8) | PRIORITY_AFTER);
}
return PRIORITY_DONTCARE;
}
-long Server::PriorityBefore(const std::string &modulename)
+long InspIRCd::PriorityBefore(const std::string &modulename)
{
- for (unsigned int j = 0; j < Config->module_names.size(); j++)
+ for (unsigned int j = 0; j < this->Config->module_names.size(); j++)
{
- if (Config->module_names[j] == modulename)
+ if (this->Config->module_names[j] == modulename)
{
return ((j << 8) | PRIORITY_BEFORE);
}
return PRIORITY_DONTCARE;
}
-bool Server::PublishFeature(const std::string &FeatureName, Module* Mod)
+bool InspIRCd::PublishFeature(const std::string &FeatureName, Module* Mod)
{
if (Features.find(FeatureName) == Features.end())
{
return false;
}
-bool Server::UnpublishFeature(const std::string &FeatureName)
+bool InspIRCd::UnpublishFeature(const std::string &FeatureName)
{
featurelist::iterator iter = Features.find(FeatureName);
return true;
}
-Module* Server::FindFeature(const std::string &FeatureName)
+Module* InspIRCd::FindFeature(const std::string &FeatureName)
{
featurelist::iterator iter = Features.find(FeatureName);
return iter->second;
}
-const std::string& Server::GetModuleName(Module* m)
+const std::string& InspIRCd::GetModuleName(Module* m)
{
static std::string nothing = ""; /* Prevent compiler warning */
- for (int i = 0; i <= MODCOUNT; i++)
+ for (int i = 0; i <= this->GetModuleCount(); i++)
{
- if (modules[i] == m)
+ if (this->modules[i] == m)
{
- return Config->module_names[i];
+ return this->Config->module_names[i];
}
}
return nothing; /* As above */
void Server::RehashServer()
{
- WriteOpers("*** Rehashing config file");
- Config->Read(false,NULL);
-}
-
-ServerConfig* Server::GetConfig()
-{
- return Config;
-}
-
-std::string Server::GetVersion()
-{
- return ServerInstance->GetVersionString();
+ ServerInstance->WriteOpers("*** Rehashing config file");
+ ServerInstance->Config->Read(false,NULL);
}
void Server::DelSocket(InspSocket* sock)
{
- for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
+ for (std::vector<InspSocket*>::iterator a = ServerInstance->module_sockets.begin(); a < ServerInstance->module_sockets.end(); a++)
{
if (*a == sock)
{
- module_sockets.erase(a);
+ ServerInstance->module_sockets.erase(a);
return;
}
}
}
-long Server::GetChannelCount()
-{
- return (long)chanlist.size();
-}
-
/* This is ugly, yes, but hash_map's arent designed to be
* addressed in this manner, and this is a bit of a kludge.
* Luckily its a specialist function and rarely used by
chanrec* Server::GetChannelIndex(long index)
{
int target = 0;
- for (chan_hash::iterator n = chanlist.begin(); n != chanlist.end(); n++, target++)
+ for (chan_hash::iterator n = ServerInstance->chanlist.begin(); n != ServerInstance->chanlist.end(); n++, target++)
{
if (index == target)
return n->second;
return NULL;
}
-void Server::AddTimer(InspTimer* T)
-{
- ::AddTimer(T);
-}
-
-void Server::SendOpers(const std::string &s)
-{
- WriteOpers("%s",s.c_str());
-}
-
bool Server::MatchText(const std::string &sliteral, const std::string &spattern)
{
return match(sliteral.c_str(),spattern.c_str());
}
-void Server::SendToModeMask(const std::string &modes, int flags, const std::string &text)
-{
- WriteMode(modes.c_str(),flags,"%s",text.c_str());
-}
-
-chanuserlist Server::GetUsers(chanrec* chan)
-{
- chanuserlist userl;
- userl.clear();
- CUList *list = chan->GetUsers();
- for (CUList::iterator i = list->begin(); i != list->end(); i++)
- userl.push_back(i->second);
- return userl;
-}
-void Server::ChangeUserNick(userrec* user, const std::string &nickname)
-{
- force_nickchange(user,nickname.c_str());
-}
-
bool Server::IsUlined(const std::string &server)
{
return is_uline(server.c_str());
return ServerInstance->Parser->IsValidCommand(commandname, pcnt, user);
}
-void Server::Log(int level, const std::string &s)
-{
- log(level,"%s",s.c_str());
-}
-
void Server::AddCommand(command_t *f)
{
if (!ServerInstance->Parser->CreateCommand(f))
ServerInstance->ModeGrok->Process(parameters,pcnt,user,true);
}
-void Server::Send(int Socket, const std::string &s)
-{
- Write_NoFormat(Socket,s.c_str());
-}
-
-void Server::SendServ(int Socket, const std::string &s)
-{
- WriteServ_NoFormat(Socket,s.c_str());
-}
-
-void Server::SendFrom(int Socket, userrec* User, const std::string &s)
-{
- WriteFrom_NoFormat(Socket,User,s.c_str());
-}
-
-void Server::SendTo(userrec* Source, userrec* Dest, const std::string &s)
-{
- if (!Source)
- {
- // if source is NULL, then the message originates from the local server
- WriteServ_NoFormat(Dest->fd,s.c_str());
- }
- else
- {
- // otherwise it comes from the user specified
- WriteTo_NoFormat(Source,Dest,s.c_str());
- }
-}
-
-bool Server::CommonChannels(userrec* u1, userrec* u2)
-{
- return (common_channels(u1,u2) != 0);
-}
-
void Server::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream)
{
std::string CompleteLine = LinePrefix;
{
if (CompleteLine.length() + Word.length() + 3 > 500)
{
- WriteServ_NoFormat(User->fd,CompleteLine.c_str());
+ User->WriteServ(CompleteLine);
CompleteLine = LinePrefix;
}
CompleteLine = CompleteLine + Word + " ";
}
- WriteServ_NoFormat(User->fd,CompleteLine.c_str());
-}
-
-void Server::SendCommon(userrec* User, const std::string &text, bool IncludeSender)
-{
- if (IncludeSender)
- {
- WriteCommon_NoFormat(User,text.c_str());
- }
- else
- {
- WriteCommonExcept_NoFormat(User,text.c_str());
- }
-}
-
-void Server::SendWallops(userrec* User, const std::string &text)
-{
- WriteWallOps(User,false,"%s",text.c_str());
-}
-
-void Server::ChangeHost(userrec* user, const std::string &host)
-{
- ChangeDisplayedHost(user,host.c_str());
-}
-
-void Server::ChangeGECOS(userrec* user, const std::string &gecos)
-{
- ChangeName(user,gecos.c_str());
-}
-
-bool Server::IsNick(const std::string &nick)
-{
- return (isnick(nick.c_str()) != 0);
-}
-
-userrec* Server::FindNick(const std::string &nick)
-{
- return Find(nick);
+ User->WriteServ(CompleteLine);
}
userrec* Server::FindDescriptor(int socket)
{
- return (socket < 65536 ? fd_ref_table[socket] : NULL);
-}
-
-chanrec* Server::FindChannel(const std::string &channel)
-{
- return FindChan(channel.c_str());
-}
-
-std::string Server::ChanMode(userrec* User, chanrec* Chan)
-{
- return cmode(User,Chan);
-}
-
-std::string Server::GetServerName()
-{
- return Config->ServerName;
-}
-
-std::string Server::GetNetworkName()
-{
- return Config->Network;
+ return (socket < 65536 ? ServerInstance->fd_ref_table[socket] : NULL);
}
-std::string Server::GetServerDescription()
-{
- return Config->ServerDesc;
-}
-
-Admin Server::GetAdmin()
-{
- return Admin(Config->AdminName,Config->AdminEmail,Config->AdminNick);
-}
-
-
bool Server::AddMode(ModeHandler* mh, const unsigned char mode)
{
return ServerInstance->ModeGrok->AddMode(mh,mode);
return ServerInstance->Res->AddResolverClass(r);
}
-int Server::CountUsers(chanrec* c)
-{
- return usercount(c);
-}
-
-bool Server::UserToPseudo(userrec* user, const std::string &message)
+bool InspIRCd::UserToPseudo(userrec* user, const std::string &message)
{
unsigned int old_fd = user->fd;
- Write(old_fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
+ user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
user->FlushWriteBuf();
user->ClearBuffer();
user->fd = FD_MAGIC_NUMBER;
return true;
}
-bool Server::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
+bool InspIRCd::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
{
log(DEBUG,"PseudoToUser");
zombie->fd = alive->fd;
std::string oldnick = alive->nick;
std::string oldhost = alive->host;
std::string oldident = alive->ident;
- userrec::QuitUser(alive,message.c_str());
+ 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
- fd_ref_table[zombie->fd] = zombie;
- Write(zombie->fd,":%s!%s@%s NICK %s",oldnick.c_str(),oldident.c_str(),oldhost.c_str(),zombie->nick);
+ 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;
- WriteFrom(zombie->fd,zombie,"JOIN %s",Ptr->name);
+ zombie->WriteFrom(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);
+ 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);
}
- userlist(zombie,Ptr);
- WriteServ(zombie->fd,"366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name);
+ 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))
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 (Config->module_names[i] == name)
+ if (this->Config->module_names[i] == name)
{
- return modules[i];
+ return this->modules[i];
}
}
return NULL;
ConfigReader::ConfigReader()
{
- // Config->ClearStack();
+ // 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
//~ this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
- //~ this->readerror = Config->LoadConf(CONFIG_FILE, this->cache,this->errorlog);
+ //~ this->readerror = ServerInstance->Config->LoadConf(CONFIG_FILE, this->cache,this->errorlog);
//~ if (!this->readerror)
//~ this->error = CONF_FILE_NOT_FOUND;
- this->data = &Config->config_data;
+ this->data = &ServerInstance->Config->config_data;
this->privatehash = false;
}
ConfigReader::ConfigReader(const std::string &filename)
{
- Config->ClearStack();
+ ServerInstance->Config->ClearStack();
this->data = new ConfigDataHash;
this->privatehash = true;
this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
- this->readerror = Config->LoadConf(*this->data, filename, *this->errorlog);
+ this->readerror = ServerInstance->Config->LoadConf(*this->data, filename, *this->errorlog);
if (!this->readerror)
this->error = CONF_FILE_NOT_FOUND;
};
/* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
std::string result;
- if (!Config->ConfValue(*this->data, tag, name, index, result))
+ if (!ServerInstance->Config->ConfValue(*this->data, tag, name, index, result))
{
this->error = CONF_VALUE_NOT_FOUND;
return "";
bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
{
- return Config->ConfValueBool(*this->data, tag, name, index);
+ return ServerInstance->Config->ConfValueBool(*this->data, tag, name, index);
}
long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned)
{
int result;
- if(!Config->ConfValueInteger(*this->data, tag, name, index, result))
+ if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, index, result))
{
this->error = CONF_VALUE_NOT_FOUND;
return 0;
if (bail)
{
printf("There were errors in your configuration:\n%s", this->errorlog->str().c_str());
- Exit(0);
+ InspIRCd::Exit(ERROR);
}
else
{
unsigned int prefixlen;
start = 0;
- /* ":Config->ServerName NOTICE user->nick :" */
- prefixlen = strlen(Config->ServerName) + strlen(user->nick) + 11;
+ /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */
+ prefixlen = strlen(ServerInstance->Config->ServerName) + strlen(user->nick) + 11;
if (user)
{
- WriteServ(user->fd,"NOTICE %s :There were errors in the configuration file:",user->nick);
+ user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick);
while(start < errors.length())
{
- WriteServ(user->fd, "NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
+ user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
start += 510 - prefixlen;
}
}
else
{
- WriteOpers("There were errors in the configuration file:");
+ ServerInstance->WriteOpers("There were errors in the configuration file:");
while(start < errors.length())
{
- WriteOpers(errors.substr(start, 360).c_str());
+ ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
start += 360;
}
}
int ConfigReader::Enumerate(const std::string &tag)
{
- return Config->ConfValueEnum(*this->data, tag);
+ return ServerInstance->Config->ConfValueEnum(*this->data, tag);
}
int ConfigReader::EnumerateValues(const std::string &tag, int index)
{
- return Config->ConfVarEnum(*this->data, tag, index);
+ return ServerInstance->Config->ConfVarEnum(*this->data, tag, index);
}
bool ConfigReader::Verify()
FileReader::FileReader(const std::string &filename)
{
file_cache c;
- readfile(c,filename.c_str());
+ ServerInstance->Config->ReadFile(c,filename.c_str());
this->fc = c;
this->CalcSize();
}
void FileReader::LoadFile(const std::string &filename)
{
file_cache c;
- readfile(c,filename.c_str());
+ 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;
projects / user / henk / code / inspircd.git / blobdiff