Currently crashes with multiple layers of include. don't use this yet

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8589 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 75 insertions, 30 deletions

diff --git a/include/configreader.h b/include/configreader.h
index ac9d0273a..b561a40fd 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -232,11 +232,11 @@ class CoreExport ServerConfig : public Extensible
 	 * configutation, appending errors to errorstream
 	 * and setting error if an error has occured.
 	 */
-	bool ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream, int pass);
+	bool ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only);
   
 	/** Process an include directive
 	 */
-	bool DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream, int pass);
+	bool DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only);
 
 	/** Check that there is only one of each configuration item
 	 */
@@ -244,8 +244,14 @@ class CoreExport ServerConfig : public Extensible
 
  public:
 
+	std::ostringstream errstr;
+
+	ConfigDataHash newconfig;
+
 	std::map<std::string, std::istream*> IncludedFiles;
 
+	std::map<std::string, bool> CompletedFiles;
+
 	size_t TotalDownloaded;
 	size_t FileErrors;
 
@@ -654,12 +660,12 @@ class CoreExport ServerConfig : public Extensible
 	/** Load 'filename' into 'target', with the new config parser everything is parsed into
 	 * tag/key/value at load-time rather than at read-value time.
 	 */
-	bool LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream, int pass);
+	bool LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream, int pass, std::istream* scan_for_includs_only);
 
 	/** Load 'filename' into 'target', with the new config parser everything is parsed into
 	 * tag/key/value at load-time rather than at read-value time.
 	 */
-	bool LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream, int pass);
+	bool LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream, int pass, std::istream* scan_for_includs_only = NULL);
 	
 	/* Both these return true if the value existed or false otherwise */
 	
diff --git a/src/configreader.cpp b/src/configreader.cpp
index dd0cd226d..993183b41 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -788,7 +788,7 @@ void ServerConfig::Read(bool bail, User* user, int pass)
 	static char hidemodes[MAXBUF];	/* Modes to not allow listing from users below halfop */
 	static char exemptchanops[MAXBUF];	/* Exempt channel ops from these modes */
 	static char announceinvites[MAXBUF];	/* options:announceinvites setting */
-	std::ostringstream errstr;	/* String stream containing the error output */
+	errstr.clear();
 
 	/* These tags MUST occur and must ONLY occur once in the config file */
 	static char* Once[] = { "server", "admin", "files", "power", "options", NULL };
@@ -933,7 +933,7 @@ void ServerConfig::Read(bool bail, User* user, int pass)
 	/* Load and parse the config file, if there are any errors then explode */
 
 	/* Make a copy here so if it fails then we can carry on running with an unaffected config */
-	ConfigDataHash newconfig;
+	newconfig.clear();
 
 	if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr, pass))
 	{
@@ -1272,6 +1272,11 @@ void ServerConfig::Complete(const std::string &filename, bool error)
 			x->second = NULL;
 			FileErrors++;
 		}
+
+		/* We should parse the new file here and check it for another level of include files */
+		CompletedFiles[filename] = true;
+		LoadConf(this->newconfig, filename, errstr, 0, x->second);
+		StartDownloads();
 	}
 
 	return;
@@ -1288,11 +1293,15 @@ void ServerConfig::StartDownloads()
 	/* Reads all local files into the IncludedFiles map, then initiates sockets for the remote ones */
 	for (std::map<std::string, std::istream*>::iterator x = IncludedFiles.begin(); x != IncludedFiles.end(); ++x)
 	{
+		if (CompletedFiles.find(x->first) != CompletedFiles.end())
+		{
+			ServerInstance->Log(DEBUG, "Already fetched: %s", x->first.c_str());
+			continue;
+		}
+
 		std::string file = x->first;
-		ServerInstance->Log(DEBUG,"Begin download for %s", file.c_str());
 		if ((file[0] == '/') || (file.substr(0, 7) == "file://"))
 		{
-			ServerInstance->Log(DEBUG,"Core-handled schema for %s", file.c_str());
 			/* For file:// schema files, we use std::ifstream which is a derivative of std::istream.
 			 * For all other file schemas, we use a std::stringstream.
 			 */
@@ -1311,7 +1320,6 @@ void ServerConfig::StartDownloads()
 				x->second = NULL;
 				FileErrors++;
 			}
-
 			TotalDownloaded++;
 		}
 		else
@@ -1331,10 +1339,13 @@ void ServerConfig::StartDownloads()
 				x->second = NULL;
 			}
 		}
+
+		CompletedFiles[file] = true;
+		ServerInstance->Log(DEBUG, "Flagging as already fetched: %s", file.c_str());
 	}
 }
 
-bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream, int pass)
+bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream, int pass, std::istream *scan_for_includes_only)
 {
 	std::string line;
 	std::istream* conf = NULL;
@@ -1350,13 +1361,23 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
 	in_quote = false;
 	in_comment = false;
 
+	if (scan_for_includes_only)
+	{
+		ServerInstance->Log(DEBUG,"scan_for_includes_only set");
+		conf = scan_for_includes_only;
+	}
+
 	if (std::string(filename) == CONFIG_FILE)
 	{
-		conf = new std::ifstream(filename);
-		if (conf->fail())
+		if (!scan_for_includes_only)
 		{
-			errorstream << "File " << filename << " could not be opened." << std::endl;
-			return false;
+			conf = new std::ifstream(filename);
+			if (conf->fail())
+			{
+				errorstream << "File " << filename << " could not be opened." << std::endl;
+				return false;
+			}
+			CompletedFiles[filename] = true;
 		}
 	}
 	else
@@ -1366,10 +1387,13 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
 		{
 			if (pass == 0)
 			{
-				ServerInstance->Log(DEBUG,"Push include file %s onto map", filename);
-				/* First pass, we insert the file into a map, and just return true */
-				IncludedFiles.insert(std::make_pair(filename,new std::stringstream));
-				return true;
+				if (CompletedFiles.find(filename) == CompletedFiles.end())
+				{
+					ServerInstance->Log(DEBUG,"Push include file %s onto map", filename);
+					/* First pass, we insert the file into a map, and just return true */
+					IncludedFiles.insert(std::make_pair(filename,new std::stringstream));
+					return true;
+				}
 			}
 			else
 			{
@@ -1381,16 +1405,21 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
 		}
 		else
 		{
-			if (x->second)
-				conf = IncludedFiles.find(filename)->second;
-			else
+			if (!scan_for_includes_only)
 			{
-				errorstream << "File " << filename << " could not be opened." << std::endl;
-				return false;
+				if (x->second)
+					conf = IncludedFiles.find(filename)->second;
+				else
+				{
+					errorstream << "File " << filename << " could not be opened." << std::endl;
+					return false;
+				}
 			}
 		}
 	}
 
+	ServerInstance->Log(DEBUG,"Start to read conf %s %08lx", filename, conf);
+
 	/* Start reading characters... */
 	while (conf->get(ch))
 	{
@@ -1537,7 +1566,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
 					 * LoadConf() and load the included config into the same ConfigDataHash
 					 */
 
-					if (!this->ParseLine(target, line, linenumber, errorstream, pass))
+					if (!this->ParseLine(target, line, linenumber, errorstream, pass, scan_for_includes_only))
 					{
 						delete conf;
 						return false;
@@ -1566,12 +1595,12 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
 	return true;
 }
 
-bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream, int pass)
+bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream, int pass, std::istream* scan_for_includs_only)
 {
-	return this->LoadConf(target, filename.c_str(), errorstream, pass);
+	return this->LoadConf(target, filename.c_str(), errorstream, pass, scan_for_includs_only);
 }
 
-bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream, int pass)
+bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only)
 {
 	std::string tagname;
 	std::string current_key;
@@ -1661,7 +1690,8 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &li
 					else
 					{
 						/* Leaving quotes, we have the value */
-						results.push_back(KeyVal(current_key, current_value));
+						if (!scan_for_includes_only)
+							results.push_back(KeyVal(current_key, current_value));
 
 						// std::cout << "<" << tagname << ":" << current_key << "> " << current_value << std::endl;
 
@@ -1670,7 +1700,14 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &li
 
 						if ((tagname == "include") && (current_key == "file"))
 						{
-							if (!this->DoInclude(target, current_value, errorstream, pass))
+							if (scan_for_includes_only && (CompletedFiles.find(current_key) != CompletedFiles.end()))
+							{
+								current_key.clear();
+								current_value.clear();
+								continue;
+							}
+							
+							if (!this->DoInclude(target, current_value, errorstream, pass, scan_for_includes_only))
 								return false;
 						}
 
@@ -1695,7 +1732,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &li
 	return true;
 }
 
-bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream, int pass)
+bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only)
 {
 	std::string confpath;
 	std::string newfile;
diff --git a/src/modules/m_http_client.cpp b/src/modules/m_http_client.cpp
index 2010e3e47..58ceb9e09 100644
--- a/src/modules/m_http_client.cpp
+++ b/src/modules/m_http_client.cpp
@@ -151,6 +151,8 @@ bool HTTPSocket::DoRequest(HTTPClientRequest *req)
 	this->port = url.port;
 	strlcpy(this->host, url.domain.c_str(), MAXBUF);
 
+	Instance->Log(DEBUG,"Doing request for %s", url.url.c_str());
+
 	in6_addr s6;
 	in_addr s4;
 	/* Doesnt look like an ipv4 or an ipv6 address */