More tweaks

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index 9d7e8dc28c8b21d114bf7a78a09fe55d59033323..3953db233929e3e4ac143e292eaa1677fd41fd0d 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -138,12 +138,12 @@ UserResolver::UserResolver(InspIRCd* Instance, userrec* user, std::string to_res
        Resolver(Instance, to_resolve, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE), bound_user(user)
 {
        this->fwd = forward;
-       this->bound_fd = user->fd;
+       this->bound_fd = user->GetFd();
 }
 
 void UserResolver::OnLookupComplete(const std::string &result)
 {
-       if ((!this->fwd) && (ServerInstance->fd_ref_table[this->bound_fd] == this->bound_user))
+       if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
        {
                ServerInstance->Log(DEBUG,"Commencing forward lookup");
                this->bound_user->stored_host = result;
@@ -161,7 +161,7 @@ void UserResolver::OnLookupComplete(const std::string &result)
                        ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
                }
        }
-       else if ((this->fwd) && (ServerInstance->fd_ref_table[this->bound_fd] == this->bound_user))
+       else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
        {
                /* Both lookups completed */
                if (this->bound_user->GetIPString() == result)
@@ -196,7 +196,7 @@ void UserResolver::OnLookupComplete(const std::string &result)
 
 void UserResolver::OnError(ResolverError e, const std::string &errormessage)
 {
-       if (ServerInstance->fd_ref_table[this->bound_fd] == this->bound_user)
+       if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)
        {
                /* Error message here */
                this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname, using your IP address (%s) instead.", this->bound_user->GetIPString());
@@ -262,9 +262,10 @@ userrec::userrec(InspIRCd* Instance) : ServerInstance(Instance)
        *password = *nick = *ident = *host = *dhost = *fullname = *awaymsg = *oper = 0;
        server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
        reset_due = ServerInstance->Time();
-       lines_in = fd = lastping = signon = idle_lastmsg = nping = registered = 0;
+       lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
        timeout = flood = bytes_in = bytes_out = cmds_in = cmds_out = 0;
        haspassed = dns_done = false;
+       fd = -1;
        recvq = "";
        sendq = "";
        WriteError = "";
@@ -477,14 +478,19 @@ bool userrec::HasPermission(const std::string &command)
        return false;
 }
 
-
+/** NOTE: We cannot pass a const reference to this method.
+ * The string is changed by the workings of the method,
+ * so that if we pass const ref, we end up copying it to
+ * something we can change anyway. Makes sense to just let
+ * the compiler do that copy for us.
+ */
 bool userrec::AddBuffer(std::string a)
 {
        std::string::size_type i = a.rfind('\r');
 
        while (i != std::string::npos)
        {
-               b.erase(i, 1);
+               a.erase(i, 1);
                i = a.rfind('\r');
        }
 
@@ -685,7 +691,7 @@ void userrec::QuitUser(InspIRCd* Instance, userrec *user,const std::string &quit
                        }
                }
                
-               Instance->SE->DelFd(user->fd);
+               Instance->SE->DelFd(user);
                user->CloseSocket();
        }
 
@@ -709,7 +715,6 @@ void userrec::QuitUser(InspIRCd* Instance, userrec *user,const std::string &quit
                Instance->Log(DEBUG,"deleting user hash value %lx",(unsigned long)user);
                if (IS_LOCAL(user))
                {
-                       Instance->fd_ref_table[user->fd] = NULL;
                        if (find(Instance->local_users.begin(),Instance->local_users.end(),user) != Instance->local_users.end())
                                Instance->local_users.erase(find(Instance->local_users.begin(),Instance->local_users.end(),user));
                }
@@ -869,7 +874,6 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
        _new->sendqmax = class_sqmax;
        _new->recvqmax = class_rqmax;
 
-       Instance->fd_ref_table[socket] = _new;
        Instance->local_users.push_back(_new);
 
        if (Instance->local_users.size() > Instance->Config->SoftLimit)
@@ -914,7 +918,7 @@ void userrec::AddClient(InspIRCd* Instance, int socket, int port, bool iscached,
 
        if (socket > -1)
        {
-               if (!Instance->SE->AddFd(socket,true,X_ESTAB_CLIENT))
+               if (!Instance->SE->AddFd(_new))
                {
                        userrec::QuitUser(Instance, _new, "Internal error handling connection");
                        return;
@@ -1269,7 +1273,12 @@ const char* userrec::GetIPString(char* buf)
        return "";
 }
 
-
+/** NOTE: We cannot pass a const reference to this method.
+ * The string is changed by the workings of the method,
+ * so that if we pass const ref, we end up copying it to
+ * something we can change anyway. Makes sense to just let
+ * the compiler do that copy for us.
+ */
 void userrec::Write(std::string text)
 {
        if ((this->fd < 0) || (this->fd > MAX_DESCRIPTORS))
@@ -1789,3 +1798,9 @@ void userrec::ShowRULES()
        this->WriteServ("NOTICE %s :End of %s rules.",this->nick,ServerInstance->Config->ServerName);
 }
 
+void userrec::HandleEvent(EventType et)
+{
+       /* WARNING: May delete this user! */
+       ServerInstance->ProcessUser(this);
+}
+