X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fclient.c;h=076a0cb425f17c976be9b92e0e38649b9f688ab0;hb=ea041b8838714707dca4500f63e2b40344b506c2;hp=faf95a6112a0d25ac8cbe8c152aa7514f97bfcad;hpb=cac9f279fa852c0ececfbf0f7dc09a6f64eff058;p=ngircd.git

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index faf95a61..076a0cb4 100644
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
  *
  * 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
@@ -17,8 +17,6 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: client.c,v 1.82 2005/06/04 12:32:09 fw Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <unistd.h>
@@ -50,26 +48,29 @@ static char UNUSED id[] = "$Id: client.c,v 1.82 2005/06/04 12:32:09 fw Exp $";
 #define GETID_LEN (CLIENT_NICK_LEN-1) + 1 + (CLIENT_USER_LEN-1) + 1 + (CLIENT_HOST_LEN-1) + 1
 
 
-LOCAL CLIENT *This_Server, *My_Clients;
-LOCAL char GetID_Buffer[GETID_LEN];
-
-LOCAL WHOWAS My_Whowas[MAX_WHOWAS];
-LOCAL int Last_Whowas = -1;
+static CLIENT *This_Server, *My_Clients;
+static char GetID_Buffer[GETID_LEN];
 
+static WHOWAS My_Whowas[MAX_WHOWAS];
+static int Last_Whowas = -1;
+static long Max_Users, My_Max_Users;
 
-LOCAL long Count PARAMS(( CLIENT_TYPE Type ));
-LOCAL long MyCount PARAMS(( CLIENT_TYPE Type ));
 
-LOCAL CLIENT *New_Client_Struct PARAMS(( void ));
-LOCAL void Generate_MyToken PARAMS(( CLIENT *Client ));
-LOCAL void Adjust_Counters PARAMS(( CLIENT *Client ));
+static unsigned long Count PARAMS(( CLIENT_TYPE Type ));
+static unsigned long MyCount PARAMS(( CLIENT_TYPE Type ));
 
-#ifndef Client_DestroyNow
-GLOBAL void Client_DestroyNow PARAMS((CLIENT *Client ));
-#endif
+static CLIENT *New_Client_Struct PARAMS(( void ));
+static void Generate_MyToken PARAMS(( CLIENT *Client ));
+static void Adjust_Counters PARAMS(( CLIENT *Client ));
 
+static CLIENT *Init_New_Client PARAMS((CONN_ID Idx, CLIENT *Introducer,
+				       CLIENT *TopServer, int Type, const char *ID,
+				       const char *User, const char *Hostname, const char *Info,
+				       int Hops, int Token, const char *Modes,
+				       bool Idented));
 
-long Max_Users = 0, My_Max_Users = 0;
+static void Destroy_UserOrService PARAMS((CLIENT *Client,const char *Txt, const char *FwdMsg,
+					bool SendQuit));
 
 
 GLOBAL void
@@ -94,9 +95,10 @@ Client_Init( void )
 	This_Server->hops = 0;
 
 	gethostname( This_Server->host, CLIENT_HOST_LEN );
-	h = gethostbyname( This_Server->host );
-	if( h ) strlcpy( This_Server->host, h->h_name, sizeof( This_Server->host ));
-
+	if (!Conf_NoDNS) {
+		h = gethostbyname( This_Server->host );
+		if (h) strlcpy(This_Server->host, h->h_name, sizeof(This_Server->host));
+	}
 	Client_SetID( This_Server, Conf_ServerName );
 	Client_SetInfo( This_Server, Conf_ServerInfo );
 
@@ -135,32 +137,53 @@ Client_ThisServer( void )
 } /* Client_ThisServer */
 
 
+/**
+ * Initialize new local client; wrapper function for Init_New_Client().
+ * @return New CLIENT structure.
+ */
 GLOBAL CLIENT *
