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

Moved more stuff into right places

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3637 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2006-03-10 17:39:19 +00:00
parent 4c5acb6a26
commit 024048d646
3 changed files with 52 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/users.h
View File

@ -364,9 +364,6 @@ class WhoWasGroup
typedef std::deque<WhoWasGroup*> whowas_set;
typedef std::map<irc::string,whowas_set*> whowas_users;
/** A lightweight userrec used by WHOWAS
*/
void AddOper(userrec* user);
void DeleteOper(userrec* user);
void kill_link(userrec *user,const char* r);
@ -377,6 +374,12 @@ 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();
/* Configuration callbacks */
bool InitTypes(const char* tag);
bool InitClasses(const char* tag);
bool DoType(const char* tag, char** entries, void** values, int* types);
bool DoClass(const char* tag, char** entries, void** values, int* types);
bool DoneClassesAndTypes(const char* tag);
#endif

12
src/inspircd_io.cpp
View File

@ -567,6 +567,16 @@ void ServerConfig::Read(bool bail, userrec* user)
{DT_CHARPTR, DT_CHARPTR},
InitXLine, DoELine, DoneXLine},
{"type",
{"name", "classes", NULL},
{DT_CHARPTR, DT_CHARPTR},
InitTypes, DoType, DoneClassesAndTypes},
{"class",
{"name", "commands", NULL},
{DT_CHARPTR, DT_CHARPTR},
InitClasss, DoClass, DoneClassesAndTypes},
{NULL}
};
@ -693,8 +703,6 @@ void ServerConfig::Read(bool bail, userrec* user)
for (int n = 0; n < 12; n++)
delete[] data[n];
ReadClassesAndTypes();
// write once here, to try it out and make sure its ok
WritePID(Config->PID);

52
src/users.cpp
View File

@ -62,35 +62,53 @@ typedef opertype_t operclass_t;
opertype_t opertypes;
operclass_t operclass;
void ReadClassesAndTypes()
bool InitTypes(const char* tag)
{
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;
}
opertypes.clear();
return true;
}
bool InitClasses(const char* tag)
{
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] = strdup(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] = strdup(CommandList);
log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
}
return true;
}
bool DoType(const char* tag, char** entries, void** values, int* types)
{
char* TypeName = (char*)values[0];
char* Classes = (char*)values[1];
/*Config->ConfValue("type","name",j,TypeName,&Config->config_f);
Config->ConfValue("type","classes",j,Classes,&Config->config_f);*/
opertypes[TypeName] = strdup(Classes);
log(DEBUG,"Read oper TYPE '%s' with classes '%s'",TypeName,Classes);
return true;
}
bool DoClass(const char* tag, char** entries, void** values, int* types)
{
char* ClassName = (char*)values[0];
char* CommandList = (char*)values[1];
/*Config->ConfValue("class","name",k,ClassName,&Config->config_f);
Config->ConfValue("class","commands",k,CommandList,&Config->config_f);*/
operclass[ClassName] = strdup(CommandList);
log(DEBUG,"Read oper CLASS '%s' with commands '%s'",ClassName,CommandList);
return true;
}
bool DoneClassesAndTypes()
{
return true;
}
template<typename T> inline string ConvToStr(const T &in)