#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 "helperfuncs.h"
#include "hashcomp.h"
#include "socket.h"
+#include "socketengine.h"
+#include "typedefs.h"
-#ifdef USE_KQUEUE
-extern int kq;
-#endif
-
-#ifdef USE_EPOLL
-int ep;
-#endif
-
+extern SocketEngine* SE;
+extern ServerConfig *Config;
+extern InspIRCd* ServerInstance;
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;
-
-
-
-extern FILE *log_file;
-
+class Server;
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
-
-class ExtMode : public classbase
-{
-public:
- char modechar;
- int type;
- bool needsoper;
- int params_when_on;
- int params_when_off;
- 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
// 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; };
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) { };
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) { };
+
+/* server is a wrapper class that provides methods to all of the C-style
+ * exports in the core
+ */
Server::Server()
{
module_sockets.push_back(sock);
}
+void Server::RehashServer()
+{
+ WriteOpers("*** Rehashing config file");
+ Config->Read(false,NULL);
+}
+
+ServerConfig* Server::GetConfig()
+{
+ return Config;
+}
+
void Server::DelSocket(InspSocket* sock)
{
for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
call_handler(commandname.c_str(),parameters,pcnt,user);
}
+bool Server::IsValidModuleCommand(std::string commandname, int pcnt, userrec* user)
+{
+ return is_valid_cmd(commandname.c_str(), pcnt, user);
+}
+
void Server::Log(int level, std::string s)
{
log(level,"%s",s.c_str());
std::string Server::GetServerName()
{
- return getservername();
+ return Config->ServerName;
}
std::string Server::GetNetworkName()
{
- return getnetworkname();
+ return Config->Network;
}
std::string Server::GetServerDescription()
{
- return getserverdesc();
+ return Config->ServerDesc;
}
Admin Server::GetAdmin()
{
- return Admin(getadminname(),getadminemail(),getadminnick());
+ return Admin(Config->AdminName,Config->AdminEmail,Config->AdminNick);
}
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
-
+ SE->DelFd(old_fd);
shutdown(old_fd,2);
close(old_fd);
return true;
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++)
+ for (unsigned int i = 0; i < zombie->chans.size(); i++)
{
if (zombie->chans[i].channel != NULL)
{
{
for (int i = 0; i <= MODCOUNT; i++)
{
- if (module_names[i] == name)
+ if (Config->module_names[i] == name)
{
return modules[i];
}
ConfigReader::ConfigReader()
{
- include_stack.clear();
+ 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;
}
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;
};
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;
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;
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;
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()