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 };
/* 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))
{
* at this point
*/
+ if (pass == 0)
+ {
+ if (isatty(0) && isatty(1) && isatty(2))
+ printf("Downloading configuration ");
+
+ TotalDownloaded = 0;
+ FileErrors = 0;
+ }
+
+ if (!ServerInstance->Res)
+ ServerInstance->Res = new DNS(ServerInstance);
/** Note: This is safe, the method checks for user == NULL */
ServerInstance->Parser->SetupCommandTable(user);
ServerInstance->Modules->LoadAll();
{
for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
{
+ /* Skip over modules that are aleready loaded for some reason */
+ if (ServerInstance->Modules->Find(*adding))
+ continue;
+
+ if (bail)
+ printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n", adding->c_str());
+
if (ServerInstance->Modules->Load(adding->c_str()))
{
ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
{
if (user)
user->WriteServ("974 %s %s :%s",user->nick, adding->c_str(), ServerInstance->Modules->LastError().c_str());
+
+ if (bail)
+ {
+ printf_c("\n[\033[1;31m*\033[0m] %s\n\n", ServerInstance->Modules->LastError().c_str());
+ ServerInstance->Exit(EXIT_STATUS_MODULE);
+ }
}
}
}
- ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules in pass 2.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
-
- /** Note: This is safe, the method checks for user == NULL */
- /*ServerInstance->Parser->SetupCommandTable(user);*/
+ ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
if (user)
user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick);
bool ServerConfig::Downloading()
{
+ if (isatty(0) && isatty(1) && isatty(2))
+ {
+ printf(".");
+ fflush(stdout);
+ }
+
+ ServerInstance->Log(DEBUG, "ServerConfig::Downloading %d %d", TotalDownloaded, IncludedFiles.size());
+
/* Returns true if there are still files in the process of downloading */
- return (TotalDownloaded >= IncludedFiles.size());
+ return (TotalDownloaded < IncludedFiles.size());
+}
+
+void ServerConfig::Complete(const std::string &filename, bool error)
+{
+ ServerInstance->Log(DEBUG,"Flag complete: %s %d", filename.c_str(), error);
+ std::map<std::string, std::istream*>::iterator x = IncludedFiles.find(filename);
+
+ if (x != IncludedFiles.end())
+ {
+ if (error)
+ {
+ delete x->second;
+ x->second = NULL;
+ FileErrors++;
+ }
+ TotalDownloaded++;
+ }
+
+ return;
}
void ServerConfig::StartDownloads()
{
- TotalDownloaded = 0;
+ ServerInstance->Log(DEBUG,"((((((((((((((((((((((((( StartDownloads() size=%d )))))))))))))))))))))))))))))))))))))", IncludedFiles.size());
+
/* 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)
{
- ServerInstance->Log(DEBUG,"Begin download for %s", x->first.c_str());
- if ((x->first[0] == '/') || (x->first.substr(7) == "file://"))
+ if (CompletedFiles.find(x->first) != CompletedFiles.end())
+ continue;
+
+ ServerInstance->Log(DEBUG,"StartDownloads File: %s", x->first.c_str());
+
+ std::string file = x->first;
+ if ((file[0] == '/') || (file.substr(0, 7) == "file://"))
{
/* 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.
*/
- /* First, delete the dummy std::stringstream file that LoadConf put here */
- delete x->second;
-
- /* Now add our own ifstream */
- std::ifstream* conf = new std::ifstream(x->first.c_str());
+ /* Add our own ifstream */
+ std::ifstream* conf = new std::ifstream(file.c_str());
if (!conf->fail())
{
- ServerInstance->Log(DEBUG,"file:// schema file %s loaded OK", x->first.c_str());
+ ServerInstance->Log(DEBUG,"file:// schema file %s loaded OK", file.c_str());
+ delete x->second;
x->second = conf;
}
-
+ else
+ {
+ delete x->second;
+ x->second = NULL;
+ FileErrors++;
+ }
TotalDownloaded++;
}
else
{
/* Modules handle these */
ServerInstance->Log(DEBUG,"Module-handled schema for %s", x->first.c_str());
+
+ /* For now, error it */
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnDownloadFile, OnDownloadFile(file, x->second));
+ if (MOD_RESULT == 0)
+ {
+ /* No module claimed this file */
+ TotalDownloaded++;
+ FileErrors++;
+ delete x->second;
+ x->second = NULL;
+ }
}
+ CompletedFiles[x->first] = true;
}
}
-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;
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;
+ }
}
}
else
{
- /* Check if the file open failed first */
- if (IncludedFiles.find(filename) == IncludedFiles.end())
+ std::map<std::string, std::istream*>::iterator x = IncludedFiles.find(filename);
+ if (x == IncludedFiles.end())
{
if (pass == 0)
{
}
}
else
- conf = IncludedFiles.find(filename)->second;
+ {
+ if (!scan_for_includes_only)
+ {
+ 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))
{
if ((character_count++ < 2) && (ch == '\xFF' || ch == '\xFE'))
{
errorstream << "File " << filename << " cannot be read, as it is encoded in braindead UTF-16. Save your file as plain ASCII!" << std::endl;
+ if (!scan_for_includes_only)
+ delete conf;
return false;
}
else
{
errorstream << "End of file after a \\, what did you want to escape?: " << filename << ":" << linenumber << std::endl;
+ if (!scan_for_includes_only)
+ delete conf;
return false;
}
}
if (!in_quote)
{
errorstream << "Got another opening < when the first one wasn't closed: " << filename << ":" << linenumber << std::endl;
+ if (!scan_for_includes_only)
+ delete conf;
return false;
}
}
if (in_quote)
{
errorstream << "We're in a quote but outside a tag, interesting. " << filename << ":" << linenumber << std::endl;
+ if (!scan_for_includes_only)
+ delete conf;
return false;
}
else
* 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))
+ {
+ if (!scan_for_includes_only)
+ delete conf;
return false;
+ }
line.clear();
}
else
{
errorstream << "Got a closing > when we weren't inside a tag: " << filename << ":" << linenumber << std::endl;
+ if (!scan_for_includes_only)
+ delete conf;
return false;
}
}
is a newline missing from the end of the file: " << filename << ":" << linenumber << std::endl;
}
+ if (!scan_for_includes_only)
+ delete conf;
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;
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;
got_key = false;
if ((tagname == "include") && (current_key == "file"))
- {
- if (!this->DoInclude(target, current_value, errorstream, pass))
+ {
+ if (!this->DoInclude(target, current_value, errorstream, pass, scan_for_includes_only))
return false;
}
}
/* Finished parsing the tag, add it to the config hash */
- target.insert(std::pair<std::string, KeyValList > (tagname, results));
+ if (!scan_for_includes_only)
+ target.insert(std::pair<std::string, KeyValList > (tagname, results));
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;
std::replace(newfile.begin(),newfile.end(),'\\','/');
std::replace(confpath.begin(),confpath.end(),'\\','/');
- if (newfile[0] != '/')
+ if ((newfile[0] != '/') && (newfile.find("://") == std::string::npos))
{
if((pos = confpath.rfind("/")) != std::string::npos)
{
}
}
- return LoadConf(target, newfile, errorstream, pass);
+ return LoadConf(target, newfile, errorstream, pass, scan_for_includes_only);
}
bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds)
projects / user / henk / code / inspircd.git / blobdiff