]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/configreader.cpp
Move FileExists, CleanFilename, DirValid, GetFullProgDir into class ServerConfig
[user/henk/code/inspircd.git] / src / configreader.cpp
index c8ecdaf39b21c014db4e03ddc425049779b46059..85745c63e4bef95156645c33f5b10eea48ea6c12 100644 (file)
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 #include <sstream>
 #include <iostream>
 #include <fstream>
-#include "message.h"
 #include "inspircd.h"
 #include "inspstring.h"
 #include "helperfuncs.h"
 #include "userprocess.h"
 #include "xline.h"
 
-extern InspIRCd* ServerInstance;
 extern time_t TIME;
 
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 
+using irc::sockets::BindPorts;
+
 std::vector<std::string> old_module_names, new_module_names, added_modules, removed_modules;
 
-ServerConfig::ServerConfig()
+ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
 {
        this->ClearStack();
        *TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0';
@@ -114,8 +114,8 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
                        }
                        else
                        {
-                               WriteOpers("There were errors in the configuration file:");
-                               WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag);
+                               ServerInstance->WriteOpers("There were errors in the configuration file:");
+                               ServerInstance->WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag);
                        }
                }
                return false;
@@ -136,8 +136,8 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
                        }
                        else
                        {
-                               WriteOpers("There were errors in the configuration file:");
-                               WriteOpers("You have not defined a <%s> tag, this is required.",tag);
+                               ServerInstance->WriteOpers("There were errors in the configuration file:");
+                               ServerInstance->WriteOpers("You have not defined a <%s> tag, this is required.",tag);
                        }
                }
                return false;