-Client_NewLocal( CONN_ID Idx, char *Hostname, int Type, bool Idented )
+Client_NewLocal(CONN_ID Idx, const char *Hostname, int Type, bool Idented)
 {
-	/* Neuen lokalen Client erzeugen: Wrapper-Funktion fuer Client_New(). */
-	return Client_New( Idx, This_Server, NULL, Type, NULL, NULL, Hostname, NULL, 0, 0, NULL, Idented );
+	return Init_New_Client(Idx, This_Server, NULL, Type, NULL, NULL,
+		Hostname, NULL, 0, 0, NULL, Idented);
 } /* Client_NewLocal */
 
 
+/**
+ * Initialize new remote server; wrapper function for Init_New_Client().
+ * @return New CLIENT structure.
+ */
 GLOBAL CLIENT *
-Client_NewRemoteServer( CLIENT *Introducer, char *Hostname, CLIENT *TopServer, int Hops, int Token, char *Info, bool Idented )
+Client_NewRemoteServer(CLIENT *Introducer, const char *Hostname, CLIENT *TopServer,
+ int Hops, int Token, const char *Info, bool Idented)
 {
-	/* Neuen Remote-Client erzeugen: Wrapper-Funktion fuer Client_New (). */
-	return Client_New( NONE, Introducer, TopServer, CLIENT_SERVER, Hostname, NULL, Hostname, Info, Hops, Token, NULL, Idented );
+	return Init_New_Client(NONE, Introducer, TopServer, CLIENT_SERVER,
+		Hostname, NULL, Hostname, Info, Hops, Token, NULL, Idented);
 } /* Client_NewRemoteServer */
 
 
+/**
+ * Initialize new remote client; wrapper function for Init_New_Client().
+ * @return New CLIENT structure.
+ */
 GLOBAL CLIENT *
-Client_NewRemoteUser( CLIENT *Introducer, char *Nick, int Hops, char *User, char *Hostname, int Token, char *Modes, char *Info, bool Idented )
+Client_NewRemoteUser(CLIENT *Introducer, const char *Nick, int Hops, const char *User,
+ const char *Hostname, int Token, const char *Modes, const char *Info, bool Idented)
 {
-	/* Neuen Remote-Client erzeugen: Wrapper-Funktion fuer Client_New (). */
-	return Client_New( NONE, Introducer, NULL, CLIENT_USER, Nick, User, Hostname, Info, Hops, Token, Modes, Idented );
+	return Init_New_Client(NONE, Introducer, NULL, CLIENT_USER, Nick,
+		User, Hostname, Info, Hops, Token, Modes, Idented);
 } /* Client_NewRemoteUser */
 
 
-GLOBAL CLIENT *
-Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, int Type, char *ID, char *User, char *Hostname, char *Info, int Hops, int Token, char *Modes, bool Idented )
+/**
+ * Initialize new client and set up the given parameters like client type,
+ * user name, host name, introducing server etc. ...
+ * @return New CLIENT structure.
+ */
+static CLIENT *
+Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer,
+ int Type, const char *ID, const char *User, const char *Hostname, const char *Info, int Hops,
+ int Token, const char *Modes, bool Idented)
 {
 	CLIENT *client;
 
@@ -172,6 +195,7 @@ Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, int Type, char *
 	if( ! client ) return NULL;
 
 	/* Initialisieren */
+	client->starttime = time(NULL);
 	client->conn_id = Idx;
 	client->introducer = Introducer;
 	client->topserver = TopServer;
@@ -185,8 +209,8 @@ Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, int Type, char *
 	if( Modes ) Client_SetModes( client, Modes );
 	if( Type == CLIENT_SERVER ) Generate_MyToken( client );
 
-	/* ist der User away? */
-	if( strchr( client->modes, 'a' )) strlcpy( client->away, DEFAULT_AWAY_MSG, sizeof( client->away ));
+	if( strchr( client->modes, 'a' ))
+		strlcpy( client->away, DEFAULT_AWAY_MSG, sizeof( client->away ));
 
 	/* Verketten */
 	client->next = (POINTER *)My_Clients;
@@ -196,16 +220,17 @@ Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, int Type, char *
 	Adjust_Counters( client );
 
 	return client;
-} /* Client_New */
+} /* Init_New_Client */
 
 
 GLOBAL void
