craq--

[user/henk/code/inspircd.git] / src / commands.cpp

diff --git a/src/commands.cpp b/src/commands.cpp
index 9c16a58ad6178c532d396bc8261525d1e77cbd6c..5db288ffaa4745f9109f2216e19ad09f1fe64c5f 100644 (file)
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -73,11 +73,6 @@ extern int WHOWAS_STALE;
 extern int WHOWAS_MAX;
 extern time_t startup_time;
 extern time_t TIME;
-extern std::vector<std::string> module_names;
-extern int boundPortCount;
-extern int portCount;
-extern int ports[MAXSOCKS];
-extern ClassVector Classes;
 
 const long duration_m = 60;
 const long duration_h = duration_m * 60;
@@ -1089,7 +1084,7 @@ void handle_rehash(char **parameters, int pcnt, userrec *user)
        else
        {
                WriteOpers("%s is rehashing config file %s",user->nick,CleanFilename(CONFIG_FILE));
-               ReadConfig(false,user);
+               Config->Read(false,user);
        }
        FOREACH_MOD OnRehash(parameter);
 }
@@ -1276,7 +1271,7 @@ void handle_trace(char **parameters, int pcnt, userrec *user)
 
 void handle_modules(char **parameters, int pcnt, userrec *user)
 {
-       for (unsigned int i = 0; i < module_names.size(); i++)
+       for (unsigned int i = 0; i < Config->module_names.size(); i++)
        {
                Version V = modules[i]->GetVersion();
                char modulename[MAXBUF];
@@ -1292,7 +1287,7 @@ void handle_modules(char **parameters, int pcnt, userrec *user)
                        strlcat(flagstate,", service provider",MAXBUF);
                if (!flagstate[0])
                        strcpy(flagstate,"  <no flags>");
-               strlcpy(modulename,module_names[i].c_str(),256);
+               strlcpy(modulename,Config->module_names[i].c_str(),256);
                if (strchr(user->modes,'o'))
                {
                        WriteServ(user->fd,"900 %s :0x%08lx %d.%d.%d.%d %s (%s)",user->nick,modules[i],V.Major,V.Minor,V.Revision,V.Build,CleanFilename(modulename),flagstate+2);
@@ -1328,7 +1323,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
        if (*parameters[0] == 'i')
        {
                int idx = 0;
-               for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
+               for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
                {
                        WriteServ(user->fd,"215 %s I * * * %d %d %s *",user->nick,MAXCLIENTS,idx,Config->ServerName);
                        idx++;
@@ -1338,7 +1333,7 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
        if (*parameters[0] == 'y')
        {
                int idx = 0;
-               for (ClassVector::iterator i = Classes.begin(); i != Classes.end(); i++)
+               for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
                {
                        WriteServ(user->fd,"218 %s Y %d %d 0 %d %d",user->nick,idx,120,i->flood,i->registration_timeout);
                        idx++;
@@ -1348,9 +1343,9 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
        if (*parameters[0] == 'U')
        {
                char ulined[MAXBUF];
-               for (int i = 0; i < ConfValueEnum("uline",&Config->config_f); i++)
+               for (int i = 0; i < Config->ConfValueEnum("uline",&Config->config_f); i++)
                {
-                       ConfValue("uline","server",i,ulined,&Config->config_f);
+                       Config->ConfValue("uline","server",i,ulined,&Config->config_f);
                        WriteServ(user->fd,"248 %s U %s",user->nick,ulined);
                }
        }
@@ -1446,14 +1441,14 @@ void handle_stats(char **parameters, int pcnt, userrec *user)
        /* stats o */
        if (*parameters[0] == 'o')
        {
-               for (int i = 0; i < ConfValueEnum("oper",&Config->config_f); i++)
+               for (int i = 0; i < Config->ConfValueEnum("oper",&Config->config_f); i++)
                {
                        char LoginName[MAXBUF];
                        char HostName[MAXBUF];
                        char OperType[MAXBUF];
-                       ConfValue("oper","name",i,LoginName,&Config->config_f);
-                       ConfValue("oper","host",i,HostName,&Config->config_f);
-                       ConfValue("oper","type",i,OperType,&Config->config_f);
+                       Config->ConfValue("oper","name",i,LoginName,&Config->config_f);
+                       Config->ConfValue("oper","host",i,HostName,&Config->config_f);
+                       Config->ConfValue("oper","type",i,OperType,&Config->config_f);
                        WriteServ(user->fd,"243 %s O %s * %s %s 0",user->nick,HostName,LoginName,OperType);
                }
        }
@@ -1534,9 +1529,9 @@ bool is_uline(const char* server)
        if (!(*server))
                return true;
 
-       for (int i = 0; i < ConfValueEnum("uline",&Config->config_f); i++)
+       for (int i = 0; i < Config->ConfValueEnum("uline",&Config->config_f); i++)
        {
-               ConfValue("uline","server",i,ServName,&Config->config_f);
+               Config->ConfValue("uline","server",i,ServName,&Config->config_f);
                if (!strcasecmp(server,ServName))
                {
                        return true;
@@ -1571,23 +1566,23 @@ void handle_oper(char **parameters, int pcnt, userrec *user)
 
        snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host);
 
-       for (int i = 0; i < ConfValueEnum("oper",&Config->config_f); i++)
+       for (int i = 0; i < Config->ConfValueEnum("oper",&Config->config_f); i++)
        {
-               ConfValue("oper","name",i,LoginName,&Config->config_f);
-               ConfValue("oper","password",i,Password,&Config->config_f);
-               ConfValue("oper","type",i,OperType,&Config->config_f);
-               ConfValue("oper","host",i,HostName,&Config->config_f);
+               Config->ConfValue("oper","name",i,LoginName,&Config->config_f);
+               Config->ConfValue("oper","password",i,Password,&Config->config_f);
+               Config->ConfValue("oper","type",i,OperType,&Config->config_f);
+               Config->ConfValue("oper","host",i,HostName,&Config->config_f);
                if ((!strcmp(LoginName,parameters[0])) && (!operstrcmp(Password,parameters[1])) && (match(TheHost,HostName)))
                {
                        fail2 = true;
-                       for (j =0; j < ConfValueEnum("type",&Config->config_f); j++)
+                       for (j =0; j < Config->ConfValueEnum("type",&Config->config_f); j++)
                        {
-                               ConfValue("type","name",j,TypeName,&Config->config_f);
+                               Config->ConfValue("type","name",j,TypeName,&Config->config_f);
 
                                if (!strcmp(TypeName,OperType))
                                {
                                        /* found this oper's opertype */
-                                       ConfValue("type","host",j,HostName,&Config->config_f);
+                                       Config->ConfValue("type","host",j,HostName,&Config->config_f);
                                        if (*HostName)
                                                ChangeDisplayedHost(user,HostName);
                                        strlcpy(user->oper,TypeName,NICKMAX);
@@ -1818,8 +1813,8 @@ bool host_matches_everyone(std::string mask, userrec* user)
        char insanemasks[MAXBUF];
        char buffer[MAXBUF];
        char itrigger[MAXBUF];
-       ConfValue("insane","hostmasks",0,insanemasks,&Config->config_f);
-       ConfValue("insane","trigger",0,itrigger,&Config->config_f);
+       Config->ConfValue("insane","hostmasks",0,insanemasks,&Config->config_f);
+       Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f);
        if (*itrigger == 0)
                strlcpy(itrigger,"95.5",MAXBUF);
        if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1'))
@@ -1846,8 +1841,8 @@ bool ip_matches_everyone(std::string ip, userrec* user)
 {
        char insanemasks[MAXBUF];
        char itrigger[MAXBUF];
-       ConfValue("insane","ipmasks",0,insanemasks,&Config->config_f);
-       ConfValue("insane","trigger",0,itrigger,&Config->config_f);
+       Config->ConfValue("insane","ipmasks",0,insanemasks,&Config->config_f);
+       Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f);
        if (*itrigger == 0)
                strlcpy(itrigger,"95.5",MAXBUF);
        if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1'))
@@ -1871,8 +1866,8 @@ bool nick_matches_everyone(std::string nick, userrec* user)
 {
        char insanemasks[MAXBUF];
        char itrigger[MAXBUF];
-       ConfValue("insane","nickmasks",0,insanemasks,&Config->config_f);
-       ConfValue("insane","trigger",0,itrigger,&Config->config_f);
+       Config->ConfValue("insane","nickmasks",0,insanemasks,&Config->config_f);
+       Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f);
        if (*itrigger == 0)
                strlcpy(itrigger,"95.5",MAXBUF);
        if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1'))