summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/u_listmode.h12
-rw-r--r--src/modules/m_banexception.cpp2
-rw-r--r--src/modules/m_callerid.cpp134
-rw-r--r--src/modules/m_chanfilter.cpp2
-rw-r--r--src/modules/m_inviteexception.cpp2
5 files changed, 62 insertions, 90 deletions
diff --git a/include/u_listmode.h b/include/u_listmode.h
index 3b0fb5c3f..5c5ddd9ff 100644
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -87,10 +87,10 @@ class ListModeBase : public ModeHandler
std::string infokey;
/** Numeric to use when outputting the list
*/
- std::string listnumeric;
+ unsigned int listnumeric;
/** Numeric to indicate end of list
*/
- std::string endoflistnumeric;
+ unsigned int endoflistnumeric;
/** String to send for end of list
*/
std::string endofliststring;
@@ -115,7 +115,7 @@ class ListModeBase : public ModeHandler
* @param autotidy Automatically tidy list entries on add
* @param ctag Configuration tag to get limits from
*/
- ListModeBase(InspIRCd* Instance, char modechar, const std::string &eolstr, const std::string &lnum, const std::string &eolnum, bool autotidy, const std::string &ctag = "banlist")
+ ListModeBase(InspIRCd* Instance, char modechar, const std::string &eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy, const std::string &ctag = "banlist")
: ModeHandler(Instance, modechar, 1, 1, true, MODETYPE_CHANNEL, false), listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy), configtag(ctag)
{
this->DoRehash();
@@ -153,15 +153,15 @@ class ListModeBase : public ModeHandler
{
for (modelist::reverse_iterator it = el->rbegin(); it != el->rend(); ++it)
{
- user->WriteServ("%s %s %s %s %s %s", listnumeric.c_str(), user->nick, channel->name, it->mask.c_str(), it->nick.c_str(), it->time.c_str());
+ user->WriteNumeric(listnumeric, "%s %s %s %s %s", user->nick, channel->name, it->mask.c_str(), it->nick.c_str(), it->time.c_str());
}
}
- user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
+ user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick, channel->name, endofliststring.c_str());
}
virtual void DisplayEmptyList(User* user, Channel* channel)
{
- user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
+ user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick, channel->name, endofliststring.c_str());
}
/** Remove all instances of the mode from a channel.
diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 7c33e489e..609e5c221 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -32,7 +32,7 @@
class BanException : public ListModeBase
{
public:
- BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", "348", "349", true) { }
+ BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", 348, 349, true) { }
};
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 43d546f92..aa7cc6162 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -12,28 +12,25 @@ class callerid_data : public classbase
public:
time_t lastnotify;
std::set<User*> accepting;
+
+ callerid_data() : lastnotify(0) { }
};
callerid_data* GetData(User* who, bool extend = true)
{
callerid_data* dat;
if (who->GetExt("callerid_data", dat))
- {
return dat;
- }
else
{
if (extend)
{
dat = new callerid_data;
- dat->lastnotify = 0; // Can't init in struct.
who->Extend("callerid_data", dat);
return dat;
}
else
- {
return NULL;
- }
}
}
@@ -41,7 +38,10 @@ void RemoveData(User* who)
{
callerid_data* dat;
who->GetExt("callerid_data", dat);
- if (!dat) return;
+
+ if (!dat)
+ return;
+
who->Shrink("callerid_data");
delete dat;
}
@@ -51,18 +51,22 @@ void RemoveFromAllAccepts(InspIRCd* ServerInstance, User* who)
for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); ++i)
{
callerid_data* dat = GetData(i->second, false);
- if (!dat) continue;
+
+ if (!dat)
+ continue;
+
std::set<User*>& accepting = dat->accepting;
std::set<User*>::iterator iter = accepting.find(who);
- if (iter == accepting.end()) continue;
+
+ if (iter == accepting.end())
+ continue;
+
accepting.erase(iter);
}
}
class User_g : public SimpleUserModeHandler
{
-private:
-
public:
User_g(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'g') { }
};
@@ -78,55 +82,47 @@ public:
syntax = "{[+|-]<nicks>}|*}";
}
- /* Will take any number of nicks, which can be seperated by spaces, commas, or a mix.
+ /** Will take any number of nicks, which can be seperated by spaces, commas, or a mix.
* - in front of any nick removes, and an * lists. This effectively means you can do:
- * /accept nick1,nick2,nick3 *
+ * /accept nick1,nick2,nick3,*
* to add 3 nicks and then show your list
*/
-
CmdResult Handle(const std::vector<std::string> &parameters, User* user)
{
- if (parameters.size() < 1)
- {
- /* Command stuff should've dealt with this already */
- return CMD_FAILURE;
- }
/* Even if callerid mode is not set, we let them manage their ACCEPT list so that if they go +g they can
* have a list already setup. */
bool atleastonechange = false;
- for (int i = 0; i < (int)parameters.size(); ++i)
+ for (unsigned int i = 0; i < parameters.size(); ++i)
{
const char* arg = parameters[i].c_str();
irc::commasepstream css(arg);
std::string tok;
+
while (css.GetToken(tok))
{
- if (tok.length() < 1)
+ if (tok.empty())
continue;
+
if (tok == "*")
{
- if (IS_LOCAL(user)) continue;
+ if (IS_LOCAL(user))
+ continue;
+
ListAccept(user);
}
else if (tok[0] == '-')
{
User* whotoremove = ServerInstance->FindNick(tok.substr(1));
if (whotoremove)
- {
atleastonechange = RemoveAccept(user, whotoremove, false) || atleastonechange;
- }
}
else
{
User* whotoadd = ServerInstance->FindNick(tok[0] == '+' ? tok.substr(1) : tok);
if (whotoadd)
- {
atleastonechange = AddAccept(user, whotoadd, false) || atleastonechange;
- }
else
- {
user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick, tok.c_str());
- }
}
}
}
@@ -139,9 +135,7 @@ public:
if (dat)
{
for (std::set<User*>::iterator i = dat->accepting.begin(); i != dat->accepting.end(); ++i)
- {
user->WriteNumeric(281, "%s %s", user->nick, (*i)->nick);
- }
}
user->WriteNumeric(282, "%s :End of ACCEPT list", user->nick);
}
@@ -152,12 +146,16 @@ public:
std::set<User*>& accepting = dat->accepting;
if (accepting.size() >= maxaccepts)
{
- if (!quiet) user->WriteNumeric(456, "%s :Accept list is full (limit is %d)", user->nick, maxaccepts);
+ if (!quiet)
+ user->WriteNumeric(456, "%s :Accept list is full (limit is %d)", user->nick, maxaccepts);
+
return false;
}
if (!accepting.insert(whotoadd).second)
{
- if (!quiet) user->WriteNumeric(457, "%s %s :is already on your accept list", user->nick, whotoadd->nick);
+ if (!quiet)
+ user->WriteNumeric(457, "%s %s :is already on your accept list", user->nick, whotoadd->nick);
+
return false;
}
return true;
@@ -168,14 +166,18 @@ public:
callerid_data* dat = GetData(user, false);
if (!dat)
{
- if (!quiet) user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick, whotoremove->nick);
+ if (!quiet)
+ user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick, whotoremove->nick);
+
return false;
}
std::set<User*>& accepting = dat->accepting;
std::set<User*>::iterator i = accepting.find(whotoremove);
if (i == accepting.end())
{
- if (!quiet) user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick, whotoremove->nick);
+ if (!quiet)
+ user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick, whotoremove->nick);
+
return false;
}
accepting.erase(i);
@@ -201,6 +203,7 @@ public:
OnRehash(NULL, "");
mycommand = new CommandAccept(ServerInstance, maxaccepts);
myumode = new User_g(ServerInstance);
+
try
{
ServerInstance->AddCommand(mycommand);
@@ -228,7 +231,7 @@ public:
Version GetVersion()
{
- return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
}
void On005Numeric(std::string& output)
@@ -238,12 +241,17 @@ public:
int PreText(User* user, User* dest, std::string& text, bool notice)
{
- if (!dest->IsModeSet('g')) return 0;
- if (operoverride && IS_OPER(user)) return 0;
+ if (!dest->IsModeSet('g'))
+ return 0;
+
+ if (operoverride && IS_OPER(user))
+ return 0;
+
callerid_data* dat = GetData(dest, true);
std::set<User*>& accepting = dat->accepting;
time_t& lastnotify = dat->lastnotify;
std::set<User*>::iterator i = accepting.find(dest);
+
if (i == accepting.end())
{
time_t now = time(NULL);
@@ -264,6 +272,7 @@ public:
{
if (IS_LOCAL(user) && target_type == TYPE_USER)
return PreText(user, (User*)dest, text, true);
+
return 0;
}
@@ -271,12 +280,15 @@ public:
{
if (IS_LOCAL(user) && target_type == TYPE_USER)
return PreText(user, (User*)dest, text, true);
+
return 0;
}
void OnCleanup(int type, void* item)
{
- if (type != TYPE_USER) return;
+ if (type != TYPE_USER)
+ return;
+
User* u = (User*)item;
/* Cleanup only happens on unload (before dtor), so keep this O(n) instead of O(n^2) which deferring to OnUserQuit would do. */
RemoveData(u);
@@ -298,50 +310,10 @@ public:
void OnRehash(User* user, const std::string& parameter)
{
ConfigReader Conf(ServerInstance);
- int new_maxaccepts, new_cooldown;
- bool new_override, new_track;
- new_maxaccepts = Conf.ReadInteger("callerid", "maxaccepts", "16", 0, true);
- switch (Conf.GetError())
- {
- case 0: break;
- case CONF_VALUE_NOT_FOUND:
- new_maxaccepts = 16;
- break;
- case CONF_NOT_A_NUMBER:
- if (user) user->WriteServ("NOTICE %s :Invalid maxaccepts value '%s', not a number", user->nick, Conf.ReadValue("callerid", "maxaccepts", "", 0).c_str());
- throw ModuleException("Invalid maxaccepts value, not a number");
- case CONF_INT_NEGATIVE:
- if (user) user->WriteServ("NOTICE %s :Invalid maxaccepts value '%s', negative", user->nick, Conf.ReadValue("callerid", "maxaccepts", "", 0).c_str());
- throw ModuleException("Invalid maxaccepts value, negative");
- default:
- /* Yikes */
- throw ModuleException("Invalid maxaccepts value, unknown config error");
- }
- new_override = Conf.ReadFlag("callerid", "operoverride", "0", 0);
- if (Conf.GetError() == CONF_VALUE_NOT_FOUND) new_override = false;
- new_track = Conf.ReadFlag("callerid", "tracknick", "0", 0);
- if (Conf.GetError() == CONF_VALUE_NOT_FOUND) new_track = false;
- new_cooldown = Conf.ReadInteger("callerid", "cooldown", "60", 0, true);
- switch (Conf.GetError())
- {
- case 0: break;
- case CONF_VALUE_NOT_FOUND:
- new_cooldown = 16;
- break;
- case CONF_NOT_A_NUMBER:
- if (user) user->WriteServ("NOTICE %s :Invalid cooldown value '%s', not a number", user->nick, Conf.ReadValue("callerid", "maxaccepts", "", 0).c_str());
- throw ModuleException("Invalid cooldown value, not a number");
- case CONF_INT_NEGATIVE:
- if (user) user->WriteServ("NOTICE %s :Invalid cooldown value '%s', negative", user->nick, Conf.ReadValue("callerid", "maxaccepts", "", 0).c_str());
- throw ModuleException("Invalid cooldown value, negative");
- default:
- /* Yikes */
- throw ModuleException("Invalid cooldown value, unknown config error");
- }
- maxaccepts = new_maxaccepts;
- notify_cooldown = new_cooldown;
- operoverride = new_override;
- tracknick = new_track;
+ maxaccepts = Conf.ReadInteger("callerid", "maxaccepts", "16", 0, true);
+ operoverride = Conf.ReadFlag("callerid", "operoverride", "0", 0);
+ tracknick = Conf.ReadFlag("callerid", "tracknick", "0", 0);
+ notify_cooldown = Conf.ReadInteger("callerid", "cooldown", "60", 0, true);
}
};
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index f41896263..b3f02b271 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -25,7 +25,7 @@
class ChanFilter : public ListModeBase
{
public:
- ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", "941", "940", false, "chanfilter") { }
+ ChanFilter(InspIRCd* Instance) : ListModeBase(Instance, 'g', "End of channel spamfilter list", 941, 940, false, "chanfilter") { }
virtual bool ValidateParam(User* user, Channel* chan, std::string &word)
{
diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index dfe796b8b..95f27ee0d 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -34,7 +34,7 @@ class InspIRCd* ServerInstance;
class InviteException : public ListModeBase
{
public:
- InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", "346", "347", true) { }
+ InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", 346, 347, true) { }
};
class ModuleInviteException : public Module
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 12:11:47 +0000