aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorGravatar Josh Soref2021-06-21 16:47:06 -0400
committerGravatar GitHub2021-06-21 21:47:06 +0100
commitde6d4dbd1e8845e08c2d87cd89a919e5b21ba619 (patch)
treef3c964db5830e7b15361889cd61daceabe3d7466 /src/modules
parentUpdate example configuration for 'if-host-match' oper autologin option. (diff)
Fix various spelling issues (#1883).
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/extra/m_mysql.cpp6
-rw-r--r--src/modules/extra/m_pgsql.cpp2
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp2
-rw-r--r--src/modules/extra/m_ssl_mbedtls.cpp2
-rw-r--r--src/modules/extra/m_ssl_openssl.cpp22
-rw-r--r--src/modules/m_censor.cpp4
-rw-r--r--src/modules/m_check.cpp42
-rw-r--r--src/modules/m_commonchans.cpp6
-rw-r--r--src/modules/m_deaf.cpp2
-rw-r--r--src/modules/m_filter.cpp2
-rw-r--r--src/modules/m_ident.cpp10
-rw-r--r--src/modules/m_messageflood.cpp2
-rw-r--r--src/modules/m_operlog.cpp4
-rw-r--r--src/modules/m_services_account.cpp8
-rw-r--r--src/modules/m_spanningtree/fjoin.cpp4
-rw-r--r--src/modules/m_spanningtree/ftopic.cpp2
-rw-r--r--src/modules/m_spanningtree/treesocket.h2
17 files changed, 61 insertions, 61 deletions
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 64a460f77..b34cd0324 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -63,9 +63,9 @@
/* THE NONBLOCKING MYSQL API!
*
- * MySQL provides no nonblocking (asyncronous) API of its own, and its developers recommend
+ * MySQL provides no nonblocking (asynchronous) API of its own, and its developers recommend
* that instead, you should thread your program. This is what i've done here to allow for
- * asyncronous SQL requests via mysql. The way this works is as follows:
+ * asynchronous SQL requests via mysql. The way this works is as follows:
*
* The module spawns a thread via class Thread, and performs its mysql queries in this thread,
* using a queue with priorities. There is a mutex on either end which prevents two threads
@@ -88,7 +88,7 @@
* threadsafe. This module is designed to be threadsafe and is careful with its use of threads,
* however, if we were to call a module's OnRequest even from within a thread which was not the
* one the module was originally instantiated upon, there is a chance of all hell breaking loose
- * if a module is ever put in a re-enterant state (stack corruption could occur, crashes, data
+ * if a module is ever put in a reentrant state (stack corruption could occur, crashes, data
* corruption, and worse, so DONT think about it until the day comes when InspIRCd is 100%
* guaranteed threadsafe!)
*/
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index e1db996c8..65ae621f9 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -93,7 +93,7 @@ struct QueueItem
/** PgSQLresult is a subclass of the mostly-pure-virtual class SQLresult.
* All SQL providers must create their own subclass and define it's methods using that
- * database library's data retriveal functions. The aim is to avoid a slow and inefficient process
+ * database library's data retrieval functions. The aim is to avoid a slow and inefficient process
* of converting all data to a common format before it reaches the result structure. This way
* data is passes to the module nearly as directly as if it was using the API directly itself.
*/
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 670ff79b1..86c2c43b7 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -779,7 +779,7 @@ class GnuTLSIOHook : public SSLIOHook
}
else
{
- // Change the seesion state
+ // Change the session state
this->status = ISSL_HANDSHAKEN;
VerifyCertificate();
diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index c3d040ad0..a33ea367e 100644
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -546,7 +546,7 @@ class mbedTLSIOHook : public SSLIOHook
int ret = mbedtls_ssl_handshake(&sess);
if (ret == 0)
{
- // Change the seesion state
+ // Change the session state
this->status = ISSL_HANDSHAKEN;
VerifyCertificate();
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index f84468da8..cd96022c8 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -336,7 +336,7 @@ namespace OpenSSL
/** OpenSSL makes us have two contexts, one for servers and one for clients
*/
Context ctx;
- Context clictx;
+ Context clientctx;
/** Digest to use when generating fingerprints
*/
@@ -406,11 +406,11 @@ namespace OpenSSL
: name(profilename)
, dh(ServerInstance->Config->Paths.PrependConfig(tag->getString("dhfile", "dhparams.pem", 1)))
, ctx(SSL_CTX_new(SSLv23_server_method()))
- , clictx(SSL_CTX_new(SSLv23_client_method()))
+ , clientctx(SSL_CTX_new(SSLv23_client_method()))
, allowrenego(tag->getBool("renegotiation")) // Disallow by default
, outrecsize(tag->getUInt("outrecsize", 2048, 512, 16384))
{
- if ((!ctx.SetDH(dh)) || (!clictx.SetDH(dh)))
+ if ((!ctx.SetDH(dh)) || (!clientctx.SetDH(dh)))
throw Exception("Couldn't set DH parameters");
const std::string hash = tag->getString("hash", "md5", 1);
@@ -421,7 +421,7 @@ namespace OpenSSL
const std::string ciphers = tag->getString("ciphers");
if (!ciphers.empty())
{
- if ((!ctx.SetCiphers(ciphers)) || (!clictx.SetCiphers(ciphers)))
+ if ((!ctx.SetCiphers(ciphers)) || (!clientctx.SetCiphers(ciphers)))
{
ERR_print_errors_cb(error_callback, this);
throw Exception("Can't set cipher list to \"" + ciphers + "\" " + lasterr);
@@ -432,7 +432,7 @@ namespace OpenSSL
if (!ciphers.empty())
{
#if OPENSSL_VERSION_NUMBER >= 0x10101000L
- if ((!ctx.SetCiphersuites(ciphersuites)) || (!clictx.SetCiphersuites(ciphersuites)))
+ if ((!ctx.SetCiphersuites(ciphersuites)) || (!clientctx.SetCiphersuites(ciphersuites)))
{
ERR_print_errors_cb(error_callback, this);
throw Exception("Can't set ciphersuite list to \"" + ciphersuites + "\" " + lasterr);
@@ -449,20 +449,20 @@ namespace OpenSSL
#endif
SetContextOptions("server", tag, ctx);
- SetContextOptions("client", tag, clictx);
+ SetContextOptions("client", tag, clientctx);
/* Load our keys and certificates
* NOTE: OpenSSL's error logging API sucks, don't blame us for this clusterfuck.
*/
std::string filename = ServerInstance->Config->Paths.PrependConfig(tag->getString("certfile", "cert.pem", 1));
- if ((!ctx.SetCerts(filename)) || (!clictx.SetCerts(filename)))
+ if ((!ctx.SetCerts(filename)) || (!clientctx.SetCerts(filename)))
{
ERR_print_errors_cb(error_callback, this);
throw Exception("Can't read certificate file: " + lasterr);
}
filename = ServerInstance->Config->Paths.PrependConfig(tag->getString("keyfile", "key.pem", 1));
- if ((!ctx.SetPrivateKey(filename)) || (!clictx.SetPrivateKey(filename)))
+ if ((!ctx.SetPrivateKey(filename)) || (!clientctx.SetPrivateKey(filename)))
{
ERR_print_errors_cb(error_callback, this);
throw Exception("Can't read key file: " + lasterr);
@@ -470,7 +470,7 @@ namespace OpenSSL
// Load the CAs we trust
filename = ServerInstance->Config->Paths.PrependConfig(tag->getString("cafile", "ca.pem", 1));
- if ((!ctx.SetCA(filename)) || (!clictx.SetCA(filename)))
+ if ((!ctx.SetCA(filename)) || (!clientctx.SetCA(filename)))
{
ERR_print_errors_cb(error_callback, this);
ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Can't read CA list from %s. This is only a problem if you want to verify client certificates, otherwise it's safe to ignore this message. Error: %s", filename.c_str(), lasterr.c_str());
@@ -482,14 +482,14 @@ namespace OpenSSL
const std::string crlmode = tag->getString("crlmode", "chain", 1);
ctx.SetCRL(crlfile, crlpath, crlmode);
- clictx.SetVerifyCert();
+ clientctx.SetVerifyCert();
if (tag->getBool("requestclientcert", true))
ctx.SetVerifyCert();
}
const std::string& GetName() const { return name; }
SSL* CreateServerSession() { return ctx.CreateServerSession(); }
- SSL* CreateClientSession() { return clictx.CreateClientSession(); }
+ SSL* CreateClientSession() { return clientctx.CreateClientSession(); }
const EVP_MD* GetDigest() { return digest; }
bool AllowRenegotiation() const { return allowrenego; }
unsigned int GetOutgoingRecordSize() const { return outrecsize; }
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index c13c677e9..e369f71a9 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -55,8 +55,8 @@ class ModuleCensor : public Module
{
case MessageTarget::TYPE_USER:
{
- User* targuser = target.Get<User>();
- if (!targuser->IsModeSet(cu))
+ User* targetuser = target.Get<User>();
+ if (!targetuser->IsModeSet(cu))
return MOD_RES_PASSTHRU;
break;
}
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 2eafc0358..87e601913 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -169,10 +169,10 @@ class CommandCheck : public Command
if (parameters.size() > 1 && !irc::equals(parameters[1], ServerInstance->Config->ServerName))
return CMD_SUCCESS;
- User *targuser;
+ User *targetuser;
Channel *targchan;
- targuser = ServerInstance->FindNick(parameters[0]);
+ targetuser = ServerInstance->FindNick(parameters[0]);
targchan = ServerInstance->FindChan(parameters[0]);
/*
@@ -185,32 +185,32 @@ class CommandCheck : public Command
// Constructor sends START, destructor sends END
CheckContext context(user, parameters[0]);
- if (targuser)
+ if (targetuser)
{
- LocalUser* loctarg = IS_LOCAL(targuser);
+ LocalUser* loctarg = IS_LOCAL(targetuser);
/* /check on a user */
- context.Write("nuh", targuser->GetFullHost());
- context.Write("realnuh", targuser->GetFullRealHost());
- context.Write("realname", targuser->GetRealName());
- context.Write("modes", targuser->GetModeLetters());
- context.Write("snomasks", GetSnomasks(targuser));
- context.Write("server", targuser->server->GetName());
- context.Write("uid", targuser->uuid);
- context.Write("signon", targuser->signon);
- context.Write("nickts", targuser->age);
+ context.Write("nuh", targetuser->GetFullHost());
+ context.Write("realnuh", targetuser->GetFullRealHost());
+ context.Write("realname", targetuser->GetRealName());
+ context.Write("modes", targetuser->GetModeLetters());
+ context.Write("snomasks", GetSnomasks(targetuser));
+ context.Write("server", targetuser->server->GetName());
+ context.Write("uid", targetuser->uuid);
+ context.Write("signon", targetuser->signon);
+ context.Write("nickts", targetuser->age);
if (loctarg)
context.Write("lastmsg", loctarg->idle_lastmsg);
- if (targuser->IsAway())
+ if (targetuser->IsAway())
{
/* user is away */
- context.Write("awaytime", targuser->awaytime);
- context.Write("awaymsg", targuser->awaymsg);
+ context.Write("awaytime", targetuser->awaytime);
+ context.Write("awaymsg", targetuser->awaymsg);
}
- if (targuser->IsOper())
+ if (targetuser->IsOper())
{
- OperInfo* oper = targuser->oper;
+ OperInfo* oper = targetuser->oper;
/* user is an oper of type ____ */
context.Write("opertype", oper->name);
if (loctarg)
@@ -235,10 +235,10 @@ class CommandCheck : public Command
context.Write("exempt", loctarg->exempt ? "yes" : "no");
}
else
- context.Write("onip", targuser->GetIPString());
+ context.Write("onip", targetuser->GetIPString());
CheckContext::List chanlist(context, "onchans");
- for (User::ChanList::iterator i = targuser->chans.begin(); i != targuser->chans.end(); i++)
+ for (User::ChanList::iterator i = targetuser->chans.begin(); i != targetuser->chans.end(); i++)
{
Membership* memb = *i;
chanlist.Add(memb->GetAllPrefixChars() + memb->chan->name);
@@ -246,7 +246,7 @@ class CommandCheck : public Command
chanlist.Flush();
- context.DumpExt(targuser);
+ context.DumpExt(targetuser);
}
else if (targchan)
{
diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index 23a1472c2..66c56bafc 100644
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -36,14 +36,14 @@ class ModuleCommonChans
if (target.type != MessageTarget::TYPE_USER)
return MOD_RES_PASSTHRU;
- User* targuser = target.Get<User>();
- if (!targuser->IsModeSet(mode) || user->SharesChannelWith(targuser))
+ User* targetuser = target.Get<User>();
+ if (!targetuser->IsModeSet(mode) || user->SharesChannelWith(targetuser))
return MOD_RES_PASSTHRU;
if (user->HasPrivPermission("users/ignore-commonchans") || user->server->IsULine())
return MOD_RES_PASSTHRU;
- user->WriteNumeric(Numerics::CannotSendTo(targuser, "messages", &mode));
+ user->WriteNumeric(Numerics::CannotSendTo(targetuser, "messages", &mode));
return MOD_RES_DENY;
}
diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 1a2ec9b22..74018d245 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -114,7 +114,7 @@ class ModuleDeaf
if (!target->IsModeSet(privdeafmode))
return MOD_RES_PASSTHRU;
- // Reject if the source is ulined and privdeafuline is disaled.
+ // Reject if the source is ulined and privdeafuline is disabled.
if (!privdeafuline && source->server->IsULine())
return MOD_RES_DENY;
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 158f8eb57..e3987f2c9 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -552,7 +552,7 @@ ModResult ModuleFilter::OnPreCommand(std::string& command, CommandBase::Params&
parameters[parting ? 1 : 0] = "Reason filtered";
/* We're warning or blocking, OR they're quitting and its a KILL action
- * (we cant kill someone whos already quitting, so filter them anyway)
+ * (we cant kill someone who's already quitting, so filter them anyway)
*/
if ((f->action == FA_WARN) || (f->action == FA_BLOCK) || (((!parting) && (f->action == FA_KILL))) || (f->action == FA_SILENT))
{
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 0f746b05b..aa6b6c7d0 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -28,13 +28,13 @@
enum
{
- // Either the ident looup has not started yet or the user is registered.
+ // Either the ident lookup has not started yet or the user is registered.
IDENT_UNKNOWN = 0,
// Ident lookups are not enabled and a user has been marked as being skipped.
IDENT_SKIPPED,
- // Ident looups are not enabled and a user has been an insecure ident prefix.
+ // Ident lookups are not enabled and a user has been an insecure ident prefix.
IDENT_PREFIXED,
// An ident lookup was done and an ident was found.
@@ -56,7 +56,7 @@ enum
* nasty race conditions that would cause segfaults etc) we have
* rewritten this module to use a simplified socket object based
* directly off EventHandler. As EventHandler only has low level
- * readability, writeability and error events tied directly to the
+ * readability, writability and error events tied directly to the
* socket engine, this makes our lives easier as nothing happens to
* our ident lookup class that is outside of this module, or out-
* side of the control of the class. There are no timers, internal
@@ -74,11 +74,11 @@ enum
* itself.
*
* O Closure of the ident socket with the Close() method will
- * not cause removal of the socket from memory or detatchment
+ * not cause removal of the socket from memory or detachment
* from its 'parent' User class. It will only flag it as an
* inactive socket in the socket engine.
*
- * O Timeouts are handled in OnCheckReaady at the same time as
+ * O Timeouts are handled in OnCheckReady at the same time as
* checking if the ident socket has a result. This is done
* by checking if the age the of the class (its instantiation
* time) plus the timeout value is greater than the current time.
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 329d77aac..216c20c03 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -154,7 +154,7 @@ private:
{
if (f->addmessage(user, weight))
{
- /* Youre outttta here! */
+ /* You're outttta here! */
f->clear(user);
if (f->ban)
{
diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index 388b0f607..ac3b6d467 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -53,8 +53,8 @@ class ModuleOperLog : public Module
if ((user->IsOper()) && (user->HasCommandPermission(command)))
{
- Command* thiscommand = ServerInstance->Parser.GetHandler(command);
- if ((thiscommand) && (thiscommand->flags_needed == 'o'))
+ Command* thiscmd = ServerInstance->Parser.GetHandler(command);
+ if ((thiscmd) && (thiscmd->flags_needed == 'o'))
{
std::string msg = "[" + user->GetFullRealHost() + "] " + command + " " + stdalgo::string::join(parameters);
if (tosnomask)
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 7baa9c75f..0192e7e78 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -230,15 +230,15 @@ class ModuleServicesAccount
}
case MessageTarget::TYPE_USER:
{
- User* targuser = target.Get<User>();
- if (!targuser->IsModeSet(regdeafmode) || is_registered)
+ User* targetuser = target.Get<User>();
+ if (!targetuser->IsModeSet(regdeafmode) || is_registered)
return MOD_RES_PASSTHRU;
- if (calleridapi && calleridapi->IsOnAcceptList(user, targuser))
+ if (calleridapi && calleridapi->IsOnAcceptList(user, targetuser))
return MOD_RES_PASSTHRU;
// User is messaging a +R user and is not registered or on an accept list.
- user->WriteNumeric(ERR_NEEDREGGEDNICK, targuser->nick, "You need to be identified to a registered account to message this user");
+ user->WriteNumeric(ERR_NEEDREGGEDNICK, targetuser->nick, "You need to be identified to a registered account to message this user");
return MOD_RES_DENY;
break;
}
diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index 962539970..4bc24b0d5 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -57,7 +57,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params)
* When two sides of a split heal and this occurs, the following things
* will happen:
*
- * If the timestamps are exactly equal, both sides merge their privilages
+ * If the timestamps are exactly equal, both sides merge their privileges
* and users, as in InspIRCd 1.0 and ircd2.8. The channels have not been
* re-created during a split, this is safe to do.
*
@@ -83,7 +83,7 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params)
* [[<modes>,]<uuid>[:<membid>]
* <modes> is a concatenation of the mode letters the user has on the channel
* (e.g.: "ov" if the user is opped and voiced). The order of the mode letters
- * are not important but if a server ecounters an unknown mode letter, it will
+ * are not important but if a server encounters an unknown mode letter, it will
* drop the link to avoid desync.
*
* InspIRCd 2.0 and older required a comma before the uuid even if the user
diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index 2f9813860..bf76f834f 100644
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -50,7 +50,7 @@ CmdResult CommandFTopic::Handle(User* user, Params& params)
/*
* If the topics were updated at the exact same second, accept
* the remote only when it's "bigger" than ours as defined by
- * string comparison, so non-empty topics always overridde
+ * string comparison, so non-empty topics always override
* empty topics if their timestamps are equal
*
* Similarly, if the topic texts are equal too, keep one topic
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 5d0fc9f2d..fd01c8e34 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -34,7 +34,7 @@
/*
* The server list in InspIRCd is maintained as two structures
* which hold the data in different ways. Most of the time, we
- * want to very quicky obtain three pieces of information:
+ * want to very quickly obtain three pieces of information:
*
* (1) The information on a server
* (2) The information on the server we must send data through