-Client_Destroy( CLIENT *Client, char *LogMsg, char *FwdMsg, bool SendQuit )
+Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool SendQuit )
 {
 	/* Client entfernen. */
 	
 	CLIENT *last, *c;
-	char msg[LINE_LEN], *txt;
+	char msg[LINE_LEN];
+	const char *txt;
 
 	assert( Client != NULL );
 
@@ -239,41 +264,8 @@ Client_Destroy( CLIENT *Client, char *LogMsg, char *FwdMsg, bool SendQuit )
 			if( last ) last->next = c->next;
 			else My_Clients = (CLIENT *)c->next;
 
-			if( c->type == CLIENT_USER )
-			{
-				if( c->conn_id != NONE )
-				{
-					/* Ein lokaler User */
-					Log( LOG_NOTICE, "User \"%s\" unregistered (connection %d): %s", Client_Mask( c ), c->conn_id, txt );
-
-					if( SendQuit )
-					{
-						/* Alle andere Server informieren! */
-						if( FwdMsg ) IRC_WriteStrServersPrefix( NULL, c, "QUIT :%s", FwdMsg );
-						else IRC_WriteStrServersPrefix( NULL, c, "QUIT :" );
-					}
-				}
-				else
-				{
-					/* Remote User */
-					Log( LOG_DEBUG, "User \"%s\" unregistered: %s", Client_Mask( c ), txt );
-
-					if( SendQuit )
-					{
-						/* Andere Server informieren, ausser denen, die "in
-						 * Richtung dem liegen", auf dem der User registriert
-						 * ist. Von denen haben wir das QUIT ja wohl bekommen. */
-						if( FwdMsg ) IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "QUIT :%s", FwdMsg );
-						else IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "QUIT :" );
-					}
-				}
-
-				/* Unregister client from channels */
-				Channel_Quit( c, FwdMsg ? FwdMsg : c->id );
-				
-				/* Register client in My_Whowas structure */
-				Client_RegisterWhowas( c );
-			}
+			if(c->type == CLIENT_USER || c->type == CLIENT_SERVICE)
+				Destroy_UserOrService(c, txt, FwdMsg, SendQuit);
 			else if( c->type == CLIENT_SERVER )
 			{
 				if( c != This_Server )
@@ -295,11 +287,9 @@ Client_Destroy( CLIENT *Client, char *LogMsg, char *FwdMsg, bool SendQuit )
 				{
 					if( c->id[0] ) Log( LOG_NOTICE, "Client \"%s\" unregistered (connection %d): %s", c->id, c->conn_id, txt );
 					else Log( LOG_NOTICE, "Client unregistered (connection %d): %s", c->conn_id, txt );
-				}
-				else
-				{
-					if( c->id[0] ) Log( LOG_WARNING, "Unregistered unknown client \"%s\": %s", c->id, txt );
-					else Log( LOG_WARNING, "Unregistered unknown client: %s", c->id, txt );
+				} else {
+					Log(LOG_WARNING, "Unregistered unknown client \"%s\": %s",
+								c->id[0] ? c->id : "(No Nick)", txt );
 				}
 			}
 
@@ -313,48 +303,19 @@ Client_Destroy( CLIENT *Client, char *LogMsg, char *FwdMsg, bool SendQuit )
 
 
 GLOBAL void
