* ---------------------------------------------------
*/
+using namespace std;
+
+#include "inspircd_config.h"
#include "inspircd.h"
#include "inspircd_io.h"
#include "inspircd_util.h"
-#include "inspircd_config.h"
#include <unistd.h>
-#include <fcntl.h>
#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <cstdio>
+
+#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 <map>
#include <sstream>
#include <vector>
-#include <errno.h>
#include <deque>
-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>
#include "connection.h"
#include "users.h"
#include "servers.h"
#include "xline.h"
#include "commands.h"
#include "inspstring.h"
+#include "helperfuncs.h"
+#include "hashcomp.h"
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
+#ifdef USE_KQUEUE
+extern int kq;
#endif
-using namespace std;
+#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 time_t TIME;
extern int LogLevel;
extern int MaxWhoResults;
extern time_t nb_start;
-extern std::vector<int> fd_reap;
extern std::vector<std::string> module_names;
extern int boundPortCount;
extern int portCount;
-extern int UDPportCount;
+extern int SERVERportCount;
extern int ports[MAXSOCKS];
extern int defaultRoute;
extern FILE *log_file;
+extern userrec* fd_ref_table[65536];
-namespace nspace
-{
-#ifdef GCC34
- template<> struct hash<in_addr>
-#else
- template<> struct nspace::hash<in_addr>
-#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<string>
-#else
- template<> struct nspace::hash<string>
-#endif
- {
- size_t operator()(const string &s) const
- {
- char a[MAXBUF];
- static struct hash<const char *> 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);
- 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<std::string, userrec*, nspace::hash<string>, StrHashComp> user_hash;
-typedef nspace::hash_map<std::string, chanrec*, nspace::hash<string>, StrHashComp> chan_hash;
-typedef nspace::hash_map<in_addr,string*, nspace::hash<in_addr>, InAddr_HashComp> address_cache;
+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 user_hash whowas;
+extern whowas_hash whowas;
extern command_table cmdlist;
extern file_cache MOTD;
extern file_cache RULES;
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) { };
};
// 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++)
{
if ((i->modechar == modechar) && (i->type == type))
bool ModeIsListMode(char modechar, int type)
{
- log(DEBUG,"Size of extmodes vector is %d",EMode.size());
for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
{
if ((i->modechar == modechar) && (i->type == type) && (i->list == true))
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++)
{
if ((i->modechar == modechar) && (i->type == type) && (i->needsoper == true))
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(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; }
-Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); }
-void Module::OnOper(userrec* user) { };
-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::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, 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; };
+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) { }
+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; }
+Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); }
+void Module::OnOper(userrec* user) { };
+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; };
+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; };
+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; };
// server is a wrapper class that provides methods to all of the C-style
// exports in the core
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)
{
chanuserlist userl;
userl.clear();
- for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+ std::vector<char*> *list = chan->GetUsers();
+ for (std::vector<char*>::iterator i = list->begin(); i != list->end(); i++)
{
- if (i->second)
- {
- if (has_channel(i->second,chan))
- {
- if (isnick(i->second->nick))
- {
- userl.push_back(i->second);
- }
- }
- }
+ char* o = *i;
+ userl.push_back((userrec*)o);
}
return userl;
}
void Server::QuitUser(userrec* user, std::string reason)
{
- send_network_quit(user->nick,reason.c_str());
kill_link(user,reason.c_str());
}
}
}
+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 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)
- {
- 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))
+ if (((modechar >= 'A') && (modechar <= 'Z')) || ((modechar >= 'a') && (modechar <= 'z')))
{
- 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)
{
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());
- close(old_fd);
- shutdown (old_fd,2);
+#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)
}
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);
}
}
}
-
+ return true;
}
void Server::AddGLine(long duration, std::string source, std::string reason, std::string hostmask)
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)
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)
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)
+ {
+ return modules[i];
+ }
+ }
+ return NULL;
+}
+
ConfigReader::ConfigReader()
{
+ include_stack.clear();
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->error = CONF_VALUE_NOT_FOUND;
return "";
}
- return std::string(val);
+ return val;
}
bool ConfigReader::ReadFlag(std::string tag, std::string name, int index)
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]))
{
std::string FileReader::GetLine(int x)
{
- if ((x<0) || (x>fc.size()))
+ if ((x<0) || ((unsigned)x>fc.size()))
return "";
return fc[x];
}
projects / user / henk / code / inspircd.git / blobdiff