summaryrefslogtreecommitdiff
path: root/modules/extra
diff options
context:
space:
mode:
Diffstat (limited to 'modules/extra')
-rw-r--r--modules/extra/enc_argon2.cpp16
-rw-r--r--modules/extra/ldap.cpp22
-rw-r--r--modules/extra/mysql.cpp28
-rw-r--r--modules/extra/sqlite.cpp16
-rw-r--r--modules/extra/ssl_gnutls.cpp14
-rw-r--r--modules/extra/ssl_openssl.cpp18
-rw-r--r--modules/extra/xmlrpc.cpp4
7 files changed, 59 insertions, 59 deletions
diff --git a/modules/extra/enc_argon2.cpp b/modules/extra/enc_argon2.cpp
index 8d6f27d9b..81d052c0c 100644
--- a/modules/extra/enc_argon2.cpp
+++ b/modules/extra/enc_argon2.cpp
@@ -154,15 +154,15 @@ public:
});
}
- void OnReload(Configuration::Conf *conf) override
+ void OnReload(Configuration::Conf &conf) override
{
- const auto *block = Config->GetModule(this);
- this->defaultprovider = GetAlgorithm(block->Get<const Anope::string>("algorithm", "argon2id"));
- Argon2Context::memory_cost = block->Get<uint32_t>("memory_cost", "131072");
- Argon2Context::time_cost = block->Get<uint32_t>("time_cost", "3");
- Argon2Context::parallelism = block->Get<uint32_t>("parallelism", "1");
- Argon2Context::hash_length = block->Get<uint32_t>("hash_length", "32");
- Argon2Context::salt_length = block->Get<uint32_t>("salt_length", "32");
+ const auto &block = Config->GetModule(this);
+ this->defaultprovider = GetAlgorithm(block.Get<const Anope::string>("algorithm", "argon2id"));
+ Argon2Context::memory_cost = block.Get<uint32_t>("memory_cost", "131072");
+ Argon2Context::time_cost = block.Get<uint32_t>("time_cost", "3");
+ Argon2Context::parallelism = block.Get<uint32_t>("parallelism", "1");
+ Argon2Context::hash_length = block.Get<uint32_t>("hash_length", "32");
+ Argon2Context::salt_length = block.Get<uint32_t>("salt_length", "32");
}
EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) override
diff --git a/modules/extra/ldap.cpp b/modules/extra/ldap.cpp
index ecc48767a..f8ef205a5 100644
--- a/modules/extra/ldap.cpp
+++ b/modules/extra/ldap.cpp
@@ -544,9 +544,9 @@ public:
LDAPServices.clear();
}
- void OnReload(Configuration::Conf *config) override
+ void OnReload(Configuration::Conf &config) override
{
- Configuration::Block *conf = config->GetModule(this);
+ Configuration::Block &conf = config.GetModule(this);
for (std::map<Anope::string, LDAPService *>::iterator it = this->LDAPServices.begin(); it != this->LDAPServices.end();)
{
@@ -556,11 +556,11 @@ public:
++it;
- for (i = 0; i < conf->CountBlock("ldap"); ++i)
- if (conf->GetBlock("ldap", i)->Get<const Anope::string>("name", "ldap/main") == cname)
+ for (i = 0; i < conf.CountBlock("ldap"); ++i)
+ if (conf.GetBlock("ldap", i).Get<const Anope::string>("name", "ldap/main") == cname)
break;
- if (i == conf->CountBlock("ldap"))
+ if (i == conf.CountBlock("ldap"))
{
Log(LOG_NORMAL, "ldap") << "LDAP: Removing server connection " << cname;
@@ -572,17 +572,17 @@ public:
}
}
- for (int i = 0; i < conf->CountBlock("ldap"); ++i)
+ for (int i = 0; i < conf.CountBlock("ldap"); ++i)
{
- Configuration::Block *ldap = conf->GetBlock("ldap", i);
+ Configuration::Block &ldap = conf.GetBlock("ldap", i);
- const Anope::string &connname = ldap->Get<const Anope::string>("name", "ldap/main");
+ const Anope::string &connname = ldap.Get<const Anope::string>("name", "ldap/main");
if (this->LDAPServices.find(connname) == this->LDAPServices.end())
{
- const Anope::string &server = ldap->Get<const Anope::string>("server", "127.0.0.1");
- const Anope::string &admin_binddn = ldap->Get<const Anope::string>("admin_binddn");
- const Anope::string &admin_password = ldap->Get<const Anope::string>("admin_password");
+ const Anope::string &server = ldap.Get<const Anope::string>("server", "127.0.0.1");
+ const Anope::string &admin_binddn = ldap.Get<const Anope::string>("admin_binddn");
+ const Anope::string &admin_password = ldap.Get<const Anope::string>("admin_password");
try
{
diff --git a/modules/extra/mysql.cpp b/modules/extra/mysql.cpp
index 65fe6d5c4..0d39c87a4 100644
--- a/modules/extra/mysql.cpp
+++ b/modules/extra/mysql.cpp
@@ -260,9 +260,9 @@ public:
delete DThread;
}
- void OnReload(Configuration::Conf *conf) override
+ void OnReload(Configuration::Conf &conf) override
{
- Configuration::Block *config = conf->GetModule(this);
+ Configuration::Block &config = conf.GetModule(this);
for (std::map<Anope::string, MySQLService *>::iterator it = this->MySQLServices.begin(); it != this->MySQLServices.end();)
{
@@ -272,11 +272,11 @@ public:
++it;
- for (i = 0; i < config->CountBlock("mysql"); ++i)
- if (config->GetBlock("mysql", i)->Get<const Anope::string>("name", "mysql/main") == cname)
+ for (i = 0; i < Config->CountBlock("mysql"); ++i)
+ if (config.GetBlock("mysql", i).Get<const Anope::string>("name", "mysql/main") == cname)
break;
- if (i == config->CountBlock("mysql"))
+ if (i == Config->CountBlock("mysql"))
{
Log(LOG_NORMAL, "mysql") << "MySQL: Removing server connection " << cname;
@@ -285,19 +285,19 @@ public:
}
}
- for (int i = 0; i < config->CountBlock("mysql"); ++i)
+ for (int i = 0; i < Config->CountBlock("mysql"); ++i)
{
- Configuration::Block *block = config->GetBlock("mysql", i);
- const Anope::string &connname = block->Get<const Anope::string>("name", "mysql/main");
+ Configuration::Block &block = config.GetBlock("mysql", i);
+ const Anope::string &connname = block.Get<const Anope::string>("name", "mysql/main");
if (this->MySQLServices.find(connname) == this->MySQLServices.end())
{
- const Anope::string &database = block->Get<const Anope::string>("database", "anope");
- const Anope::string &server = block->Get<const Anope::string>("server", "127.0.0.1");
- const Anope::string &user = block->Get<const Anope::string>("username", "anope");
- const Anope::string &password = block->Get<const Anope::string>("password");
- unsigned int port = block->Get<unsigned int>("port", "3306");
- const Anope::string &socket = block->Get<const Anope::string>("socket");
+ const Anope::string &database = block.Get<const Anope::string>("database", "anope");
+ const Anope::string &server = block.Get<const Anope::string>("server", "127.0.0.1");
+ const Anope::string &user = block.Get<const Anope::string>("username", "anope");
+ const Anope::string &password = block.Get<const Anope::string>("password");
+ unsigned int port = block.Get<unsigned int>("port", "3306");
+ const Anope::string &socket = block.Get<const Anope::string>("socket");
try
{
diff --git a/modules/extra/sqlite.cpp b/modules/extra/sqlite.cpp
index d234066a0..36bafae4c 100644
--- a/modules/extra/sqlite.cpp
+++ b/modules/extra/sqlite.cpp
@@ -113,9 +113,9 @@ public:
SQLiteServices.clear();
}
- void OnReload(Configuration::Conf *conf) override
+ void OnReload(Configuration::Conf &conf) override
{
- Configuration::Block *config = conf->GetModule(this);
+ Configuration::Block &config = conf.GetModule(this);
for (std::map<Anope::string, SQLiteService *>::iterator it = this->SQLiteServices.begin(); it != this->SQLiteServices.end();)
{
@@ -124,8 +124,8 @@ public:
int i, num;
++it;
- for (i = 0, num = config->CountBlock("sqlite"); i < num; ++i)
- if (config->GetBlock("sqlite", i)->Get<const Anope::string>("name", "sqlite/main") == cname)
+ for (i = 0, num = Config->CountBlock("sqlite"); i < num; ++i)
+ if (config.GetBlock("sqlite", i).Get<const Anope::string>("name", "sqlite/main") == cname)
break;
if (i == num)
@@ -137,14 +137,14 @@ public:
}
}
- for (int i = 0; i < config->CountBlock("sqlite"); ++i)
+ for (int i = 0; i < Config->CountBlock("sqlite"); ++i)
{
- Configuration::Block *block = config->GetBlock("sqlite", i);
- Anope::string connname = block->Get<const Anope::string>("name", "sqlite/main");
+ Configuration::Block &block = config.GetBlock("sqlite", i);
+ Anope::string connname = block.Get<const Anope::string>("name", "sqlite/main");
if (this->SQLiteServices.find(connname) == this->SQLiteServices.end())
{
- auto database = Anope::ExpandData(block->Get<const Anope::string>("database", "anope"));
+ auto database = Anope::ExpandData(block.Get<const Anope::string>("database", "anope"));
try
{
auto *ss = new SQLiteService(this, connname, database);
diff --git a/modules/extra/ssl_gnutls.cpp b/modules/extra/ssl_gnutls.cpp
index f8ef18f16..5e9147d5c 100644
--- a/modules/extra/ssl_gnutls.cpp
+++ b/modules/extra/ssl_gnutls.cpp
@@ -327,13 +327,13 @@ public:
}
}
- void OnReload(Configuration::Conf *conf) override
+ void OnReload(Configuration::Conf &conf) override
{
- Configuration::Block *config = conf->GetModule(this);
+ Configuration::Block &config = conf.GetModule(this);
- const Anope::string certfile = Anope::ExpandConfig(config->Get<const Anope::string>("cert", "fullchain.pem"));
- const Anope::string keyfile = Anope::ExpandConfig(config->Get<const Anope::string>("key", "privkey.pem"));
- const Anope::string dhfile = Anope::ExpandConfig(config->Get<const Anope::string>("dh", "dhparams.pem"));
+ const Anope::string certfile = Anope::ExpandConfig(config.Get<const Anope::string>("cert", "fullchain.pem"));
+ const Anope::string keyfile = Anope::ExpandConfig(config.Get<const Anope::string>("key", "privkey.pem"));
+ const Anope::string dhfile = Anope::ExpandConfig(config.Get<const Anope::string>("dh", "dhparams.pem"));
CheckFile(certfile);
CheckFile(keyfile);
@@ -365,9 +365,9 @@ public:
void OnPreServerConnect() override
{
- Configuration::Block *config = Config->GetBlock("uplink", Anope::CurrentUplink);
+ Configuration::Block &config = Config->GetBlock("uplink", Anope::CurrentUplink);
- if (config->Get<bool>("ssl"))
+ if (config.Get<bool>("ssl"))
{
this->service.Init(UplinkSock);
}
diff --git a/modules/extra/ssl_openssl.cpp b/modules/extra/ssl_openssl.cpp
index 28e734e44..50ac75466 100644
--- a/modules/extra/ssl_openssl.cpp
+++ b/modules/extra/ssl_openssl.cpp
@@ -144,12 +144,12 @@ public:
SSL_CTX_free(server_ctx);
}
- void OnReload(Configuration::Conf *conf) override
+ void OnReload(Configuration::Conf &conf) override
{
- Configuration::Block *config = conf->GetModule(this);
+ Configuration::Block &config = conf.GetModule(this);
- this->certfile = Anope::ExpandConfig(config->Get<const Anope::string>("cert", "fullchain.pem"));
- this->keyfile = Anope::ExpandConfig(config->Get<const Anope::string>("key", "privkey.pem"));
+ this->certfile = Anope::ExpandConfig(config.Get<const Anope::string>("cert", "fullchain.pem"));
+ this->keyfile = Anope::ExpandConfig(config.Get<const Anope::string>("key", "privkey.pem"));
if (Anope::IsFile(this->certfile))
{
@@ -177,7 +177,7 @@ public:
}
// Allow disabling old versions of TLS
- if (config->Get<bool>("tlsv10", "false"))
+ if (config.Get<bool>("tlsv10", "false"))
{
SSL_CTX_clear_options(client_ctx, SSL_OP_NO_TLSv1);
SSL_CTX_clear_options(server_ctx, SSL_OP_NO_TLSv1);
@@ -188,7 +188,7 @@ public:
SSL_CTX_set_options(server_ctx, SSL_OP_NO_TLSv1);
}
- if (config->Get<bool>("tlsv11", "true"))
+ if (config.Get<bool>("tlsv11", "true"))
{
SSL_CTX_clear_options(client_ctx, SSL_OP_NO_TLSv1_1);
SSL_CTX_clear_options(server_ctx, SSL_OP_NO_TLSv1_1);
@@ -199,7 +199,7 @@ public:
SSL_CTX_set_options(server_ctx, SSL_OP_NO_TLSv1_1);
}
- if (config->Get<bool>("tlsv12", "true"))
+ if (config.Get<bool>("tlsv12", "true"))
{
SSL_CTX_clear_options(client_ctx, SSL_OP_NO_TLSv1_2);
SSL_CTX_clear_options(server_ctx, SSL_OP_NO_TLSv1_2);
@@ -213,9 +213,9 @@ public:
void OnPreServerConnect() override
{
- Configuration::Block *config = Config->GetBlock("uplink", Anope::CurrentUplink);
+ Configuration::Block &config = Config->GetBlock("uplink", Anope::CurrentUplink);
- if (config->Get<bool>("ssl"))
+ if (config.Get<bool>("ssl"))
{
this->service.Init(UplinkSock);
}
diff --git a/modules/extra/xmlrpc.cpp b/modules/extra/xmlrpc.cpp
index 00b7d92ac..7652fc4d3 100644
--- a/modules/extra/xmlrpc.cpp
+++ b/modules/extra/xmlrpc.cpp
@@ -279,12 +279,12 @@ public:
xmlrpc_term();
}
- void OnReload(Configuration::Conf *conf) override
+ void OnReload(Configuration::Conf &conf) override
{
if (httpref)
httpref->UnregisterPage(&xmlrpcinterface);
- this->httpref = ServiceReference<HTTPProvider>("HTTPProvider", conf->GetModule(this)->Get<const Anope::string>("server", "httpd/main"));
+ this->httpref = ServiceReference<HTTPProvider>("HTTPProvider", conf.GetModule(this).Get<const Anope::string>("server", "httpd/main"));
if (!httpref)
throw ConfigException("Unable to find http reference, is httpd loaded?");
generated by cgit (git 2.34.1) at 2026-09-28 12:55:09 +0000