ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-11 11:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

*UNTESTED* speeding up HasPermission by factor of hundreds, avoid using EnumConf and ConfValue outside of rehash *AT ALL*

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3430 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2006-03-02 17:19:49 +00:00
parent d1212c6071
commit 4927edc5fb
3 changed files with 55 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/users.h
View File

@ -363,5 +363,6 @@ void AddClient(int socket, int port, bool iscached, in_addr ip4);
void FullConnectUser(userrec* user, CullList* Goners);
userrec* ReHashNick(char* Old, char* New);
void force_nickchange(userrec* user,const char* newnick);
void ReadClassesAndTypes();
#endif

1
src/inspircd_io.cpp
View File

@ -417,6 +417,7 @@ void ServerConfig::Read(bool bail, userrec* user)
Config->ulines.push_back(ServName);
}
}
ReadClassesAndTypes();
log(DEFAULT,"Reading K lines,Q lines and Z lines from config...");
read_xline_defaults();
log(DEFAULT,"Applying K lines, Q lines and Z lines...");

74
src/users.cpp
View File

@ -54,6 +54,43 @@ extern std::vector<userrec*> local_users;
std::vector<userrec*> all_opers;
typedef std::map<irc::string,char*> opertype_t;
typedef opertype_t operclass_t;
opertype_t opertypes;
operclass_t operclass;
void ReadClassesAndTypes()
{
char TypeName[MAXBUF],Classes[MAXBUF],ClassName[MAXBUF],CommandList[MAXBUF];
for (opertype_t::iterator n = opertypes.begin(); n != opertypes.end(); n++)
{
if (n->second)
delete[] n->second;
}
for (operclass_t::iterator n = operclass.begin(); n != operclass.end(); n++)
{
if (n->second)
delete[] n->second;
}
opertypes.clear();
operclass.clear();
for (int j =0; j < Config->ConfValueEnum("type",&Config->config_f); j++)
{
Config->ConfValue("type","name",j,TypeName,&Config->config_f);
Config->ConfValue("type","classes",j,Classes,&Config->config_f);
opertypes[TypeName] = sstrdup(Classes);
log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
}
for (int k =0; k < Config->ConfValueEnum("class",&Config->config_f); k++)
{
Config->ConfValue("class","name",k,ClassName,&Config->config_f);
Config->ConfValue("class","commands",k,CommandList,&Config->config_f);
operclass[ClassName] = sstrdup(CommandList);
log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
}
}
template<typename T> inline string ConvToStr(const T &in)
{
stringstream tmp;
@ -196,10 +233,11 @@ void userrec::RemoveInvite(irc::string &channel)
bool userrec::HasPermission(std::string &command)
{
char TypeName[MAXBUF],Classes[MAXBUF],ClassName[MAXBUF],CommandList[MAXBUF];
char* CommandList;
char* mycmd;
char* savept;
char* savept2;
char* Classes;
// users on remote servers can completely bypass
// all permissions based checks.
@ -211,34 +249,28 @@ bool userrec::HasPermission(std::string &command)
// are they even an oper at all?
if (*this->oper)
{
for (int j =0; j < Config->ConfValueEnum("type",&Config->config_f); j++)
opertype_t::iterator iter_opertype = opertypes.find(this->oper);
if (iter_opertype != opertypes.end())
{
Config->ConfValue("type","name",j,TypeName,&Config->config_f);
if (!strcmp(TypeName,this->oper))
Classes = iter_opertype->second;
char* myclass = strtok_r(Classes," ",&savept);
while (myclass)
{
Config->ConfValue("type","classes",j,Classes,&Config->config_f);
char* myclass = strtok_r(Classes," ",&savept);
while (myclass)
operclass_t::iterator iter_operclass = operclass.find(myclass);
if (iter_operclass != operclass.end())
{
for (int k =0; k < Config->ConfValueEnum("class",&Config->config_f); k++)
char* CommandList = iter_operclass->second;
mycmd = strtok_r(CommandList," ",&savept2);
while (mycmd)
{
Config->ConfValue("class","name",k,ClassName,&Config->config_f);
if (!strcmp(ClassName,myclass))
if ((!strcasecmp(mycmd,command.c_str())) || (*mycmd == '*'))
{
Config->ConfValue("class","commands",k,CommandList,&Config->config_f);
mycmd = strtok_r(CommandList," ",&savept2);
while (mycmd)
{
if ((!strcasecmp(mycmd,command.c_str())) || (*mycmd == '*'))
{
return true;
}
mycmd = strtok_r(NULL," ",&savept2);
}
return true;
}
mycmd = strtok_r(NULL," ",&savept2);
}
myclass = strtok_r(NULL," ",&savept);
}
myclass = strtok_r(NULL," ",&savept);
}
}
}