* ---------------------------------------------------
*/
+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>
+
#ifdef USE_KQUEUE
#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>
#endif
-#include <cstdio>
+
+#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"
-
-#ifdef GCC3
-#define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
-using namespace std;
+#include "helperfuncs.h"
+#include "hashcomp.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 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 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);
- strlower(a);
- strlower(b);
- 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, WhoWasUser*, nspace::hash<string>, StrHashComp> whowas_hash;
+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;
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) { };
};
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; };
return getnetworkname();
}
+std::string Server::GetServerDescription()
+{
+ return getserverdesc();
+}
+
Admin Server::GetAdmin()
{
return Admin(getadminname(),getadminemail(),getadminnick());
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)
}
}
}
-
+ 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)
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 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