* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
static ConfigReader *Conf;
-class BannedFileList
+class BannedFileList : public classbase
{
public:
std::string filemask;
std::string action;
};
-class DCCAllow
+class DCCAllow : public classbase
{
public:
std::string nickname;
DCCAllow(const std::string &nick, const std::string &hm, const time_t so, const long ln) : nickname(nick), hostmask(hm), set_on(so), length(ln) { }
};
-typedef std::vector<userrec *> userlist;
+typedef std::vector<User *> userlist;
userlist ul;
typedef std::vector<DCCAllow> dccallowlist;
dccallowlist* dl;
typedef std::vector<BannedFileList> bannedfilelist;
bannedfilelist bfl;
-class cmd_dccallow : public command_t
+class CommandDccallow : public Command
{
public:
- cmd_dccallow(InspIRCd* Me) : command_t(Me, "DCCALLOW", 0, 0)
+ CommandDccallow(InspIRCd* Me) : Command(Me, "DCCALLOW", 0, 0)
{
this->source = "m_dccallow.so";
syntax = "{[+|-]<nick> <time>|HELP|LIST}";
/* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */
}
- CmdResult Handle(const char **parameters, int pcnt, userrec *user)
+ CmdResult Handle(const std::vector<std::string> ¶meters, User *user)
{
/* syntax: DCCALLOW [+|-]<nick> (<time>) */
- if (!pcnt)
+ if (!parameters.size())
{
// display current DCCALLOW list
DisplayDCCAllowList(user);
return CMD_FAILURE;
}
- else if (pcnt > 0)
+ else if (parameters.size() > 0)
{
- char action = *parameters[0];
+ char action = *parameters[0].c_str();
// if they didn't specify an action, this is probably a command
if (action != '+' && action != '-')
{
- if (!strcasecmp(parameters[0], "LIST"))
+ if (!strcasecmp(parameters[0].c_str(), "LIST"))
{
// list current DCCALLOW list
DisplayDCCAllowList(user);
return CMD_FAILURE;
}
- else if (!strcasecmp(parameters[0], "HELP"))
+ else if (!strcasecmp(parameters[0].c_str(), "HELP"))
{
// display help
DisplayHelp(user);
}
}
- std::string nick = parameters[0] + 1;
- userrec *target = ServerInstance->FindNick(nick);
+ std::string nick = parameters[0].substr(1);
+ User *target = ServerInstance->FindNick(nick);
if (target)
{
if (action == '-')
{
- user->GetExt("dccallow_list", dl);
// check if it contains any entries
- if (dl)
+ if (user->GetExt("dccallow_list", dl))
{
- if (dl->size())
+ for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i)
{
- for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i)
+ // search through list
+ if (i->nickname == target->nick)
{
- // search through list
- if (i->nickname == target->nick)
- {
- dl->erase(i);
- user->WriteServ("995 %s %s :Removed %s from your DCCALLOW list", user->nick, user->nick, target->nick);
- break;
- }
+ dl->erase(i);
+ user->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", user->nick.c_str(), user->nick.c_str(), target->nick.c_str());
+ break;
}
}
}
else
{
- DELETE(dl);
+ delete dl;
user->Shrink("dccallow_list");
// remove from userlist
for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
{
- userrec* u = (userrec*)(*j);
+ User* u = (User*)(*j);
if (u == user)
{
ul.erase(j);
}
else if (action == '+')
{
- // fetch current DCCALLOW list
- user->GetExt("dccallow_list", dl);
- // they don't have one, create it
- if (!dl)
+ if (!user->GetExt("dccallow_list", dl))
{
dl = new dccallowlist;
user->Extend("dccallow_list", dl);
{
if (k->nickname == target->nick)
{
- user->WriteServ("996 %s %s :%s is already on your DCCALLOW list", user->nick, user->nick, target->nick);
+ user->WriteNumeric(996, "%s %s :%s is already on your DCCALLOW list", user->nick.c_str(), user->nick.c_str(), target->nick.c_str());
return CMD_FAILURE;
}
else if (ServerInstance->MatchText(user->GetFullHost(), k->hostmask))
{
- user->WriteServ("996 %s %s :You cannot add yourself to your own DCCALLOW list!", user->nick, user->nick);
+ user->WriteNumeric(996, "%s %s :You cannot add yourself to your own DCCALLOW list!", user->nick.c_str(), user->nick.c_str());
return CMD_FAILURE;
}
}
std::string default_length = Conf->ReadValue("dccallow", "length", 0);
long length;
- if (pcnt < 2)
+ if (parameters.size() < 2)
{
length = ServerInstance->Duration(default_length);
}
- else if (!atoi(parameters[1]))
+ else if (!atoi(parameters[1].c_str()))
{
length = 0;
}
if (length > 0)
{
- user->WriteServ("993 %s %s :Added %s to DCCALLOW list for %d seconds", user->nick, user->nick, target->nick, length);
+ user->WriteNumeric(993, "%s %s :Added %s to DCCALLOW list for %ld seconds", user->nick.c_str(), user->nick.c_str(), target->nick.c_str(), length);
}
else
{
- user->WriteServ("994 %s %s :Added %s to DCCALLOW list for this session", user->nick, user->nick, target->nick);
+ user->WriteNumeric(994, "%s %s :Added %s to DCCALLOW list for this session", user->nick.c_str(), user->nick.c_str(), target->nick.c_str());
}
/* route it. */
else
{
// nick doesn't exist
- user->WriteServ("401 %s %s :No such nick/channel", user->nick, nick.c_str());
+ user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), nick.c_str());
return CMD_FAILURE;
}
}
return CMD_FAILURE;
}
- void DisplayHelp(userrec* user)
+ void DisplayHelp(User* user)
{
- user->WriteServ("998 %s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick);
- user->WriteServ("998 %s :You may allow DCCs from specific users by specifying a", user->nick);
- user->WriteServ("998 %s :DCC allow for the user you want to receive DCCs from.", user->nick);
- user->WriteServ("998 %s :For example, to allow the user Brain to send you inspircd.exe", user->nick);
- user->WriteServ("998 %s :you would type:", user->nick);
- user->WriteServ("998 %s :/DCCALLOW +Brain", user->nick);
- user->WriteServ("998 %s :Brain would then be able to send you files. They would have to", user->nick);
- user->WriteServ("998 %s :resend the file again if the server gave them an error message", user->nick);
- user->WriteServ("998 %s :before you added them to your DCCALLOW list.", user->nick);
- user->WriteServ("998 %s :DCCALLOW entries will be temporary by default, if you want to add", user->nick);
- user->WriteServ("998 %s :them to your DCCALLOW list until you leave IRC, type:", user->nick);
- user->WriteServ("998 %s :/DCCALLOW +Brain 0", user->nick);
- user->WriteServ("998 %s :To remove the user from your DCCALLOW list, type:", user->nick);
- user->WriteServ("998 %s :/DCCALLOW -Brain", user->nick);
- user->WriteServ("998 %s :To see the users in your DCCALLOW list, type:", user->nick);
- user->WriteServ("998 %s :/DCCALLOW LIST", user->nick);
- user->WriteServ("998 %s :NOTE: If the user leaves IRC or changes their nickname", user->nick);
- user->WriteServ("998 %s : they will be removed from your DCCALLOW list.", user->nick);
- user->WriteServ("998 %s : your DCCALLOW list will be deleted when you leave IRC.", user->nick);
- user->WriteServ("999 %s :End of DCCALLOW HELP", user->nick);
+ user->WriteNumeric(998, "%s :DCCALLOW [<+|->nick.c_str() [time]] [list] [help]", user->nick.c_str());
+ user->WriteNumeric(998, "%s :You may allow DCCs from specific users by specifying a", user->nick.c_str());
+ user->WriteNumeric(998, "%s :DCC allow for the user you want to receive DCCs from.", user->nick.c_str());
+ user->WriteNumeric(998, "%s :For example, to allow the user Brain to send you inspircd.exe", user->nick.c_str());
+ user->WriteNumeric(998, "%s :you would type:", user->nick.c_str());
+ user->WriteNumeric(998, "%s :/DCCALLOW +Brain", user->nick.c_str());
+ user->WriteNumeric(998, "%s :Brain would then be able to send you files. They would have to", user->nick.c_str());
+ user->WriteNumeric(998, "%s :resend the file again if the server gave them an error message", user->nick.c_str());
+ user->WriteNumeric(998, "%s :before you added them to your DCCALLOW list.", user->nick.c_str());
+ user->WriteNumeric(998, "%s :DCCALLOW entries will be temporary by default, if you want to add", user->nick.c_str());
+ user->WriteNumeric(998, "%s :them to your DCCALLOW list until you leave IRC, type:", user->nick.c_str());
+ user->WriteNumeric(998, "%s :/DCCALLOW +Brain 0", user->nick.c_str());
+ user->WriteNumeric(998, "%s :To remove the user from your DCCALLOW list, type:", user->nick.c_str());
+ user->WriteNumeric(998, "%s :/DCCALLOW -Brain", user->nick.c_str());
+ user->WriteNumeric(998, "%s :To see the users in your DCCALLOW list, type:", user->nick.c_str());
+ user->WriteNumeric(998, "%s :/DCCALLOW LIST", user->nick.c_str());
+ user->WriteNumeric(998, "%s :NOTE: If the user leaves IRC or changes their nickname", user->nick.c_str());
+ user->WriteNumeric(998, "%s : they will be removed from your DCCALLOW list.", user->nick.c_str());
+ user->WriteNumeric(998, "%s : your DCCALLOW list will be deleted when you leave IRC.", user->nick.c_str());
+ user->WriteNumeric(999, "%s :End of DCCALLOW HELP", user->nick.c_str());
}
- void DisplayDCCAllowList(userrec* user)
+ void DisplayDCCAllowList(User* user)
{
// display current DCCALLOW list
- user->WriteServ("990 %s :Users on your DCCALLOW list:", user->nick);
- user->GetExt("dccallow_list", dl);
-
- if (dl)
+ user->WriteNumeric(990, "%s :Users on your DCCALLOW list:", user->nick.c_str());
+
+ if (user->GetExt("dccallow_list", dl))
{
for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c)
{
- user->WriteServ("991 %s %s :%s (%s)", user->nick, user->nick, c->nickname.c_str(), c->hostmask.c_str());
+ user->WriteNumeric(991, "%s %s :%s (%s)", user->nick.c_str(), user->nick.c_str(), c->nickname.c_str(), c->hostmask.c_str());
}
}
- user->WriteServ("992 %s :End of DCCALLOW list", user->nick);
+ user->WriteNumeric(992, "%s :End of DCCALLOW list", user->nick.c_str());
}
};
class ModuleDCCAllow : public Module
{
- cmd_dccallow* mycommand;
+ CommandDccallow* mycommand;
public:
ModuleDCCAllow(InspIRCd* Me)
: Module(Me)
{
Conf = new ConfigReader(ServerInstance);
- mycommand = new cmd_dccallow(ServerInstance);
+ mycommand = new CommandDccallow(ServerInstance);
ServerInstance->AddCommand(mycommand);
ReadFileConf();
+ Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserQuit, I_OnUserPreNick, I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, 5);
}
- void Implements(char* List)
- {
- List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserQuit] = List[I_OnUserPreNick] = List[I_OnRehash] = 1;
- }
- virtual void OnRehash(userrec* user, const std::string ¶meter)
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
delete Conf;
Conf = new ConfigReader(ServerInstance);
}
- virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+ virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
{
- dccallowlist* dl;
+ dccallowlist* udl;
// remove their DCCALLOW list if they have one
- user->GetExt("dccallow_list", dl);
- if (dl)
+ if (user->GetExt("dccallow_list", udl))
{
- DELETE(dl);
+ delete udl;
user->Shrink("dccallow_list");
RemoveFromUserlist(user);
}
}
- virtual int OnUserPreNick(userrec* user, const std::string &newnick)
+ virtual int OnUserPreNick(User* user, const std::string &newnick)
{
RemoveNick(user);
return 0;
}
- virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+ virtual int OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
{
return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
}
- virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+ virtual int OnUserPreNotice(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
{
if (!IS_LOCAL(user))
return 0;
if (target_type == TYPE_USER)
{
- userrec* u = (userrec*)dest;
+ User* u = (User*)dest;
/* Always allow a user to dcc themselves (although... why?) */
if (user == u)
// :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :VERSION
if (strncmp(text.c_str(), "\1DCC ", 5) == 0)
- {
- u->GetExt("dccallow_list", dl);
-
- if (dl && dl->size())
+ {
+ if (u->GetExt("dccallow_list", dl) && dl->size())
{
for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
if (defaultaction == "allow")
return 0;
}
- user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick, u->nick, filename.c_str());
- u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick, user->nick, user->ident, user->dhost, filename.c_str());
- u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick);
+ user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick.c_str(), u->nick.c_str(), filename.c_str());
+ u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), filename.c_str());
+ u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick.c_str(), user->nick.c_str());
return 1;
}
}
else if ((type == "CHAT") && (blockchat))
{
- user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick, u->nick);
- u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick, user->nick, user->ident, user->dhost);
- u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick);
+ user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick.c_str(), u->nick.c_str());
+ u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str());
+ u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick.c_str(), user->nick.c_str());
return 1;
}
}
{
for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
{
- userrec* u = (userrec*)(*iter);
- u->GetExt("dccallow_list", dl);
-
- if (dl)
+ User* u = (User*)(*iter);
+ if (u->GetExt("dccallow_list", dl))
{
if (dl->size())
{
- dccallowlist::iterator iter = dl->begin();
- while (iter != dl->end())
+ dccallowlist::iterator iter2 = dl->begin();
+ while (iter2 != dl->end())
{
- if ((iter->set_on + iter->length) <= ServerInstance->Time())
+ if (iter2->length != 0 && (iter2->set_on + iter2->length) <= ServerInstance->Time())
{
- u->WriteServ("997 %s %s :DCCALLOW entry for %s has expired", u->nick, u->nick, iter->nickname.c_str());
- iter = dl->erase(iter);
+ u->WriteNumeric(997, "%s %s :DCCALLOW entry for %s has expired", u->nick.c_str(), u->nick.c_str(), iter2->nickname.c_str());
+ iter2 = dl->erase(iter2);
}
else
{
- ++iter;
+ ++iter2;
}
}
}
}
}
- void RemoveNick(userrec* user)
+ void RemoveNick(User* user)
{
/* Iterate through all DCCALLOW lists and remove user */
for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
{
- userrec *u = (userrec*)(*iter);
- u->GetExt("dccallow_list", dl);
-
- if (dl)
+ User *u = (User*)(*iter);
+ if (u->GetExt("dccallow_list", dl))
{
if (dl->size())
{
if (i->nickname == user->nick)
{
- u->WriteServ("NOTICE %s :%s left the network or changed their nickname and has been removed from your DCCALLOW list", u->nick, i->nickname.c_str());
- u->WriteServ("995 %s %s :Removed %s from your DCCALLOW list", u->nick, u->nick, i->nickname.c_str());
+ u->WriteServ("NOTICE %s :%s left the network or changed their nickname and has been removed from your DCCALLOW list", u->nick.c_str(), i->nickname.c_str());
+ u->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", u->nick.c_str(), u->nick.c_str(), i->nickname.c_str());
dl->erase(i);
break;
}
}
}
- void RemoveFromUserlist(userrec *user)
+ void RemoveFromUserlist(User *user)
{
// remove user from userlist
for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
{
- userrec* u = (userrec*)(*j);
+ User* u = (User*)(*j);
if (u == user)
{
ul.erase(j);
virtual Version GetVersion()
{
- return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
}
};
MODULE_INIT(ModuleDCCAllow)
+
projects / user / henk / code / inspircd.git / blobdiff