X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=dea6a7a7d9bee3df3554988c0df8d5535fcc682a;hb=8509727e16f1d9ce6c9719c8d62c7715d3699858;hp=23c3fd9251243d31d3e3af5c2d0644797446e2a8;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 23c3fd925..dea6a7a7d 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -478,7 +478,13 @@ bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &dat
 
 bool ValidateSID(ServerConfig* conf, const char*, const char*, ValueItem &data)
 {
-//	std::string  sid = data.GetString();
+	const char *sid = data.GetString();
+
+	if (*sid && !conf->GetInstance()->IsSID(sid))
+	{
+		throw CoreException(std::string(sid) + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
+	}
+
 	return true;
 }
 
@@ -569,6 +575,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 	const char* parent = values[13].GetString();
 	int maxchans = values[14].GetInteger();
 	unsigned long limit = values[15].GetInteger();
+	const char* hashtype = values[16].GetString();
 
 	/*
 	 * duplicates check: Now we don't delete all connect classes on rehash, we need to ensure we don't add dupes.
@@ -613,7 +620,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
 	{
 		if (*allow)
 		{
-			ConnectClass* c = new ConnectClass(name, timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans);
+			ConnectClass* c = new ConnectClass(name, timeout, flood, allow, pingfreq, password, hashtype, threshold, sendq, recvq, localmax, globalmax, maxchans);
 			c->limit = limit;
 			c->SetPort(port);
 			conf->Classes.push_back(c);
@@ -770,10 +777,10 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail,
 		}
 		else
 		{
-			ServerInstance->WriteOpers("There were errors in the configuration file:");
+			ServerInstance->SNO->WriteToSnoMask('A', "There were errors in the configuration file:");
 			while (start < errors.length())
 			{
-				ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
+				ServerInstance->SNO->WriteToSnoMask('A', errors.substr(start, 360).c_str());
 				start += 360;
 			}
 		}
@@ -811,6 +818,7 @@ void ServerConfig::Read(bool bail, User* user, int pass)
 		{"files",	"rules",	"",			new ValueContainerChar (this->rules),			DT_CHARPTR,  ValidateRules},
 		{"power",	"diepass",	"",			new ValueContainerChar (this->diepass),			DT_CHARPTR,  ValidateNotEmpty},
 		{"power",	"pause",	"",			new ValueContainerInt  (&this->DieDelay),		DT_INTEGER,  NoValidation},
+		{"power",	"hash",		"",			new ValueContainerChar (this->powerhash),		DT_CHARPTR,  NoValidation},
 		{"power",	"restartpass",	"",			new ValueContainerChar (this->restartpass),		DT_CHARPTR,  ValidateNotEmpty},
 		{"options",	"prefixquit",	"",			new ValueContainerChar (this->PrefixQuit),		DT_CHARPTR,  NoValidation},
 		{"options",	"suffixquit",	"",			new ValueContainerChar (this->SuffixQuit),		DT_CHARPTR,  NoValidation},
@@ -822,6 +830,7 @@ void ServerConfig::Read(bool bail, User* user, int pass)
 		{"options",	"netbuffersize","10240",		new ValueContainerInt  (&this->NetBufferSize),		DT_INTEGER,  ValidateNetBufferSize},
 		{"options",	"maxwho",	"128",			new ValueContainerInt  (&this->MaxWhoResults),		DT_INTEGER,  ValidateMaxWho},
 		{"options",	"allowhalfop",	"0",			new ValueContainerBool (&this->AllowHalfop),		DT_BOOLEAN,  NoValidation},
+		{"options",	"allowdevoiceself",	"0",			new ValueContainerBool (&this->AllowDevoiceSelf),		DT_BOOLEAN,  NoValidation},
 		{"dns",		"server",	"",			new ValueContainerChar (this->DNSServer),		DT_IPADDRESS,DNSServerValidator},
 		{"dns",		"timeout",	"5",			new ValueContainerInt  (&this->dns_timeout),		DT_INTEGER,  NoValidation},
 		{"options",	"moduledir",	MOD_PATH,		new ValueContainerChar (this->ModPath),			DT_CHARPTR,  NoValidation},
@@ -861,17 +870,17 @@ void ServerConfig::Read(bool bail, User* user, int pass)
 		{"connect",
 				{"allow",	"deny",		"password",	"timeout",	"pingfreq",	"flood",
 				"threshold",	"sendq",	"recvq",	"localmax",	"globalmax",	"port",
-				"name",		"parent",	"maxchans",     "limit",
+				"name",		"parent",	"maxchans",     "limit",	"hash",
 				NULL},
 				{"",		"",		"",		"",		"120",		"",
 				 "",		"",		"",		"3",		"3",		"0",
-				 "",		"",		"0",	    "0",
+				 "",		"",		"0",	    "0",	"",
 				 NULL},
 				{DT_IPADDRESS|DT_ALLOW_WILD,
 						DT_IPADDRESS|DT_ALLOW_WILD,
 								DT_CHARPTR,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,
 				DT_INTEGER,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,	DT_INTEGER,
-				DT_NOSPACES,	DT_NOSPACES,	DT_INTEGER,     DT_INTEGER},
+				DT_NOSPACES,	DT_NOSPACES,	DT_INTEGER,     DT_INTEGER,	DT_CHARPTR},
 				InitConnect, DoConnect, DoneConnect},
 
 		{"uline",
@@ -1206,7 +1215,7 @@ void ServerConfig::Read(bool bail, User* user, int pass)
 		{
 			if (ServerInstance->Modules->Unload(removing->c_str()))
 			{
-				ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
+				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());
 				rem++;
@@ -1232,7 +1241,7 @@ void ServerConfig::Read(bool bail, User* user, int pass)
 
 			if (ServerInstance->Modules->Load(adding->c_str()))
 			{
-				ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
+				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());
 
@@ -1257,7 +1266,7 @@ void ServerConfig::Read(bool bail, User* user, int pass)
 	if (user)
 		user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick);
 	else
-		ServerInstance->WriteOpers("*** Successfully rehashed server.");
+		ServerInstance->SNO->WriteToSnoMask('A', "Successfully rehashed server.");
 }
 
 /* XXX: This can and will block! */
@@ -2290,7 +2299,7 @@ bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &val
 // this should probably be moved to configreader, but atm it relies on CheckELines above.
 bool DoneELine(ServerConfig* conf, const char* tag)
 {
-	for (std::vector<User*>::const_iterator u2 = conf->GetInstance()->local_users.begin(); u2 != conf->GetInstance()->local_users.end(); u2++)
+	for (std::vector<User*>::const_iterator u2 = conf->GetInstance()->Users->local_users.begin(); u2 != conf->GetInstance()->Users->local_users.end(); u2++)
 	{
 		User* u = (User*)(*u2);
 		u->exempt = false;