Port bindings for gnutls now bind via ip:port, rather than on all ports for that...

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 45574a5319bcf9d3d470e5d0af14416ccd1ef91a..83b7e14d9bfbe34789da418f14e1f49f87759299 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -157,7 +157,7 @@ void ServerConfig::Update005()
 void ServerConfig::Send005(User* user)
 {
        for (std::vector<std::string>::iterator line = ServerInstance->Config->isupport.begin(); line != ServerInstance->Config->isupport.end(); line++)
-               user->WriteServ("005 %s %s", user->nick, line->c_str());
+               user->WriteNumeric(005, "%s %s", user->nick, line->c_str());
 }
 
 bool ServerConfig::CheckOnce(const char* tag)
@@ -925,9 +925,9 @@ void ServerConfig::Read(bool bail, User* user)
                                InitTypes, DoType, DoneClassesAndTypes},
 
                {"class",
-                               {"name",        "commands",     NULL},
-                               {"",            "",             NULL},
-                               {DT_NOSPACES,   DT_CHARPTR},
+                               {"name",        "commands",     "usermodes",    "chanmodes",    NULL},
+                               {"",            "",             "",             "",             NULL},
+                               {DT_NOSPACES,   DT_CHARPTR,     DT_CHARPTR,     DT_CHARPTR},
                                InitClasses, DoClass, DoneClassesAndTypes},
        
                {NULL,
@@ -1213,14 +1213,14 @@ void ServerConfig::Read(bool bail, User* user)
                                        ServerInstance->SNO->WriteToSnoMask('A', "*** 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());
+                                               user->WriteNumeric(973, "%s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
 
                                        rem++;
                                }
                                else
                                {
                                        if (user)
-                                               user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError().c_str());
+                                               user->WriteNumeric(972, "%s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError().c_str());
                                }
                        }
                }
@@ -1234,14 +1234,14 @@ void ServerConfig::Read(bool bail, User* user)
                                        ServerInstance->SNO->WriteToSnoMask('A', "*** 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());
+                                               user->WriteNumeric(975, "%s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
 
                                        add++;
                                }
                                else
                                {
                                        if (user)
-                                               user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError().c_str());
+                                               user->WriteNumeric(974, "%s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError().c_str());
                                }
                        }
                }
@@ -2105,8 +2105,12 @@ bool InitClasses(ServerConfig* conf, const char*)
        {
                for (operclass_t::iterator n = conf->operclass.begin(); n != conf->operclass.end(); n++)
                {
-                       if (n->second)
-                               delete[] n->second;
+                       if (n->second.commandlist)
+                               delete[] n->second.commandlist;
+                       if (n->second.cmodelist)
+                               delete[] n->second.cmodelist;
+                       if (n->second.umodelist)
+                               delete[] n->second.umodelist;
                }
        }
 
@@ -2129,12 +2133,31 @@ bool DoType(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 /*
  * XXX should this be in a class? -- w00t
  */
-bool DoClass(ServerConfig* conf, const char*, char**, ValueList &values, int*)
+bool DoClass(ServerConfig* conf, const char* tag, char**, ValueList &values, int*)
 {
        const char* ClassName = values[0].GetString();
        const char* CommandList = values[1].GetString();
+       const char* UModeList = values[2].GetString();
+       const char* CModeList = values[3].GetString();
+
+       for (const char* c = UModeList; *c; ++c)
+       {
+               if ((*c < 'A' || *c > 'z') && *c != '*')
+               {
+                       throw CoreException("Character " + std::string(1, *c) + " is not a valid mode in <class:usermodes>");
+               }
+       }
+       for (const char* c = CModeList; *c; ++c)
+       {
+               if ((*c < 'A' || *c > 'z') && *c != '*')
+               {
+                       throw CoreException("Character " + std::string(1, *c) + " is not a valid mode in <class:chanmodes>");
+               }
+       }
 
-       conf->operclass[ClassName] = strnewdup(CommandList);
+       conf->operclass[ClassName].commandlist = strnewdup(CommandList);
+       conf->operclass[ClassName].umodelist = strnewdup(UModeList);
+       conf->operclass[ClassName].cmodelist = strnewdup(CModeList);
        return true;
 }