/* $CopyInstall: conf/modules.conf.example $(CONPATH) */
/* $CopyInstall: conf/opers.conf.example $(CONPATH) */
/* $CopyInstall: conf/links.conf.example $(CONPATH) */
+/* $CopyInstall: .gdbargs $(BASE) */
#include "inspircd.h"
#include <fstream>
{
conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Reading connect classes... class list is:");
- /*
- * Remove all connect classes.. we'll reset the pointers in user classes
- * once all new classes have been read from config.
- */
- while (conf->Classes.begin() != conf->Classes.end())
+ for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end() ; )
{
- ConnectClass *c = *(conf->Classes.begin());
- conf->Classes.erase(conf->Classes.begin());
- delete c;
+ ConnectClass* c = *i;
+
+ /*
+ * only delete a class with refcount 0.
+ * this is needed to avoid trampling on a wild pointer (User::MyClass)!
+ * it's also the most simple way to do it, given that we're looking at threads..
+ * -- w00t
+ */
+ if (c->RefCount == 0)
+ {
+ conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Removing connect class, refcount is 0!");
+
+ /* This was causing a crash, because we'd set i to .begin() just here, but then the for loop's increment would
+ * set it to .begin() + 1. Which if it was already the last thing in the list, wasn't good.
+ * Now the increment is in the else { } below.
+ */
+ conf->Classes.erase(i);
+ i = conf->Classes.begin(); // start over so we don't trample on a bad iterator
+ }
+ else
+ {
+ /* also mark all existing classes disabled, if they still exist in the conf, they will be reenabled. */
+ c->SetDisabled(true);
+ i++;
+ }
}
return true;
const char* password = values[2].GetString();
int timeout = values[3].GetInteger();
int pingfreq = values[4].GetInteger();
- int flood = values[5].GetInteger();
- int threshold = values[6].GetInteger();
- int sendq = values[7].GetInteger();
- int recvq = values[8].GetInteger();
- int localmax = values[9].GetInteger();
- int globalmax = values[10].GetInteger();
- int port = values[11].GetInteger();
- const char* name = values[12].GetString();
- const char* parent = values[13].GetString();
- int maxchans = values[14].GetInteger();
- unsigned long limit = values[15].GetInteger();
- const char* hashtype = values[16].GetString();
+ int sendq = values[5].GetInteger();
+ int recvq = values[6].GetInteger();
+ int localmax = values[7].GetInteger();
+ int globalmax = values[8].GetInteger();
+ int port = values[9].GetInteger();
+ const char* name = values[10].GetString();
+ const char* parent = values[11].GetString();
+ int maxchans = values[12].GetInteger();
+ unsigned long limit = values[13].GetInteger();
+ const char* hashtype = values[14].GetString();
conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Adding a connect class!");
if (cc->GetName() == parent)
{
cc = new ConnectClass(name, cc);
- cc->Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit);
+ cc->Update(timeout, *allow ? allow : deny, pingfreq, password, sendq, recvq, localmax, globalmax, maxchans, port, limit);
conf->Classes.push_back(cc);
break;
}
/* Find existing class by mask, the mask should be unique */
for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item)
{
- if ((*item)->GetHost() == allow)
+ if ((*item)->GetHost() == allow && !(*item)->GetDisabled())
{
- (*item)->Update(timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit);
+ (*item)->Update(timeout, allow, pingfreq, password, sendq, recvq, localmax, globalmax, maxchans, port, limit);
return true;
}
}
- cc = new ConnectClass(name, timeout, flood, allow, pingfreq, password, hashtype, threshold, sendq, recvq, localmax, globalmax, maxchans);
+ cc = new ConnectClass(name, timeout, allow, pingfreq, password, hashtype, sendq, recvq, localmax, globalmax, maxchans);
cc->limit = limit;
cc->SetPort(port);
conf->Classes.push_back(cc);
/* Find existing class by mask, the mask should be unique */
for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item)
{
- if ((*item)->GetHost() == deny)
+ if ((*item)->GetHost() == deny && !(*item)->GetDisabled())
{
(*item)->Update(name, deny);
(*item)->SetPort(port);
*/
bool DoneConnect(ServerConfig *conf, const char*)
{
- /*
- * Update connect classes on all users.
- */
- conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Resetting connect classes for users...");
- for (std::vector<User*>::iterator n = conf->GetInstance()->Users->local_users.begin(); n != conf->GetInstance()->Users->local_users.end(); n++)
- {
- User *u = *n;
-
- /*
- * Make their existing class go away so that SetClass doesn't touch a wild ptr, important!
- */
- u->MyClass = NULL;
-
- u->SetClass();
-
- /*
- * Check that the user falls into a valid class block.. if they don't,
- * they need to be quit, which CheckClass will do. -- w00t
- */
- u->CheckClass();
- }
-
-
conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Done adding connect classes!");
return true;
}
{"security", "hidewhois", "", new ValueContainerChar (this->HideWhoisServer), DT_NOSPACES, NoValidation},
{"security", "hidekills", "", new ValueContainerChar (this->HideKillsServer), DT_NOSPACES, NoValidation},
{"security", "operspywhois", "0", new ValueContainerBool (&this->OperSpyWhois), DT_BOOLEAN, NoValidation},
+ {"security", "restrictbannedusers", "1", new ValueContainerBool (&this->RestrictBannedUsers), DT_BOOLEAN, NoValidation},
{"performance", "nouserdns", "0", new ValueContainerBool (&this->NoUserDns), DT_BOOLEAN, NoValidation},
{"options", "syntaxhints", "0", new ValueContainerBool (&this->SyntaxHints), DT_BOOLEAN, NoValidation},
{"options", "cyclehosts", "0", new ValueContainerBool (&this->CycleHosts), DT_BOOLEAN, NoValidation},
MultiConfig MultiValues[] = {
{"connect",
- {"allow", "deny", "password", "timeout", "pingfreq", "flood",
- "threshold", "sendq", "recvq", "localmax", "globalmax", "port",
+ {"allow", "deny", "password", "timeout", "pingfreq",
+ "sendq", "recvq", "localmax", "globalmax", "port",
"name", "parent", "maxchans", "limit", "hash",
NULL},
- {"", "", "", "", "120", "",
- "", "", "", "3", "3", "0",
- "", "", "0", "0", "",
+ {"", "", "", "", "120",
+ "", "", "3", "3", "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_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_NOSPACES, DT_NOSPACES, DT_INTEGER, DT_INTEGER, DT_CHARPTR},
InitConnect, DoConnect, DoneConnect},
/* Silently ignore boot only values */
if (bootonly && !bail)
+ {
+ delete Values[Index].val;
continue;
+ }
ConfValue(newconfig, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines);
ValueItem vi(item);
// write once here, to try it out and make sure its ok
ServerInstance->WritePID(this->PID);
- /* Switch over logfiles */
- ServerInstance->Logs->CloseLogs();
- ServerInstance->Logs->OpenFileLogs();
-
- ServerInstance->Logs->Log("CONFIG", DEFAULT, "Done reading configuration file.");
-
/* If we're rehashing, let's load any new modules, and unload old ones
*/
if (!bail)
}
}
}
-
- ServerInstance->Logs->Log("CONFIG", 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());
-
ServerInstance->Threads->Unlock();
}
- if (bail)
- {
- /** Note: This is safe, the method checks for user == NULL */
- ServerInstance->Threads->Lock();
- User* user = NULL;
- if (!useruid.empty())
- user = ServerInstance->FindNick(useruid);
- ServerInstance->Parser->SetupCommandTable(user);
- ServerInstance->Threads->Unlock();
- }
- else
+ if (!bail)
{
if (!useruid.empty())
{
projects / user / henk / code / inspircd.git / blobdiff