-Client_DestroyNow( CLIENT *Client )
-{
-	/* Destroy client structure immediately. This function is only
-	 * intended for the connection layer to remove client structures
-	 * of connections that can't be established! */
-
-	CLIENT *last, *c;
-
-	assert( Client != NULL );
-
-	last = NULL;
-	c = My_Clients;
-	while( c )
-	{
-		if( c == Client )
-		{
-			/* Wir haben den Client gefunden: entfernen */
-			if( last ) last->next = c->next;
-			else My_Clients = (CLIENT *)c->next;
-			free( c );
-			break;
-		}
-		last = c;
-		c = (CLIENT *)c->next;
-	}
-} /* Client_DestroyNow */
-
-
-GLOBAL void
-Client_SetHostname( CLIENT *Client, char *Hostname )
+Client_SetHostname( CLIENT *Client, const char *Hostname )
 {
 	/* Hostname eines Clients setzen */
-	
+
 	assert( Client != NULL );
 	assert( Hostname != NULL );
-	
+
 	strlcpy( Client->host, Hostname, sizeof( Client->host ));
 } /* Client_SetHostname */
 
 
 GLOBAL void
-Client_SetID( CLIENT *Client, char *ID )
+Client_SetID( CLIENT *Client, const char *ID )
 {
 	/* Hostname eines Clients setzen, Hash-Wert berechnen */
 
@@ -369,13 +330,13 @@ Client_SetID( CLIENT *Client, char *ID )
 
 
 GLOBAL void
-Client_SetUser( CLIENT *Client, char *User, bool Idented )
+Client_SetUser( CLIENT *Client, const char *User, bool Idented )
 {
 	/* Username eines Clients setzen */
 
 	assert( Client != NULL );
 	assert( User != NULL );
-	
+
 	if( Idented ) strlcpy( Client->user, User, sizeof( Client->user ));
 	else
 	{
@@ -386,19 +347,19 @@ Client_SetUser( CLIENT *Client, char *User, bool Idented )
 
 
 GLOBAL void
-Client_SetInfo( CLIENT *Client, char *Info )
+Client_SetInfo( CLIENT *Client, const char *Info )
 {
 	/* Hostname eines Clients setzen */
 
 	assert( Client != NULL );
 	assert( Info != NULL );
-	
+
 	strlcpy( Client->info, Info, sizeof( Client->info ));
 } /* Client_SetInfo */
 
 
 GLOBAL void
-Client_SetModes( CLIENT *Client, char *Modes )
+Client_SetModes( CLIENT *Client, const char *Modes )
 {
 	/* Modes eines Clients setzen */
 
@@ -410,7 +371,7 @@ Client_SetModes( CLIENT *Client, char *Modes )
 
 
 GLOBAL void
-Client_SetFlags( CLIENT *Client, char *Flags )
+Client_SetFlags( CLIENT *Client, const char *Flags )
 {
 	/* Flags eines Clients setzen */
 
@@ -422,19 +383,19 @@ Client_SetFlags( CLIENT *Client, char *Flags )
 
 
 GLOBAL void
-Client_SetPassword( CLIENT *Client, char *Pwd )
+Client_SetPassword( CLIENT *Client, const char *Pwd )
 {
 	/* Von einem Client geliefertes Passwort */
 
 	assert( Client != NULL );
 	assert( Pwd != NULL );
-	
+
 	strlcpy( Client->pwd, Pwd, sizeof( Client->pwd ));
 } /* Client_SetPassword */
 
 
 GLOBAL void
-Client_SetAway( CLIENT *Client, char *Txt )
+Client_SetAway( CLIENT *Client, const char *Txt )
 {
 	/* Set AWAY reason of client */
 
@@ -442,7 +403,8 @@ Client_SetAway( CLIENT *Client, char *Txt )
 	assert( Txt != NULL );
 
 	strlcpy( Client->away, Txt, sizeof( Client->away ));
-	Log( LOG_DEBUG, "User \"%s\" is away: %s", Client_Mask( Client ), Txt );
+	LogDebug("%s \"%s\" is away: %s", Client_TypeText(Client),
+		 Client_Mask(Client), Txt);
 } /* Client_SetAway */
 
 
@@ -498,7 +460,7 @@ Client_ModeAdd( CLIENT *Client, char Mode )
 	 */
 
 	char x[2];
-	
+
 	assert( Client != NULL );
 
 	x[0] = Mode; x[1] = '\0';
@@ -540,28 +502,7 @@ Client_ModeDel( CLIENT *Client, char Mode )
 
 
 GLOBAL CLIENT *
-Client_GetFromConn( CONN_ID Idx )
-{
-	/* return Client-Structure that belongs to the local Connection Idx gehoert.
-	 * If none is found, return NULL.
-	 */
-
-	CLIENT *c;
-
-	assert( Idx >= 0 );
-	
-	c = My_Clients;
-	while( c )
-	{
-		if( c->conn_id == Idx ) return c;
-		c = (CLIENT *)c->next;
-	}
-	return NULL;
-} /* Client_GetFromConn */
-
-
-GLOBAL CLIENT *
-Client_Search( char *Nick )
+Client_Search( const char *Nick )
 {
 	/* return Client-Structure that has the corresponding Nick.
 	 * If none is found, return NULL.
@@ -638,7 +579,8 @@ Client_ID( CLIENT *Client )
 	assert( Client != NULL );
 
 #ifdef DEBUG
-	if( Client->type == CLIENT_USER ) assert( strlen( Client->id ) < CLIENT_NICK_LEN );
+	if(Client->type == CLIENT_USER)
+		assert(strlen(Client->id) < Conf_MaxNickLength);
 #endif
 						   
 	if( Client->id[0] ) return Client->id;
@@ -658,8 +600,7 @@ GLOBAL char *
 Client_User( CLIENT *Client )
 {
 	assert( Client != NULL );
-	if( Client->user[0] ) return Client->user;
-	else return "~";
+	return Client->user[0] ? Client->user : "~";
 } /* Client_User */
 
 
@@ -731,11 +672,13 @@ GLOBAL CLIENT *
 Client_NextHop( CLIENT *Client )
 {
 	CLIENT *c;
-	
+
 	assert( Client != NULL );
 
 	c = Client;
-	while( c->introducer && ( c->introducer != c ) && ( c->introducer != This_Server )) c = c->introducer;
+	while( c->introducer && ( c->introducer != c ) && ( c->introducer != This_Server ))
+		c = c->introducer;
+
 	return c;
 } /* Client_NextHop */
 
@@ -747,7 +690,7 @@ Client_Mask( CLIENT *Client )
 	 * Prefixe benoetigt wird. */
 
 	assert( Client != NULL );
-	
+
 	if( Client->type == CLIENT_SERVER ) return Client->id;
 
 	snprintf( GetID_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, Client->host );
@@ -792,12 +735,9 @@ Client_Away( CLIENT *Client )
 GLOBAL bool
 Client_CheckNick( CLIENT *Client, char *Nick )
 {
-	/* Nick ueberpruefen */
-
 	assert( Client != NULL );
 	assert( Nick != NULL );
-	
-	/* Nick ungueltig? */
+
 	if( ! Client_IsValidNick( Nick ))
 	{
 		IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), Nick );
@@ -910,13 +850,12 @@ Client_MyServiceCount( void )
 } /* Client_MyServiceCount */
 
 
-GLOBAL long
+GLOBAL unsigned long
 Client_MyServerCount( void )
 {
 	CLIENT *c;
-	long cnt;
+	unsigned long cnt = 0;
 
-	cnt = 0;
 	c = My_Clients;
 	while( c )
 	{
@@ -927,13 +866,12 @@ Client_MyServerCount( void )
 } /* Client_MyServerCount */
 
 
-GLOBAL long
+GLOBAL unsigned long
 Client_OperCount( void )
 {
 	CLIENT *c;
-	long cnt;
+	unsigned long cnt = 0;
 
-	cnt = 0;
 	c = My_Clients;
 	while( c )
 	{
@@ -944,19 +882,19 @@ Client_OperCount( void )
 } /* Client_OperCount */
 
 
-GLOBAL long
+GLOBAL unsigned long
 Client_UnknownCount( void )
 {
 	CLIENT *c;
-	long cnt;
+	unsigned long cnt = 0;
 
-	cnt = 0;
 	c = My_Clients;
 	while( c )
 	{
 		if( c && ( c->type != CLIENT_USER ) && ( c->type != CLIENT_SERVICE ) && ( c->type != CLIENT_SERVER )) cnt++;
 		c = (CLIENT *)c->next;
 	}
+
 	return cnt;
 } /* Client_UnknownCount */
 
@@ -976,28 +914,25 @@ Client_MyMaxUserCount( void )
 
 
 GLOBAL bool
-Client_IsValidNick( char *Nick )
+Client_IsValidNick( const char *Nick )
 {
-	/* Ist der Nick gueltig? */
+	const char *ptr;
+	static const char goodchars[] = ";0123456789-";
 
-	char *ptr, goodchars[20];
-	
 	assert( Nick != NULL );
 
-	strcpy( goodchars, ";0123456789-" );
-
 	if( Nick[0] == '#' ) return false;
 	if( strchr( goodchars, Nick[0] )) return false;
-	if( strlen( Nick ) >= CLIENT_NICK_LEN ) return false;
+	if( strlen( Nick ) >= Conf_MaxNickLength) return false;
 
 	ptr = Nick;
 	while( *ptr )
 	{
-		if(( *ptr < 'A' ) && ( ! strchr( goodchars, *ptr ))) return false;
-		if(( *ptr > '}' ) && ( ! strchr( goodchars, *ptr ))) return false;
+		if (( *ptr < 'A' ) && ( ! strchr( goodchars, *ptr ))) return false;
+		if ( *ptr > '}' ) return false;
 		ptr++;
 	}
-	
+
 	return true;
 } /* Client_IsValidNick */
 
@@ -1021,13 +956,25 @@ Client_GetLastWhowasIndex( void )
 } /* Client_GetLastWhowasIndex */
 
 
-LOCAL long
+/**
+ * Get the start time of this client.
+ * The result is the start time in seconds since 1970-01-01, as reported
+ * by the C function time(NULL).
+ */
+GLOBAL time_t
+Client_StartTime(CLIENT *Client)
+{
+	assert( Client != NULL );
+	return Client->starttime;
+} /* Client_Uptime */
+
+
+static unsigned long
 Count( CLIENT_TYPE Type )
 {
 	CLIENT *c;
-	long cnt;
+	unsigned long cnt = 0;
 
-	cnt = 0;
 	c = My_Clients;
 	while( c )
 	{
@@ -1038,13 +985,12 @@ Count( CLIENT_TYPE Type )
 } /* Count */
 
 
-LOCAL long
+static unsigned long
 MyCount( CLIENT_TYPE Type )
 {
 	CLIENT *c;
-	long cnt;
+	unsigned long cnt = 0;
 
-	cnt = 0;
 	c = My_Clients;
 	while( c )
 	{
@@ -1055,13 +1001,13 @@ MyCount( CLIENT_TYPE Type )
 } /* MyCount */
 
 
-LOCAL CLIENT *
+static CLIENT *
 New_Client_Struct( void )
 {
 	/* Neue CLIENT-Struktur pre-initialisieren */
-	
+
 	CLIENT *c;
-	
+
 	c = (CLIENT *)malloc( sizeof( CLIENT ));
 	if( ! c )
 	{
@@ -1082,7 +1028,7 @@ New_Client_Struct( void )
 } /* New_Client */
 
 
-LOCAL void
+static void
 Generate_MyToken( CLIENT *Client )
 {
 	CLIENT *c;
@@ -1102,11 +1048,11 @@ Generate_MyToken( CLIENT *Client )
 		else c = (CLIENT *)c->next;
 	}
 	Client->mytoken = token;
-	Log( LOG_DEBUG, "Assigned token %d to server \"%s\".", token, Client->id );
+	LogDebug("Assigned token %d to server \"%s\".", token, Client->id);
 } /* Generate_MyToken */
 
 
-LOCAL void
+static void
 Adjust_Counters( CLIENT *Client )
 {
 	long count;
@@ -1114,7 +1060,7 @@ Adjust_Counters( CLIENT *Client )
 	assert( Client != NULL );
 
 	if( Client->type != CLIENT_USER ) return;
-	
+
 	if( Client->conn_id != NONE )
 	{
 		/* Local connection */
@@ -1128,22 +1074,31 @@ Adjust_Counters( CLIENT *Client )
 
 /**
  * Register client in My_Whowas structure for further recall by WHOWAS.
+ * Note: Only clients that have been connected at least 30 seconds will be
+ * registered to prevent automated IRC bots to "destroy" a nice server
+ * history database.
  */
 GLOBAL void
 Client_RegisterWhowas( CLIENT *Client )
 {
 	int slot;
-	
+	time_t now;
+
 	assert( Client != NULL );
 
+	now = time(NULL);
+	/* Don't register clients that were connected less than 30 seconds. */
+	if( now - Client->starttime < 30 )
+		return;
+
 	slot = Last_Whowas + 1;
 	if( slot >= MAX_WHOWAS || slot < 0 ) slot = 0;
 
 #ifdef DEBUG
 	Log( LOG_DEBUG, "Saving WHOWAS information to slot %d ...", slot );
 #endif
-	
-	My_Whowas[slot].time = time( NULL );
+
+	My_Whowas[slot].time = now;
 	strlcpy( My_Whowas[slot].id, Client_ID( Client ),
 		 sizeof( My_Whowas[slot].id ));
 	strlcpy( My_Whowas[slot].user, Client_User( Client ),
@@ -1154,9 +1109,76 @@ Client_RegisterWhowas( CLIENT *Client )
 		 sizeof( My_Whowas[slot].info ));
 	strlcpy( My_Whowas[slot].server, Client_ID( Client_Introducer( Client )),
 		 sizeof( My_Whowas[slot].server ));
-	
+
 	Last_Whowas = slot;
 } /* Client_RegisterWhowas */
 
 
+GLOBAL char *
+Client_TypeText(CLIENT *Client)
+{
+	assert(Client != NULL);
+	switch (Client_Type(Client)) {
+		case CLIENT_USER:
+			return "User";
+			break;
+		case CLIENT_SERVICE:
+			return "Service";
+			break;
+		case CLIENT_SERVER:
+			return "Server";
+			break;
+		default:
+			return "Client";
+	}
+} /* Client_TypeText */
+
+
+/**
+ * Destroy user or service client.
+ */
+static void
+Destroy_UserOrService(CLIENT *Client, const char *Txt, const char *FwdMsg, bool SendQuit)
+{
+	if(Client->conn_id != NONE) {
+		/* Local (directly connected) client */
+		Log(LOG_NOTICE,
+		    "%s \"%s\" unregistered (connection %d): %s",
+		    Client_TypeText(Client), Client_Mask(Client),
+		    Client->conn_id, Txt);
+
+		if (SendQuit) {
+			/* Inforam all the other servers */
+			if (FwdMsg)
+				IRC_WriteStrServersPrefix(NULL,
+						Client, "QUIT :%s", FwdMsg );
+			else
+				IRC_WriteStrServersPrefix(NULL,
+						Client, "QUIT :");
+		}
+	} else {
+		/* Remote client */
+		LogDebug("%s \"%s\" unregistered: %s",
+			 Client_TypeText(Client), Client_Mask(Client), Txt);
+
+		if(SendQuit) {
+			/* Inform all the other servers, but the ones in the
+			 * direction we got the QUIT from */
+			if(FwdMsg)
+				IRC_WriteStrServersPrefix(Client_NextHop(Client),
+						Client, "QUIT :%s", FwdMsg );
+			else
+				IRC_WriteStrServersPrefix(Client_NextHop(Client),
+						Client, "QUIT :" );
+		}
+	}
+
+	/* Unregister client from channels */
+	Channel_Quit(Client, FwdMsg ? FwdMsg : Client->id);
+
+	/* Register client in My_Whowas structure */
+	Client_RegisterWhowas(Client);
+} /* Destroy_UserOrService */
+
+
 /* -eof- */