diff options
| -rw-r--r-- | include/users.h | 24 | ||||
| -rw-r--r-- | src/configreader.cpp | 7 | ||||
| -rw-r--r-- | src/users.cpp | 9 |
3 files changed, 31 insertions, 9 deletions
diff --git a/include/users.h b/include/users.h index 43145ab2f..d51e06ba9 100644 --- a/include/users.h +++ b/include/users.h @@ -181,14 +181,14 @@ public: registration_timeout(source->registration_timeout), flood(source->flood), host(source->host), pingtime(source->pingtime), pass(source->pass), threshold(source->threshold), sendqmax(source->sendqmax), recvqmax(source->recvqmax), maxlocal(source->maxlocal), maxglobal(source->maxglobal), maxchans(source->maxchans), - port(source->port), RefCount(0) + port(source->port), RefCount(0), disabled(false) { } /** Create a new connect class with no settings. */ ConnectClass() : type(CC_DENY), name("unnamed"), registration_timeout(0), flood(0), host(""), pingtime(0), pass(""), - threshold(0), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), RefCount(0) + threshold(0), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), RefCount(0), disabled(false) { } @@ -209,14 +209,14 @@ public: const std::string &pas, unsigned int thres, unsigned long sendq, unsigned long recvq, unsigned long maxl, unsigned long maxg, unsigned int maxc, int p = 0) : type(CC_ALLOW), name(thename), registration_timeout(timeout), flood(fld), host(hst), pingtime(ping), pass(pas), - threshold(thres), sendqmax(sendq), recvqmax(recvq), maxlocal(maxl), maxglobal(maxg), maxchans(maxc), port(p), RefCount(0) { } + threshold(thres), sendqmax(sendq), recvqmax(recvq), maxlocal(maxl), maxglobal(maxg), maxchans(maxc), port(p), RefCount(0), disabled(false) { } /** Create a new connect class to DENY connections * @param thename Name of the connect class * @param hst The IP mask to deny */ ConnectClass(const std::string &thename, const std::string &hst) : type(CC_DENY), name(thename), registration_timeout(0), - flood(0), host(hst), pingtime(0), pass(""), threshold(0), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), RefCount(0) + flood(0), host(hst), pingtime(0), pass(""), threshold(0), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), RefCount(0), disabled(false) { } @@ -228,10 +228,20 @@ public: registration_timeout(source->registration_timeout), flood(source->flood), host(source->host), pingtime(source->pingtime), pass(source->pass), threshold(source->threshold), sendqmax(source->sendqmax), recvqmax(source->recvqmax), maxlocal(source->maxlocal), maxglobal(source->maxglobal), maxchans(source->maxchans), - port(source->port), RefCount(0) + port(source->port), RefCount(0), disabled(false) { } + void SetDisabled(bool t) + { + this->disabled = t; + } + + bool GetDisabled() + { + return this->disabled; + } + /* Update an existing entry with new values */ void Update(unsigned int timeout, unsigned int fld, const std::string &hst, unsigned int ping, @@ -270,6 +280,10 @@ public: */ unsigned long RefCount; + /** If this is true, any attempt to set a user to this class will fail. Default false. This is really private, it's only in the public section thanks to the way this class is written + */ + bool disabled; + int GetMaxChans() { return maxchans; diff --git a/src/configreader.cpp b/src/configreader.cpp index 5031f6506..c15b5c0e7 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -421,17 +421,20 @@ bool InitConnect(ServerConfig* conf, const char*) } goagain: - /* change this: only delete a class with refcount 0 */ for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end(); i++) { ConnectClass *c = *i; + /* only delete a class with refcount 0 */ if (c->RefCount == 0) { conf->GetInstance()->Log(DEFAULT, "Removing connect class, refcount is 0!"); conf->Classes.erase(i); goto goagain; // XXX fucking hell.. how better to do this } + + /* also mark all existing classes disabled, if they still exist in the conf, they will be reenabled. */ + c->SetDisabled(true); } return true; @@ -467,6 +470,8 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) ConnectClass* c = *item; if ((*name && (c->GetName() == name)) || (*allow && (c->GetHost() == allow)) || (*deny && (c->GetHost() == deny))) { + /* reenable class so users can be shoved into it :P */ + c->SetDisabled(false); conf->GetInstance()->Log(DEFAULT, "Not adding class, it already exists!"); return true; } diff --git a/src/users.cpp b/src/users.cpp index 08e38f36d..381806e50 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -1727,7 +1727,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name) { ConnectClass* c = *i; - if (explicit_name == c->GetName()) + if (explicit_name == c->GetName() && !c->GetDisabled()) { found = c; } @@ -1743,7 +1743,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name) { if (c->GetPort()) { - if (this->GetPort() == c->GetPort()) + if (this->GetPort() == c->GetPort() && !c->GetDisabled()) { found = c; } @@ -1752,7 +1752,8 @@ ConnectClass* User::SetClass(const std::string &explicit_name) } else { - found = c; + if (!c->GetDisabled()) + found = c; } } } @@ -1764,6 +1765,8 @@ ConnectClass* User::SetClass(const std::string &explicit_name) /* should always be valid, but just in case .. */ if (this->MyClass) { + if (found == this->MyClass) // no point changing this shit :P + return this->MyClass; this->MyClass->RefCount--; ServerInstance->Log(DEBUG, "Untying user from connect class -- refcount: %u", this->MyClass->RefCount); } |