This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Undernet IRC Server Source Code.".
The branch, u2_10_12_branch has been updated
via ac43a9ca643546041560c7386b7c34d28d57ee4e (commit)
from f8092c062a6932df138f0a9cf2855628a065c27c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ac43a9ca643546041560c7386b7c34d28d57ee4e
Author: Michael Poole <[email protected]>
Date: Tue Sep 17 16:37:35 2013 -0400
Avoid crashes when IAuth registers a client due to iauthd timeout.
auth_ping_timeout() can -- at least with IAuth -- register a client,
in which case it is wrong to set next_check based on FEAT_CONNECTTIMEOUT.
In this case, fall through to the cases that handle registered clients.
diff --git a/ircd/ircd.c b/ircd/ircd.c
index 7048e7d..6d59e35 100644
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -348,13 +348,36 @@ static void check_pings(struct Event* ev) {
continue;
}
- max_ping = IsRegistered(cptr) ? client_get_ping(cptr) :
- feature_int(FEAT_CONNECTTIMEOUT);
-
- Debug((DEBUG_DEBUG, "check_pings(%s)=status:%s limit: %d current: %d",
+ Debug((DEBUG_DEBUG, "check_pings(%s)=status:%s current: %d",
cli_name(cptr),
IsPingSent(cptr) ? "[Ping Sent]" : "[]",
- max_ping, (int)(CurrentTime - cli_lasttime(cptr))));
+ (int)(CurrentTime - cli_lasttime(cptr))));
+
+ /* Unregistered clients pingout after max_ping seconds, they don't
+ * get given a second chance - if they were then people could not quite
+ * finish registration and hold resources without being subject to k/g
+ * lines
+ */
+ if (!IsRegistered(cptr)) {
+ assert(!IsServer(cptr));
+ max_ping = feature_int(FEAT_CONNECTTIMEOUT);
+ /* If client authorization time has expired, ask auth whether they
+ * should be checked again later. */
+ if ((CurrentTime-cli_firsttime(cptr) >= max_ping)
+ && auth_ping_timeout(cptr))
+ continue;
+ if (!IsRegistered(cptr)) {
+ /* OK, they still have enough time left, so we'll just skip to the
+ * next client. Set the next check to be when their time is up, if
+ * that's before the currently scheduled next check -- hikari */
+ expire = cli_firsttime(cptr) + max_ping;
+ if (expire < next_check)
+ next_check = expire;
+ continue;
+ }
+ }
+
+ max_ping = client_get_ping(cptr);
/* If it's a server and we have not sent an AsLL lately, do so. */
if (IsServer(cptr)) {
@@ -390,27 +413,6 @@ static void check_pings(struct Event* ev) {
continue;
}
- /* Unregistered clients pingout after max_ping seconds, they don't
- * get given a second chance - if they were then people could not quite
- * finish registration and hold resources without being subject to k/g
- * lines
- */
- if (!IsRegistered(cptr)) {
- assert(!IsServer(cptr));
- /* If client authorization time has expired, ask auth whether they
- * should be checked again later. */
- if ((CurrentTime-cli_firsttime(cptr) >= max_ping)
- && auth_ping_timeout(cptr))
- continue;
- /* OK, they still have enough time left, so we'll just skip to the
- * next client. Set the next check to be when their time is up, if
- * that's before the currently scheduled next check -- hikari */
- expire = cli_firsttime(cptr) + max_ping;
- if (expire < next_check)
- next_check = expire;
- continue;
- }
-
/* Quit the client after max_ping*2 - they should have answered by now */
if (CurrentTime-cli_lasttime(cptr) >= (max_ping*2) )
{
-----------------------------------------------------------------------
Summary of changes:
ircd/ircd.c | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
hooks/post-receive
--
Undernet IRC Server Source Code.
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
