summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2007-10-23 23:25:49 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2007-10-23 23:25:49 +0000
commit0b98824cc5767079f0f895111253b98843e15414 (patch)
treea23bf1bb6b270d325443573858733bea8b098933
parentbbb7c9eec52bd4176f25004996701d6133f51073 (diff)
Some more class stuff, blah. Now possible to move a user to a different class via User::SetClass(), which cmd_oper uses. GetClass() is now just a wrapper around User::MyClass. User::CheckClass() does not support any parameters anymore, nor does User::GetClass().. I think I have this all right ;p
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8337 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--include/users.h15
-rw-r--r--src/commands/cmd_oper.cpp5
-rw-r--r--src/users.cpp55
3 files changed, 44 insertions, 31 deletions
diff --git a/include/users.h b/include/users.h
index 211ae8c04..148c673f4 100644
--- a/include/users.h
+++ b/include/users.h
@@ -925,7 +925,7 @@ class CoreExport User : public connection
/** Call this method to find the matching <connect> for a user, and to check them against it.
*/
- void CheckClass(const std::string &explicit_class = "");
+ void CheckClass();
/** Use this method to fully connect a user.
* This will send the message of the day, check G/K/E lines, etc.
@@ -1135,11 +1135,16 @@ class CoreExport User : public connection
*/
void PurgeEmptyChannels();
- /** Get the connect class which matches this user's host or IP address
- * @param explicit_name Set this string to tie the user to a specific class name
- * @return A reference to this user's connect class
+ /** Get the connect class which this user belongs to.
+ * @return A pointer to this user's connect class
*/
- ConnectClass* GetClass(const std::string &explicit_name = "");
+ ConnectClass *GetClass();
+
+ /** Set the connect class to which this user belongs to.
+ * @param explicit_name Set this string to tie the user to a specific class name. Otherwise, the class is fitted by checking <connect> tags from the configuration file.
+ * @return A reference to this user's current connect class.
+ */
+ ConnectClass *SetClass(const std::string &explicit_name = "");
/** Show the message of the day to this user
*/
diff --git a/src/commands/cmd_oper.cpp b/src/commands/cmd_oper.cpp
index 70376c894..55277b1ba 100644
--- a/src/commands/cmd_oper.cpp
+++ b/src/commands/cmd_oper.cpp
@@ -89,7 +89,10 @@ CmdResult CommandOper::Handle (const char** parameters, int, User *user)
if (*HostName)
user->ChangeDisplayedHost(HostName);
if (*ClassName)
- user->CheckClass(ClassName);
+ {
+ user->SetClass(ClassName);
+ user->CheckClass();
+ }
found = true;
type_invalid = false;
break;
diff --git a/src/users.cpp b/src/users.cpp
index 49d807ac1..74c64e730 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -789,7 +789,7 @@ void User::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, in
* First class check. We do this again in FullConnect after DNS is done, and NICK/USER is recieved.
* See my note down there for why this is required. DO NOT REMOVE. :) -- w00t
*/
- ConnectClass* i = New->GetClass();
+ ConnectClass* i = New->SetClass();
if (!i)
{
@@ -890,9 +890,9 @@ unsigned long User::LocalCloneCount()
/*
* Check class restrictions
*/
-void User::CheckClass(const std::string &explicit_class)
+void User::CheckClass()
{
- ConnectClass* a = this->GetClass(explicit_class);
+ ConnectClass* a = this->MyClass;
if ((!a) || (a->GetType() == CC_DENY))
{
@@ -933,12 +933,12 @@ void User::FullConnect()
* may put the user into a totally seperate class with different restrictions! so we *must* check again.
* Don't remove this! -- w00t
*/
- this->CheckClass();
+ this->SetClass();
/* Check the password, if one is required by the user's connect class.
* This CANNOT be in CheckClass(), because that is called prior to PASS as well!
*/
- if ((!this->GetClass()->GetPass().empty()) && (!this->haspassed))
+ if ((!this->MyClass->GetPass().empty()) && (!this->haspassed))
{
User::QuitUser(ServerInstance, this, "Invalid password");
return;
@@ -1711,35 +1711,34 @@ unsigned int User::GetMaxChans()
return this->MaxChans;
}
-/* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
+
+/*
+ * Sets a user's connection class.
+ * If the class name is provided, it will be used. Otherwise, the class will be guessed using host/ip/ident/etc.
* NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
* then their ip will be taken as 'priority' anyway, so for example,
* <connect allow="127.0.0.1"> will match joe!bloggs@localhost
- *
- * NOTE: This will CACHE (i.e. once a user is in a class, subsequent calls will return the
- * same class value.
- * NOTE 2: As of 1.2, explicit_name is DEPRECATED, as we now tie users to classes :)
*/
-ConnectClass* User::GetClass(const std::string &explicit_name)
+ConnectClass* User::SetClass(const std::string &explicit_name)
{
+ if (this->MyClass)
+ {
+ ServerInstance->Log(DEBUG, "Untying user from connect class -- refcount: %u", this->MyClass->RefCount);
+ this->MyClass->RefCount--;
+ }
+
if (!explicit_name.empty())
{
for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
{
if (explicit_name == i->GetName())
{
- return &(*i);
+ this->MyClass = &(*i);
}
}
}
else
{
- if (this->MyClass)
- return this->MyClass;
-
- if (!IS_LOCAL(this))
- return NULL;
-
for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
{
if (((match(this->GetIPString(),i->GetHost().c_str(),true)) || (match(this->host,i->GetHost().c_str()))))
@@ -1749,9 +1748,6 @@ ConnectClass* User::GetClass(const std::string &explicit_name)
if (this->GetPort() == i->GetPort())
{
this->MyClass = &(*i);
- this->MyClass->RefCount++;
- ServerInstance->Log(DEBUG, "User tied to class -- connect refcount now: %u", this->MyClass->RefCount);
- return &(*i);
}
else
continue;
@@ -1759,16 +1755,25 @@ ConnectClass* User::GetClass(const std::string &explicit_name)
else
{
this->MyClass = &(*i);
- this->MyClass->RefCount++;
- ServerInstance->Log(DEBUG, "User tied to class -- connect refcount now: %u", this->MyClass->RefCount);
- return &(*i);
}
}
}
}
+ this->MyClass->RefCount++;
+ ServerInstance->Log(DEBUG, "User tied to class -- connect refcount now: %u", this->MyClass->RefCount);
/* will only happen for remote users. */
- return NULL;
+ return this->MyClass;
+}
+
+/* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
+ * NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
+ * then their ip will be taken as 'priority' anyway, so for example,
+ * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
+ */
+ConnectClass* User::GetClass()
+{
+ return this->MyClass;
}
void User::PurgeEmptyChannels()