diff options
| -rw-r--r-- | include/users.h | 8 | ||||
| -rw-r--r-- | src/userprocess.cpp | 70 |
2 files changed, 34 insertions, 44 deletions
diff --git a/include/users.h b/include/users.h index c395608c7..b50023533 100644 --- a/include/users.h +++ b/include/users.h @@ -278,7 +278,7 @@ public: /** Returns the registration timeout */ - unsigned int GetRegTimeout() + time_t GetRegTimeout() { return (registration_timeout ? registration_timeout : 90); } @@ -563,12 +563,6 @@ class CoreExport User : public connection */ time_t awaytime; - /** Timestamp of current time + connection class timeout. - * This user must send USER/NICK before this timestamp is - * reached or they will be disconnected. - */ - time_t timeout; - /** The oper type they logged in as, if they are an oper. * This is used to check permissions in operclasses, so that * we can say 'yay' or 'nay' to any commands they issue. diff --git a/src/userprocess.cpp b/src/userprocess.cpp index 3dc3143de..ca151520c 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -187,7 +187,39 @@ void InspIRCd::DoBackgroundUserStuff() curr->OverPenalty = false; } - if ((curr->registered != REG_ALL) && (TIME > curr->timeout)) + switch (curr->registered) + { + case REG_ALL: + if (TIME > curr->nping) + { + // This user didn't answer the last ping, remove them + if (!curr->lastping) + { + time_t time = this->Time() - (curr->nping - curr->MyClass->GetPingTime()); + char message[MAXBUF]; + snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : ""); + curr->lastping = 1; + curr->nping = TIME + curr->MyClass->GetPingTime(); + this->Users->QuitUser(curr, message); + continue; + } + + curr->Write("PING :%s",this->Config->ServerName); + curr->lastping = 0; + curr->nping = TIME +curr->MyClass->GetPingTime(); + } + break; + case REG_NICKUSER: + if (AllModulesReportReady(curr) && curr->dns_done) + { + /* User has sent NICK/USER, modules are okay, DNS finished. */ + curr->FullConnect(); + continue; + } + break; + } + + if (curr->registered != REG_ALL && (TIME > (curr->age + curr->MyClass->GetRegTimeout()))) { /* * registration timeout -- didnt send USER/NICK/HOST @@ -196,42 +228,6 @@ void InspIRCd::DoBackgroundUserStuff() this->Users->QuitUser(curr, "Registration timeout"); continue; } - - /* - * `ready` means that the user has provided NICK/USER(/PASS), and all modules agree - * that the user is okay to proceed. The one thing we are then waiting for now is DNS... - */ - bool ready = ((curr->registered == REG_NICKUSER) && AllModulesReportReady(curr)); - - if (ready) - { - if (curr->dns_done) - { - /* DNS passed, connect the user */ - curr->FullConnect(); - continue; - } - } - - // It's time to PING this user. Send them a ping. - if ((TIME > curr->nping) && (curr->registered == REG_ALL)) - { - // This user didn't answer the last ping, remove them - if (!curr->lastping) - { - time_t time = this->Time() - (curr->nping - curr->MyClass->GetPingTime()); - char message[MAXBUF]; - snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : ""); - curr->lastping = 1; - curr->nping = TIME + curr->MyClass->GetPingTime(); - this->Users->QuitUser(curr, message); - continue; - } - - curr->Write("PING :%s",this->Config->ServerName); - curr->lastping = 0; - curr->nping = TIME +curr->MyClass->GetPingTime(); - } } } |