summaryrefslogtreecommitdiff
path: root/src/modules/extra
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/extra')
-rw-r--r--src/modules/extra/m_geoip.cpp5
-rw-r--r--src/modules/extra/m_ldapauth.cpp7
-rw-r--r--src/modules/extra/m_ldapoper.cpp7
-rw-r--r--src/modules/extra/m_mssql.cpp23
-rw-r--r--src/modules/extra/m_mysql.cpp18
-rw-r--r--src/modules/extra/m_pgsql.cpp19
-rw-r--r--src/modules/extra/m_regex_pcre.cpp11
-rw-r--r--src/modules/extra/m_regex_posix.cpp11
-rw-r--r--src/modules/extra/m_regex_tre.cpp9
-rw-r--r--src/modules/extra/m_sqlauth.cpp7
-rw-r--r--src/modules/extra/m_sqlite3.cpp19
-rw-r--r--src/modules/extra/m_sqllog.cpp13
-rw-r--r--src/modules/extra/m_sqloper.cpp9
-rw-r--r--src/modules/extra/m_sqlutils.cpp5
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp8
-rw-r--r--src/modules/extra/m_ssl_openssl.cpp6
-rw-r--r--src/modules/extra/m_testclient.cpp5
-rw-r--r--src/modules/extra/m_ziplink.cpp5
18 files changed, 83 insertions, 104 deletions
diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index d442cc16d..13b35fdfb 100644
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -29,8 +29,7 @@ class ModuleGeoIP : public Module
public:
- ModuleGeoIP(InspIRCd *Me) : Module(Me)
- {
+ ModuleGeoIP() {
OnRehash(NULL);
Implementation eventlist[] = { I_OnRehash, I_OnUserRegister };
ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -51,7 +50,7 @@ class ModuleGeoIP : public Module
{
GeoBans.clear();
- ConfigReader conf(ServerInstance);
+ ConfigReader conf;
banunknown = conf.ReadFlag("geoip", "banunknown", 0);
diff --git a/src/modules/extra/m_ldapauth.cpp b/src/modules/extra/m_ldapauth.cpp
index 45202e6fa..6fa5abfe7 100644
--- a/src/modules/extra/m_ldapauth.cpp
+++ b/src/modules/extra/m_ldapauth.cpp
@@ -46,9 +46,8 @@ class ModuleLDAPAuth : public Module
LDAP *conn;
public:
- ModuleLDAPAuth(InspIRCd* Me)
- : Module(Me)
- {
+ ModuleLDAPAuth()
+ {
conn = NULL;
Implementation eventlist[] = { I_OnUserDisconnect, I_OnCheckReady, I_OnRehash, I_OnUserRegister };
ServerInstance->Modules->Attach(eventlist, this, 4);
@@ -63,7 +62,7 @@ public:
virtual void OnRehash(User* user)
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
base = Conf.ReadValue("ldapauth", "baserdn", 0);
attribute = Conf.ReadValue("ldapauth", "attribute", 0);
diff --git a/src/modules/extra/m_ldapoper.cpp b/src/modules/extra/m_ldapoper.cpp
index ed06d6890..634a99fa7 100644
--- a/src/modules/extra/m_ldapoper.cpp
+++ b/src/modules/extra/m_ldapoper.cpp
@@ -41,9 +41,8 @@ class ModuleLDAPAuth : public Module
LDAP *conn;
public:
- ModuleLDAPAuth(InspIRCd* Me)
- : Module(Me)
- {
+ ModuleLDAPAuth()
+ {
conn = NULL;
Implementation eventlist[] = { I_OnRehash, I_OnPassCompare };
ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -58,7 +57,7 @@ public:
virtual void OnRehash(User* user)
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
base = Conf.ReadValue("ldapoper", "baserdn", 0);
ldapserver = Conf.ReadValue("ldapoper", "server", 0);
diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp
index f58858696..8cd9e2ea7 100644
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -51,11 +51,9 @@ class QueryThread : public SocketThread
{
private:
ModuleMsSQL* Parent;
- InspIRCd* ServerInstance;
public:
- QueryThread(InspIRCd* si, ModuleMsSQL* mod)
- : SocketThread(si), Parent(mod), ServerInstance(si)
- {
+ QueryThread(ModuleMsSQL* mod)
+ : SocketThread(si), Parent(mod), {
}
~QueryThread() { }
virtual void Run();
@@ -232,7 +230,6 @@ class SQLConn : public classbase
{
private:
ResultQueue results;
- InspIRCd* ServerInstance;
Module* mod;
SQLhost host;
TDSLOGIN* login;
@@ -242,8 +239,8 @@ class SQLConn : public classbase
public:
QueryQueue queue;
- SQLConn(InspIRCd* SI, Module* m, const SQLhost& hi)
- : ServerInstance(SI), mod(m), host(hi), login(NULL), sock(NULL), context(NULL)
+ SQLConn(Module* m, const SQLhost& hi)
+ : mod(m), host(hi), login(NULL), sock(NULL), context(NULL)
{
if (OpenDB())
{
@@ -643,8 +640,8 @@ class ModuleMsSQL : public Module
QueryThread* queryDispatcher;
public:
- ModuleMsSQL(InspIRCd* Me)
- : Module(Me), currid(0)
+ ModuleMsSQL()
+ : currid(0)
{
LoggingMutex = new Mutex();
ResultsMutex = new Mutex();
@@ -658,7 +655,7 @@ class ModuleMsSQL : public Module
ReadConf();
- queryDispatcher = new QueryThread(ServerInstance, this);
+ queryDispatcher = new QueryThread(this);
ServerInstance->Threads->Start(queryDispatcher);
ServerInstance->Modules->PublishInterface("SQL", this);
@@ -709,7 +706,7 @@ class ModuleMsSQL : public Module
bool HostInConf(const SQLhost &h)
{
- ConfigReader conf(ServerInstance);
+ ConfigReader conf;
for(int i = 0; i < conf.Enumerate("database"); i++)
{
SQLhost host;
@@ -729,7 +726,7 @@ class ModuleMsSQL : public Module
{
ClearOldConnections();
- ConfigReader conf(ServerInstance);
+ ConfigReader conf;
for(int i = 0; i < conf.Enumerate("database"); i++)
{
SQLhost host;
@@ -760,7 +757,7 @@ class ModuleMsSQL : public Module
SQLConn* newconn;
- newconn = new SQLConn(ServerInstance, this, hi);
+ newconn = new SQLConn(this, hi);
connections.insert(std::make_pair(hi.id, newconn));
}
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 3718eecf8..023ead94b 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -89,7 +89,6 @@ class ModuleSQL : public Module
public:
ConfigReader *Conf;
- InspIRCd* PublicServerInstance;
int currid;
bool rehashing;
DispatcherThread* Dispatcher;
@@ -97,7 +96,7 @@ class ModuleSQL : public Module
Mutex LoggingMutex;
Mutex ConnMutex;
- ModuleSQL(InspIRCd* Me);
+ ModuleSQL();
~ModuleSQL();
unsigned long NewID();
const char* OnRequest(Request* request);
@@ -593,7 +592,7 @@ void ClearAllConnections()
}
}
-void ConnectDatabases(InspIRCd* ServerInstance, ModuleSQL* Parent)
+void ConnectDatabases(ModuleSQL* Parent)
{
for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
{
@@ -612,7 +611,7 @@ void ConnectDatabases(InspIRCd* ServerInstance, ModuleSQL* Parent)
}
}
-void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance, ModuleSQL* Parent)
+void LoadDatabases(ConfigReader* conf, ModuleSQL* Parent)
{
Parent->ConnMutex.Lock();
ClearOldConnections(conf);
@@ -639,7 +638,7 @@ void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance, ModuleSQL* Pare
ThisSQL->setInitialQuery(initquery);
}
}
- ConnectDatabases(ServerInstance, Parent);
+ ConnectDatabases(Parent);
Parent->ConnMutex.Unlock();
}
@@ -673,23 +672,22 @@ class DispatcherThread : public SocketThread
{
private:
ModuleSQL* Parent;
- InspIRCd* ServerInstance;
public:
- DispatcherThread(InspIRCd* Instance, ModuleSQL* CreatorModule) : SocketThread(Instance), Parent(CreatorModule), ServerInstance(Instance) { }
+ DispatcherThread(ModuleSQL* CreatorModule) : SocketThread(Instance), Parent(CreatorModule),{ }
~DispatcherThread() { }
virtual void Run();
virtual void OnNotify();
};
-ModuleSQL::ModuleSQL(InspIRCd* Me) : Module(Me), rehashing(false)
+ModuleSQL::ModuleSQL() : rehashing(false)
{
ServerInstance->Modules->UseInterface("SQLutils");
- Conf = new ConfigReader(ServerInstance);
+ Conf = new ConfigReader;
PublicServerInstance = ServerInstance;
currid = 0;
- Dispatcher = new DispatcherThread(ServerInstance, this);
+ Dispatcher = new DispatcherThread(this);
ServerInstance->Threads->Start(Dispatcher);
if (!ServerInstance->Modules->PublishFeature("SQL", this))
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index c61e0983c..c0d301107 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -93,7 +93,7 @@ class ReconnectTimer : public Timer
private:
Module* mod;
public:
- ReconnectTimer(InspIRCd* SI, Module* m)
+ ReconnectTimer(Module* m)
: Timer(5, SI->Time(), false), mod(m)
{
}
@@ -301,7 +301,6 @@ public:
class SQLConn : public EventHandler
{
private:
- InspIRCd* ServerInstance;
SQLhost confhost; /* The <database> entry */
Module* us; /* Pointer to the SQL provider itself */
PGconn* sql; /* PgSQL database connection handle */
@@ -311,8 +310,8 @@ class SQLConn : public EventHandler
time_t idle; /* Time we last heard from the database */
public:
- SQLConn(InspIRCd* SI, Module* self, const SQLhost& hi)
- : EventHandler(), ServerInstance(SI), confhost(hi), us(self), sql(NULL), status(CWRITE), qinprog(false)
+ SQLConn(Module* self, const SQLhost& hi)
+ : EventHandler(), confhost(hi), us(self), sql(NULL), status(CWRITE), qinprog(false)
{
idle = this->ServerInstance->Time();
if(!DoConnect())
@@ -763,8 +762,8 @@ class ModulePgSQL : public Module
ReconnectTimer* retimer;
public:
- ModulePgSQL(InspIRCd* Me)
- : Module(Me), currid(0)
+ ModulePgSQL()
+ : currid(0)
{
ServerInstance->Modules->UseInterface("SQLutils");
@@ -813,7 +812,7 @@ class ModulePgSQL : public Module
bool HostInConf(const SQLhost &h)
{
- ConfigReader conf(ServerInstance);
+ ConfigReader conf;
for(int i = 0; i < conf.Enumerate("database"); i++)
{
SQLhost host;
@@ -834,7 +833,7 @@ class ModulePgSQL : public Module
{
ClearOldConnections();
- ConfigReader conf(ServerInstance);
+ ConfigReader conf;
for(int i = 0; i < conf.Enumerate("database"); i++)
{
SQLhost host;
@@ -889,7 +888,7 @@ class ModulePgSQL : public Module
SQLConn* newconn;
- newconn = new SQLConn(ServerInstance, this, hi);
+ newconn = new SQLConn(this, hi);
connections.insert(std::make_pair(hi.id, newconn));
}
@@ -905,7 +904,7 @@ class ModulePgSQL : public Module
break;
}
}
- retimer = new ReconnectTimer(ServerInstance, this);
+ retimer = new ReconnectTimer(this);
ServerInstance->Timers->AddTimer(retimer);
}
diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index 5254f04a6..4389ad685 100644
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -39,14 +39,14 @@ private:
pcre* regex;
public:
- PCRERegex(const std::string& rx, InspIRCd* Me) : Regex(rx, Me)
+ PCRERegex(const std::string& rx, ) : Regex(rx, Me)
{
const char* error;
int erroffset;
regex = pcre_compile(rx.c_str(), 0, &error, &erroffset, NULL);
if (!regex)
{
- Me->Logs->Log("REGEX", DEBUG, "pcre_compile failed: /%s/ [%d] %s", rx.c_str(), erroffset, error);
+ ServerInstance->Logs->Log("REGEX", DEBUG, "pcre_compile failed: /%s/ [%d] %s", rx.c_str(), erroffset, error);
throw PCREException(rx, error, erroffset);
}
}
@@ -70,11 +70,10 @@ public:
class ModuleRegexPCRE : public Module
{
public:
- ModuleRegexPCRE(InspIRCd* Me) : Module(Me)
- {
- Me->Modules->PublishInterface("RegularExpression", this);
+ ModuleRegexPCRE() {
+ ServerInstance->Modules->PublishInterface("RegularExpression", this);
Implementation eventlist[] = { I_OnRequest };
- Me->Modules->Attach(eventlist, this, 1);
+ ServerInstance->Modules->Attach(eventlist, this, 1);
}
virtual Version GetVersion()
diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp
index 34a7e9bab..5fe4db29f 100644
--- a/src/modules/extra/m_regex_posix.cpp
+++ b/src/modules/extra/m_regex_posix.cpp
@@ -34,7 +34,7 @@ private:
regex_t regbuf;
public:
- POSIXRegex(const std::string& rx, InspIRCd* Me, bool extended) : Regex(rx, Me)
+ POSIXRegex(const std::string& rx, bool extended) : Regex(rx, Me)
{
int flags = (extended ? REG_EXTENDED : 0) | REG_NOSUB;
int errcode;
@@ -76,11 +76,10 @@ class ModuleRegexPOSIX : public Module
private:
bool extended;
public:
- ModuleRegexPOSIX(InspIRCd* Me) : Module(Me)
- {
- Me->Modules->PublishInterface("RegularExpression", this);
+ ModuleRegexPOSIX() {
+ ServerInstance->Modules->PublishInterface("RegularExpression", this);
Implementation eventlist[] = { I_OnRequest, I_OnRehash };
- Me->Modules->Attach(eventlist, this, 2);
+ ServerInstance->Modules->Attach(eventlist, this, 2);
OnRehash(NULL);
}
@@ -96,7 +95,7 @@ public:
virtual void OnRehash(User* u)
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
extended = Conf.ReadFlag("posix", "extended", 0);
}
diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index c50429a5e..1ed35605b 100644
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -36,7 +36,7 @@ private:
regex_t regbuf;
public:
- TRERegex(const std::string& rx, InspIRCd* Me) : Regex(rx, Me)
+ TRERegex(const std::string& rx, ) : Regex(rx, Me)
{
int flags = REG_EXTENDED | REG_NOSUB;
int errcode;
@@ -76,11 +76,10 @@ public:
class ModuleRegexTRE : public Module
{
public:
- ModuleRegexTRE(InspIRCd* Me) : Module(Me)
- {
- Me->Modules->PublishInterface("RegularExpression", this);
+ ModuleRegexTRE() {
+ ServerInstance->Modules->PublishInterface("RegularExpression", this);
Implementation eventlist[] = { I_OnRequest };
- Me->Modules->Attach(eventlist, this, 1);
+ ServerInstance->Modules->Attach(eventlist, this, 1);
}
virtual Version GetVersion()
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index 1f2df8a1a..d7c0675bb 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -32,9 +32,8 @@ class ModuleSQLAuth : public Module
bool verbose;
public:
- ModuleSQLAuth(InspIRCd* Me)
- : Module(Me)
- {
+ ModuleSQLAuth()
+ {
ServerInstance->Modules->UseInterface("SQLutils");
ServerInstance->Modules->UseInterface("SQL");
@@ -60,7 +59,7 @@ public:
virtual void OnRehash(User* user)
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
databaseid = Conf.ReadValue("sqlauth", "dbid", 0); /* Database ID, given to the SQL service provider */
freeformquery = Conf.ReadValue("sqlauth", "query", 0); /* Field name where username can be found */
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 86b2cb378..063113102 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -51,7 +51,7 @@ class ResultNotifier : public BufferedSocket
ModuleSQLite3* mod;
public:
- ResultNotifier(ModuleSQLite3* m, InspIRCd* SI, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m)
+ ResultNotifier(ModuleSQLite3* m, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m)
{
}
@@ -77,7 +77,7 @@ class SQLiteListener : public ListenSocketBase
FileReader* index;
public:
- SQLiteListener(ModuleSQLite3* P, InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr), Parent(P)
+ SQLiteListener(ModuleSQLite3* P, int port, const std::string &addr) : ListenSocketBase(port, addr), Parent(P)
{
uslen = sizeof(sock_us);
if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
@@ -274,14 +274,13 @@ class SQLConn : public classbase
{
private:
ResultQueue results;
- InspIRCd* ServerInstance;
Module* mod;
SQLhost host;
sqlite3* conn;
public:
- SQLConn(InspIRCd* SI, Module* m, const SQLhost& hi)
- : ServerInstance(SI), mod(m), host(hi)
+ SQLConn(Module* m, const SQLhost& hi)
+ : mod(m), host(hi)
{
if (OpenDB() != SQLITE_OK)
{
@@ -543,8 +542,8 @@ class ModuleSQLite3 : public Module
unsigned long currid;
public:
- ModuleSQLite3(InspIRCd* Me)
- : Module(Me), currid(0)
+ ModuleSQLite3()
+ : currid(0)
{
ServerInstance->Modules->UseInterface("SQLutils");
@@ -632,7 +631,7 @@ class ModuleSQLite3 : public Module
bool HostInConf(const SQLhost &h)
{
- ConfigReader conf(ServerInstance);
+ ConfigReader conf;
for(int i = 0; i < conf.Enumerate("database"); i++)
{
SQLhost host;
@@ -652,7 +651,7 @@ class ModuleSQLite3 : public Module
{
ClearOldConnections();
- ConfigReader conf(ServerInstance);
+ ConfigReader conf;
for(int i = 0; i < conf.Enumerate("database"); i++)
{
SQLhost host;
@@ -681,7 +680,7 @@ class ModuleSQLite3 : public Module
SQLConn* newconn;
- newconn = new SQLConn(ServerInstance, this, hi);
+ newconn = new SQLConn(this, hi);
connections.insert(std::make_pair(hi.id, newconn));
}
diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index 556cc8b31..4713f24a9 100644
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -28,8 +28,6 @@ std::map<unsigned long,QueryInfo*> active_queries;
class QueryInfo
{
-private:
- InspIRCd* ServerInstance;
public:
QueryState qs;
unsigned long id;
@@ -43,7 +41,7 @@ public:
time_t date;
bool insert;
- QueryInfo(InspIRCd* Instance, const std::string &n, const std::string &s, const std::string &h, unsigned long i, int cat)
+ QueryInfo(const std::string &n, const std::string &s, const std::string &h, unsigned long i, int cat)
{
ServerInstance = Instance;
qs = FIND_SOURCE;
@@ -183,9 +181,8 @@ class ModuleSQLLog : public Module
{
public:
- ModuleSQLLog(InspIRCd* Me)
- : Module(Me)
- {
+ ModuleSQLLog()
+ {
ServerInstance->Modules->UseInterface("SQLutils");
ServerInstance->Modules->UseInterface("SQL");
@@ -213,7 +210,7 @@ class ModuleSQLLog : public Module
void ReadConfig()
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
dbid = Conf.ReadValue("sqllog","dbid",0); // database id of a database configured in sql module
}
@@ -253,7 +250,7 @@ class ModuleSQLLog : public Module
SQLrequest req = SQLrequest(this, SQLModule, dbid, SQLquery("SELECT id,actor FROM ircd_log_actors WHERE actor='?'") % source);
if(req.Send())
{
- QueryInfo* i = new QueryInfo(ServerInstance, nick, source, host, req.id, category);
+ QueryInfo* i = new QueryInfo(nick, source, host, req.id, category);
i->qs = FIND_SOURCE;
active_queries[req.id] = i;
}
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index 3b0e6e226..47aa8d1fd 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -32,9 +32,8 @@ class ModuleSQLOper : public Module
parameterlist names;
public:
- ModuleSQLOper(InspIRCd* Me)
- : Module(Me)
- {
+ ModuleSQLOper()
+ {
ServerInstance->Modules->UseInterface("SQLutils");
ServerInstance->Modules->UseInterface("SQL");
ServerInstance->Modules->UseInterface("HashRequest");
@@ -114,7 +113,7 @@ public:
virtual void OnRehash(User* user)
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
databaseid = Conf.ReadValue("sqloper", "dbid", 0); /* Database ID of a database configured for the service provider module */
hashtype = assign(Conf.ReadValue("sqloper", "hash", 0));
@@ -298,7 +297,7 @@ public:
bool OperUser(User* user, const std::string &pattern, const std::string &type)
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
for (int j = 0; j < Conf.Enumerate("type"); j++)
{
diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp
index c257d4098..6d40ee22c 100644
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -30,9 +30,8 @@ private:
IdChanMap idchan;
public:
- ModuleSQLutils(InspIRCd* Me)
- : Module(Me)
- {
+ ModuleSQLutils()
+ {
ServerInstance->Modules->PublishInterface("SQLutils", this);
Implementation eventlist[] = { I_OnChannelDelete, I_OnUnloadModule, I_OnRequest, I_OnUserDisconnect };
ServerInstance->Modules->Attach(eventlist, this, 4);
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 3362e9378..1fe84649f 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -143,8 +143,8 @@ class ModuleSSLGnuTLS : public Module
GenericCap capHandler;
public:
- ModuleSSLGnuTLS(InspIRCd* Me)
- : Module(Me), starttls(this), capHandler(this, "tls")
+ ModuleSSLGnuTLS()
+ : starttls(this), capHandler(this, "tls")
{
ServerInstance->Modules->PublishInterface("BufferedSocketHook", this);
@@ -169,7 +169,7 @@ class ModuleSSLGnuTLS : public Module
void OnRehash(User* user)
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
listenports.clear();
sslports.clear();
@@ -200,7 +200,7 @@ class ModuleSSLGnuTLS : public Module
OnRehash(user);
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
std::string confdir(ServerInstance->ConfigFileName);
// +1 so we the path ends with a /
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 645add4c2..f566b326b 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -100,7 +100,7 @@ class ModuleSSLOpenSSL : public Module
public:
- ModuleSSLOpenSSL(InspIRCd* Me)
+ ModuleSSLOpenSSL()
{
ServerInstance->Modules->PublishInterface("BufferedSocketHook", this);
@@ -144,7 +144,7 @@ class ModuleSSLOpenSSL : public Module
void OnRehash(User* user)
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
listenports.clear();
sslports.clear();
@@ -175,7 +175,7 @@ class ModuleSSLOpenSSL : public Module
OnRehash(user);
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
std::string confdir(ServerInstance->ConfigFileName);
// +1 so we the path ends with a /
diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index 21603c3c8..3e41f533f 100644
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -20,9 +20,8 @@ private:
public:
- ModuleTestClient(InspIRCd* Me)
- : Module(Me)
- {
+ ModuleTestClient()
+ {
Implementation eventlist[] = { I_OnRequest, I_OnBackgroundTimer };
ServerInstance->Modules->Attach(eventlist, this, 2);
}
diff --git a/src/modules/extra/m_ziplink.cpp b/src/modules/extra/m_ziplink.cpp
index 557ad1cfa..976a27b5c 100644
--- a/src/modules/extra/m_ziplink.cpp
+++ b/src/modules/extra/m_ziplink.cpp
@@ -56,9 +56,8 @@ class ModuleZLib : public Module
unsigned int net_buffer_size;
public:
- ModuleZLib(InspIRCd* Me)
- : Module(Me)
- {
+ ModuleZLib()
+ {
ServerInstance->Modules->PublishInterface("BufferedSocketHook", this);
sessions = new izip_session[ServerInstance->SE->GetMaxFds()];
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 04:22:23 +0000