@@ -283,20 +283,20 @@ bool ValidateServerName(ServerConfig* conf, const char* tag, const char* value,
 
 bool ValidateNetBufferSize(ServerConfig* conf, const char* tag, const char* value, void* data)
 {
-       if ((!ServerInstance->Config->NetBufferSize) || (ServerInstance->Config->NetBufferSize > 65535) || (ServerInstance->Config->NetBufferSize < 1024))
+       if ((!conf->NetBufferSize) || (conf->NetBufferSize > 65535) || (conf->NetBufferSize < 1024))
        {
                log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240.");
-               ServerInstance->Config->NetBufferSize = 10240;
+               conf->NetBufferSize = 10240;
        }
        return true;
 }
 
 bool ValidateMaxWho(ServerConfig* conf, const char* tag, const char* value, void* data)
 {
-       if ((!ServerInstance->Config->MaxWhoResults) || (ServerInstance->Config->MaxWhoResults > 65535) || (ServerInstance->Config->MaxWhoResults < 1))
+       if ((!conf->MaxWhoResults) || (conf->MaxWhoResults > 65535) || (conf->MaxWhoResults < 1))
        {
                log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128.");
-               ServerInstance->Config->MaxWhoResults = 128;
+               conf->MaxWhoResults = 128;
        }
        return true;
 }
@@ -304,32 +304,32 @@ bool ValidateMaxWho(ServerConfig* conf, const char* tag, const char* value, void
 bool ValidateLogLevel(ServerConfig* conf, const char* tag, const char* value, void* data)
 {
        const char* dbg = (const char*)data;
-       ServerInstance->Config->LogLevel = DEFAULT;
+       conf->LogLevel = DEFAULT;
        if (!strcmp(dbg,"debug"))
        {
-               ServerInstance->Config->LogLevel = DEBUG;
-               ServerInstance->Config->debugging = 1;
+               conf->LogLevel = DEBUG;
+               conf->debugging = 1;
        }
        else if (!strcmp(dbg,"verbose"))
-               ServerInstance->Config->LogLevel = VERBOSE;
+               conf->LogLevel = VERBOSE;
        else if (!strcmp(dbg,"default"))
-               ServerInstance->Config->LogLevel = DEFAULT;
+               conf->LogLevel = DEFAULT;
        else if (!strcmp(dbg,"sparse"))
-               ServerInstance->Config->LogLevel = SPARSE;
+               conf->LogLevel = SPARSE;
        else if (!strcmp(dbg,"none"))
-               ServerInstance->Config->LogLevel = NONE;
+               conf->LogLevel = NONE;
        return true;
 }
 
 bool ValidateMotd(ServerConfig* conf, const char* tag, const char* value, void* data)
 {
-       conf->ReadFile(ServerInstance->Config->MOTD,ServerInstance->Config->motd);
+       conf->ReadFile(conf->MOTD,conf->motd);
        return true;
 }
 
 bool ValidateRules(ServerConfig* conf, const char* tag, const char* value, void* data)
 {
-       conf->ReadFile(ServerInstance->Config->RULES,ServerInstance->Config->rules);
+       conf->ReadFile(conf->RULES,conf->rules);
        return true;
 }
 
@@ -338,7 +338,7 @@ bool ValidateRules(ServerConfig* conf, const char* tag, const char* value, void*
 bool InitConnect(ServerConfig* conf, const char* tag)
 {
        log(DEFAULT,"Reading connect classes...");
-       ServerInstance->Config->Classes.clear();
+       conf->Classes.clear();
        return true;
 }
 
@@ -392,13 +392,13 @@ bool DoConnect(ServerConfig* conf, const char* tag, char** entries, void** value
                        c.registration_timeout = 90;
                if (c.pingtime == 0)
                        c.pingtime = 120;
-               ServerInstance->Config->Classes.push_back(c);
+               conf->Classes.push_back(c);
        }
        else
        {
                c.host = deny;
                c.type = CC_DENY;
-               ServerInstance->Config->Classes.push_back(c);
+               conf->Classes.push_back(c);
                log(DEBUG,"Read connect class type DENY, host=%s",deny);
        }
 
@@ -417,7 +417,7 @@ bool DoneConnect(ServerConfig* conf, const char* tag)
  */
 bool InitULine(ServerConfig* conf, const char* tag)
 {
-       ServerInstance->Config->ulines.clear();
+       conf->ulines.clear();
        return true;
 }
 
@@ -427,7 +427,7 @@ bool DoULine(ServerConfig* conf, const char* tag, char** entries, void** values,
 {
        char* server = (char*)values[0];
        log(DEBUG,"Read ULINE '%s'",server);
-       ServerInstance->Config->ulines.push_back(server);
+       conf->ulines.push_back(server);
        return true;
 }
 
@@ -446,7 +446,7 @@ bool InitModule(ServerConfig* conf, const char* tag)
        new_module_names.clear();
        added_modules.clear();
        removed_modules.clear();
-       for (std::vector<std::string>::iterator t = ServerInstance->Config->module_names.begin(); t != ServerInstance->Config->module_names.end(); t++)
+       for (std::vector<std::string>::iterator t = conf->module_names.begin(); t != conf->module_names.end(); t++)
        {
                old_module_names.push_back(*t);
        }
@@ -501,7 +501,7 @@ bool DoneModule(ServerConfig* conf, const char* tag)
  */
 bool InitMaxBans(ServerConfig* conf, const char* tag)
 {
-       ServerInstance->Config->maxbans.clear();
+       conf->maxbans.clear();
        return true;
 }
 
@@ -511,7 +511,7 @@ bool DoMaxBans(ServerConfig* conf, const char* tag, char** entries, void** value
 {
        char* channel = (char*)values[0];
        int* limit = (int*)values[1];
-       ServerInstance->Config->maxbans[channel] = *limit;
+       conf->maxbans[channel] = *limit;
        return true;
 }
 
@@ -692,11 +692,11 @@ void ServerConfig::Read(bool bail, userrec* user)
                        }
                        else
                        {
-                               WriteOpers("There were errors in the configuration file:");
+                               ServerInstance->WriteOpers("There were errors in the configuration file:");
                                
                                while(start < errors.length())
                                {
-                                       WriteOpers(errors.substr(start, 360).c_str());
+                                       ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
                                        start += 360;
                                }
                        }
@@ -807,7 +807,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                        {
                                if (ServerInstance->UnloadModule(removing->c_str()))
                                {
-                                       WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
+                                       ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
 
                                        if (user)
                                                user->WriteServ("973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
@@ -826,7 +826,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                {
                        if (ServerInstance->LoadModule(adding->c_str()))
                        {
-                               WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
+                               ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
 
                                if (user)
                                        user->WriteServ("975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
@@ -1291,35 +1291,145 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in
  */
 bool ServerConfig::ReadFile(file_cache &F, const char* fname)
 {
-        FILE* file;
-        char linebuf[MAXBUF];
-
-        F.clear();
-        file =  fopen(fname,"r");
-
-        if (file)
-        {
-                while (!feof(file))
-                {
-                        fgets(linebuf,sizeof(linebuf),file);
-                        linebuf[strlen(linebuf)-1]='\0';
-
-                        if (!*linebuf)
-                        {
-                                strcpy(linebuf," ");
-                        }
-
-                        if (!feof(file))
-                        {
-                                F.push_back(linebuf);
-                        }
-                }
-
-                fclose(file);
-        }
-        else
+       FILE* file;
+       char linebuf[MAXBUF];
+
+       F.clear();
+       file =  fopen(fname,"r");
+
+       if (file)
+       {
+               while (!feof(file))
+               {
+                       fgets(linebuf,sizeof(linebuf),file);
+                       linebuf[strlen(linebuf)-1]='\0';
+
+                       if (!*linebuf)
+                       {
+                               strcpy(linebuf," ");
+                       }
+
+                       if (!feof(file))
+                       {
+                               F.push_back(linebuf);
+                       }
+               }
+
+               fclose(file);
+       }
+       else
                return false;
 
        return true;
 }
 
+bool ServerConfig::FileExists(const char* file)
+{
+       FILE *input;
+       if ((input = fopen (file, "r")) == NULL)
+       {
+               return false;
+       }
+       else
+       {
+               fclose(input);
+               return true;
+       }
+}
+
+char* ServerConfig::CleanFilename(char* name)
+{
+       char* p = name + strlen(name);
+       while ((p != name) && (*p != '/')) p--;
+       return (p != name ? ++p : p);
+}
+
+
+bool ServerConfig::DirValid(const char* dirandfile)
+{
+       char work[MAXBUF];
+       char buffer[MAXBUF];
+       char otherdir[MAXBUF];
+       int p;
+
+       strlcpy(work, dirandfile, MAXBUF);
+       p = strlen(work);
+
+       // we just want the dir
+       while (*work)
+       {
+               if (work[p] == '/')
+               {
+                       work[p] = '\0';
+                       break;
+               }
+
+               work[p--] = '\0';
+       }
+
+       // Get the current working directory
+       if (getcwd(buffer, MAXBUF ) == NULL )
+               return false;
+
+       chdir(work);
+
+       if (getcwd(otherdir, MAXBUF ) == NULL )
+               return false;
+
+       chdir(buffer);
+
+       size_t t = strlen(work);
+
+       if (strlen(otherdir) >= t)
+       {
+               otherdir[t] = '\0';
+
+               if (!strcmp(otherdir,work))
+               {
+                       return true;
+               }
+
+               return false;
+       }
+       else
+       {
+               return false;
+       }
+}
+
+std::string ServerConfig::GetFullProgDir(char** argv, int argc)
+{
+       char work[MAXBUF];
+       char buffer[MAXBUF];
+       char otherdir[MAXBUF];
+       int p;
+
+       strlcpy(work,argv[0],MAXBUF);
+       p = strlen(work);
+
+       // we just want the dir
+       while (*work)
+       {
+               if (work[p] == '/')
+               {
+                       work[p] = '\0';
+                       break;
+               }
+
+               work[p--] = '\0';
+       }
+
+       // Get the current working directory
+       if (getcwd(buffer, MAXBUF) == NULL)
+               return "";
+
+       chdir(work);
+
+       if (getcwd(otherdir, MAXBUF) == NULL)
+               return "";
+
+       chdir(buffer);
+       return otherdir;
+}
+
+