From c343bf91f7740a486e8efe0ae0ac229af82ed28a Mon Sep 17 00:00:00 2001
From: stskeeps <devnull@localhost>
Date: Fri, 10 May 2002 15:59:06 +0000
Subject: [PATCH] .

---
 src/ircd.c | 161 ++++++++++++++++++++++++++---------------------------
 1 file changed, 80 insertions(+), 81 deletions(-)

diff --git a/src/ircd.c b/src/ircd.c
index be6613012..7e0c989ee 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -568,99 +568,98 @@ extern TS check_pings(TS currenttime)
 					else
 						(void)exit_client(cptr, cptr, &me, "Banned");
 				}
+				continue;
 			}
-			else
+		
+		}
+			/* We go into ping phase */
+			ping =
+			    IsRegistered(cptr) ? (cptr->class ? cptr->
+	   	 		class->pingfreq : CONNECTTIMEOUT) : CONNECTTIMEOUT;
+			Debug((DEBUG_DEBUG, "c(%s)=%d p %d k %d a %d", cptr->name,
+			    cptr->status, ping, killflag,
+				    currenttime - cptr->lasttime));
+			if (ping < (currenttime - cptr->lasttime))
 			{
-				/* We go into ping phase */
-				ping =
-				    IsRegistered(cptr) ? (cptr->class ? cptr->
-		   	 		class->pingfreq : CONNECTTIMEOUT) : CONNECTTIMEOUT;
-				Debug((DEBUG_DEBUG, "c(%s)=%d p %d k %d a %d", cptr->name,
-				    cptr->status, ping, killflag,
-					    currenttime - cptr->lasttime));
-				if (ping < (currenttime - cptr->lasttime))
+				if (((cptr->flags & FLAGS_PINGSENT)
+				    && ((currenttime - cptr->lasttime) >= (2 * ping)))
+				    || ((!IsRegistered(cptr)
+				    && (currenttime - cptr->since) >= ping)))
+		
 				{
-					if (((cptr->flags & FLAGS_PINGSENT)
-					    && ((currenttime - cptr->lasttime) >= (2 * ping)))
-					    || ((!IsRegistered(cptr)
-					    && (currenttime - cptr->since) >= ping)))
-			
+					/* One of these days you could use a 300 char terminal ..*/
+					if (!IsRegistered(cptr) &&
+					    (DoingDNS(cptr) || DoingAuth(cptr)
+					    ))
 					{
-						/* One of these days you could use a 300 char terminal ..*/
-						if (!IsRegistered(cptr) &&
-						    (DoingDNS(cptr) || DoingAuth(cptr)
-						    ))
+						if (cptr->authfd >= 0)
 						{
-							if (cptr->authfd >= 0)
-							{
-								CLOSE_SOCK(cptr->authfd);
-								--OpenFiles;
-								cptr->authfd = -1;
-								cptr->count = 0;
-								*cptr->buffer = '\0';
-							}
-							if (SHOWCONNECTINFO) {
-								if (DoingDNS(cptr))
-									sendto_one(cptr,
-									    REPORT_FAIL_DNS);
-								else if (DoingAuth(cptr))
-									sendto_one(cptr,
+							CLOSE_SOCK(cptr->authfd);
+							--OpenFiles;
+							cptr->authfd = -1;
+							cptr->count = 0;
+							*cptr->buffer = '\0';
+						}
+						if (SHOWCONNECTINFO) {
+							if (DoingDNS(cptr))
+								sendto_one(cptr,
+								    REPORT_FAIL_DNS);
+							else if (DoingAuth(cptr))
+								sendto_one(cptr,
 								    REPORT_FAIL_ID);
-							}
-							Debug((DEBUG_NOTICE,
-							    "DNS/AUTH timeout %s",
-							    get_client_name(cptr, TRUE)));
-							del_queries((char *)cptr);
-							    ClearAuth(cptr);
-							ClearDNS(cptr);
-							SetAccess(cptr);
-							cptr->firsttime = currenttime;
-							cptr->lasttime = currenttime;
-							continue;
 						}
-						if (IsServer(cptr) || IsConnecting(cptr) ||
-				    			IsHandshake(cptr))
-						{
-							sendto_realops
-							    ("No response from %s, closing link",
-							    get_client_name(cptr, FALSE));
-							sendto_serv_butone(&me,
-							    ":%s GLOBOPS :No response from %s, closing link",
-							    me.name, get_client_name(cptr,
-							    FALSE));
-						}
-						exit_client(cptr, cptr, &me, "Ping timeout");
+						Debug((DEBUG_NOTICE,
+						    "DNS/AUTH timeout %s",
+						    get_client_name(cptr, TRUE)));
+						del_queries((char *)cptr);
+						ClearAuth(cptr);
+						ClearDNS(cptr);
+						SetAccess(cptr);
+						cptr->firsttime = currenttime;
+						cptr->lasttime = currenttime;
 						continue;
 					}
-					else if (IsRegistered(cptr) &&
-					    ((cptr->flags & FLAGS_PINGSENT) == 0))
+					if (IsServer(cptr) || IsConnecting(cptr) ||
+			    			IsHandshake(cptr))
 					{
-						/*
-						 * if we havent PINGed the connection and we havent
-						 * heard from it in a while, PING it to make sure
-						 * it is still alive.
-						 */
-						cptr->flags |= FLAGS_PINGSENT;
-						/* not nice but does the job */
-						cptr->lasttime = currenttime - ping;
-						sendto_one(cptr, "%s :%s",
-						    IsToken(cptr) ? TOK_PING : MSG_PING,
-						    me.name);
+						sendto_realops
+						    ("No response from %s, closing link",
+						    get_client_name(cptr, FALSE));
+						sendto_serv_butone(&me,
+						    ":%s GLOBOPS :No response from %s, closing link",
+						    me.name, get_client_name(cptr,
+						    FALSE));
 					}
-				}	
+					exit_client(cptr, cptr, &me, "Ping timeout");
+					continue;
+				}
+				else if (IsRegistered(cptr) &&
+				    ((cptr->flags & FLAGS_PINGSENT) == 0))
+				{
+					/*
+					 * if we havent PINGed the connection and we havent
+					 * heard from it in a while, PING it to make sure
+					 * it is still alive.
+					 */
+					cptr->flags |= FLAGS_PINGSENT;
+					/* not nice but does the job */
+					cptr->lasttime = currenttime - ping;
+					sendto_one(cptr, "%s :%s",
+					    IsToken(cptr) ? TOK_PING : MSG_PING,
+					    me.name);
+				}
+			}	
+			/*
+	 		* Check UNKNOWN connections - if they have been in this state
+			* for > 100s, close them.
+			 */
+			if (IsUnknown(cptr))
+				if (cptr->firsttime ? ((TStime() - cptr->firsttime) >
+				    100) : 0)
+					(void)exit_client(cptr, cptr, &me,
+					    "Connection Timed Out");
+						
 
-				/*
-		 		* Check UNKNOWN connections - if they have been in this state
-				* for > 100s, close them.
-				 */
-				if (IsUnknown(cptr))
-					if (cptr->firsttime ? ((TStime() - cptr->firsttime) >
-					    100) : 0)
-						(void)exit_client(cptr, cptr, &me,
-						    "Connection Timed Out");
-				
-			}
-		}
 	}
 	/* EXPLANATION
 	 * on a server with a large volume of clients, at any given point