Ping the service manager and set a status message

[ngircd-alex.git] / src / ngircd / conn-func.c

diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c
index 0ba0ff6c1915932c1cd09448b53b42bd6bc89cd7..c14a56ae2a28fe60f1549fd5b82ce851ebdfe191 100644 (file)
--- a/src/ngircd/conn-func.c
+++ b/src/ngircd/conn-func.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2018 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,15 +18,12 @@
  * Connection management: Global functions
  */
 
-#include "imp.h"
 #include <assert.h>
-#include <string.h>
-#include "log.h"
+#include <time.h>
 
+#include "log.h"
 #include "conn.h"
-#include "client.h"
-
-#include "exp.h"
+#include "conf.h"
 #include "conn-func.h"
 
 /**
@@ -45,13 +42,17 @@ Conn_UpdateIdle(CONN_ID Idx)
 /**
  * Update "ping timestamp", the time of the last outgoing PING request.
  *
+ * the value 0 signals a newly connected client including servers during the
+ * initial "server burst"; and 1 means that no PONG is pending for a PING.
+ *
  * @param Idx Connection index.
+ * @param TimeStamp 0, 1, or time stamp.
  */
 GLOBAL void
-Conn_UpdatePing(CONN_ID Idx)
+Conn_UpdatePing(CONN_ID Idx, time_t TimeStamp)
 {
        assert(Idx > NONE);
-       My_Connections[Idx].lastping = time(NULL);
+       My_Connections[Idx].lastping = TimeStamp;
 }
 
 /*
@@ -67,7 +68,7 @@ Conn_GetSignon(CONN_ID Idx)
 GLOBAL time_t
 Conn_GetIdle( CONN_ID Idx )
 {
-       /* Return Idle-Timer of a connetion */
+       /* Return Idle-Timer of a connection */
        assert( Idx > NONE );
        return time( NULL ) - My_Connections[Idx].lastprivmsg;
 } /* Conn_GetIdle */
@@ -86,7 +87,7 @@ Conn_LastPing( CONN_ID Idx )
  * is read. This function only increases the penalty, it is not possible to
  * decrease the penalty time.
  *
- * @param Idex Connection index.
+ * @param Idx Connection index.
  * @param Seconds Seconds to add.
  * @see Conn_ResetPenalty
  */
@@ -98,19 +99,24 @@ Conn_SetPenalty(CONN_ID Idx, time_t Seconds)
        assert(Idx > NONE);
        assert(Seconds >= 0);
 
+       /* Limit new penalty to maximum configured, when less than 10 seconds. *
+          The latter is used to limit brute force attacks, therefore we don't *
+          want to limit that! */
+       if (Conf_MaxPenaltyTime >= 0
+           && Seconds > Conf_MaxPenaltyTime
+           && Seconds < 10)
+               Seconds = Conf_MaxPenaltyTime;
+
        t = time(NULL);
        if (My_Connections[Idx].delaytime < t)
                My_Connections[Idx].delaytime = t;
 
        My_Connections[Idx].delaytime += Seconds;
 
-#ifdef DEBUG
-       Log(LOG_DEBUG,
-           "Add penalty time on connection %d: %ld second%s, total %ld second%s.",
+       LogDebug("Add penalty time on connection %d: %ld second%s, total %ld second%s.",
            Idx, (long)Seconds, Seconds != 1 ? "s" : "",
            My_Connections[Idx].delaytime - t,
            My_Connections[Idx].delaytime - t != 1 ? "s" : "");
-#endif
 } /* Conn_SetPenalty */
 
 GLOBAL void
@@ -139,7 +145,7 @@ GLOBAL CONN_ID
 Conn_First( void )
 {
        CONN_ID i;
-       
+
        for( i = 0; i < Pool_Size; i++ )
        {
                if( My_Connections[i].sock != NONE ) return i;
@@ -153,7 +159,7 @@ Conn_Next( CONN_ID Idx )
        CONN_ID i = NONE;
 
        assert( Idx > NONE );
-       
+
        for( i = Idx + 1; i < Pool_Size; i++ )
        {
                if( My_Connections[i].sock != NONE ) return i;