X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fclient.c;h=cc6641405b4eee17199b27bbb6127f7ddfa0f184;hp=0257e9644902f269fcdbf81822f63b5b47af0581;hb=467e76aa3296be5a811d53887d5caa41f827aaa8;hpb=9146fa253459caf33fe8420b969e8f63d307caa0

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 0257e964..cc664140 100644
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: client.c,v 1.49 2002/03/12 23:42:59 alex Exp $
+ * $Id: client.c,v 1.61 2002/10/04 12:39:58 alex Exp $
  *
  * client.c: Management aller Clients
  *
@@ -35,14 +35,17 @@
 #include <string.h>
 #include <netdb.h>
 
+#include "conn.h"
+
 #include "exp.h"
 #include "client.h"
 
 #include <imp.h>
 #include "ngircd.h"
 #include "channel.h"
+#include "resolve.h"
 #include "conf.h"
-#include "conn.h"
+#include "hash.h"
 #include "irc-write.h"
 #include "log.h"
 #include "messages.h"
@@ -50,18 +53,22 @@
 #include <exp.h>
 
 
+#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[CLIENT_ID_LEN];
+LOCAL CHAR GetID_Buffer[GETID_LEN];
 
 
-LOCAL INT Count( CLIENT_TYPE Type );
-LOCAL INT MyCount( CLIENT_TYPE Type );
+LOCAL INT Count PARAMS(( CLIENT_TYPE Type ));
+LOCAL INT MyCount PARAMS(( CLIENT_TYPE Type ));
 
-LOCAL CLIENT *New_Client_Struct( VOID );
-LOCAL VOID Generate_MyToken( CLIENT *Client );
+LOCAL CLIENT *New_Client_Struct PARAMS(( VOID ));
+LOCAL VOID Generate_MyToken PARAMS(( CLIENT *Client ));
 
 
-GLOBAL VOID Client_Init( VOID )
+GLOBAL VOID
+Client_Init( VOID )
 {
 	struct hostent *h;
 	
@@ -69,7 +76,7 @@ GLOBAL VOID Client_Init( VOID )
 	if( ! This_Server )
 	{
 		Log( LOG_EMERG, "Can't allocate client structure for server! Going down." );
-		Log( LOG_ALERT, PACKAGE" exiting due to fatal errors!" );
+		Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
 		exit( 1 );
 	}
 
@@ -85,26 +92,28 @@ GLOBAL VOID Client_Init( VOID )
 	h = gethostbyname( This_Server->host );
 	if( h ) strcpy( This_Server->host, h->h_name );
 
-	strcpy( This_Server->id, Conf_ServerName );
-	strcpy( This_Server->info, Conf_ServerInfo );
+	Client_SetID( This_Server, Conf_ServerName );
+	Client_SetInfo( This_Server, Conf_ServerInfo );
 
 	My_Clients = This_Server;
 } /* Client_Init */
 
 
-GLOBAL VOID Client_Exit( VOID )
+GLOBAL VOID
+Client_Exit( VOID )
 {
 	CLIENT *c, *next;
 	INT cnt;
 
-	Client_Destroy( This_Server, "Server going down.", NULL, FALSE );
+	if( NGIRCd_Restart ) Client_Destroy( This_Server, "Server going down (restarting).", NULL, FALSE );
+	else Client_Destroy( This_Server, "Server going down.", NULL, FALSE );
 	
 	cnt = 0;
 	c = My_Clients;
 	while( c )
 	{
 		cnt++;
-		next = c->next;
+		next = (CLIENT *)c->next;
 		free( c );
 		c = next;
 	}
@@ -112,34 +121,39 @@ GLOBAL VOID Client_Exit( VOID )
 } /* Client_Exit */
 
 
-GLOBAL CLIENT *Client_ThisServer( VOID )
+GLOBAL CLIENT *
+Client_ThisServer( VOID )
 {
 	return This_Server;
 } /* Client_ThisServer */
 
 
-GLOBAL CLIENT *Client_NewLocal( CONN_ID Idx, CHAR *Hostname, INT Type, BOOLEAN Idented )
+GLOBAL CLIENT *
+Client_NewLocal( CONN_ID Idx, CHAR *Hostname, INT Type, BOOLEAN 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 );
 } /* Client_NewLocal */
 
 
-GLOBAL CLIENT *Client_NewRemoteServer( CLIENT *Introducer, CHAR *Hostname, CLIENT *TopServer, INT Hops, INT Token, CHAR *Info, BOOLEAN Idented )
+GLOBAL CLIENT *
+Client_NewRemoteServer( CLIENT *Introducer, CHAR *Hostname, CLIENT *TopServer, INT Hops, INT Token, CHAR *Info, BOOLEAN 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 );
 } /* Client_NewRemoteServer */
 
 
-GLOBAL CLIENT *Client_NewRemoteUser( CLIENT *Introducer, CHAR *Nick, INT Hops, CHAR *User, CHAR *Hostname, INT Token, CHAR *Modes, CHAR *Info, BOOLEAN Idented )
+GLOBAL CLIENT *
+Client_NewRemoteUser( CLIENT *Introducer, CHAR *Nick, INT Hops, CHAR *User, CHAR *Hostname, INT Token, CHAR *Modes, CHAR *Info, BOOLEAN 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 );
 } /* 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, BOOLEAN Idented )
+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, BOOLEAN Idented )
 {
 	CLIENT *client;
 
@@ -168,14 +182,15 @@ GLOBAL CLIENT *Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, I
 	if( strchr( client->modes, 'a' )) strcpy( client->away, DEFAULT_AWAY_MSG );
 
 	/* Verketten */
-	client->next = My_Clients;
+	client->next = (POINTER *)My_Clients;
 	My_Clients = client;
 
 	return client;
 } /* Client_New */
 
 
-GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit )
+GLOBAL VOID
+Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN SendQuit )
 {
 	/* Client entfernen. */
 	
@@ -188,7 +203,7 @@ GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN
 	else txt = FwdMsg;
 	if( ! txt ) txt = "Reason unknown.";
 
-	/* Netz-Split-Nachricht vorbereiten */
+	/* Netz-Split-Nachricht vorbereiten (noch nicht optimal) */
 	if( Client->type == CLIENT_SERVER ) sprintf( msg, "%s: lost server %s", This_Server->id, Client->id );
 
 	last = NULL;
@@ -208,7 +223,7 @@ GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN
 		{
 			/* Wir haben den Client gefunden: entfernen */
 			if( last ) last->next = c->next;
-			else My_Clients = c->next;
+			else My_Clients = (CLIENT *)c->next;
 
 			if( c->type == CLIENT_USER )
 			{
@@ -238,14 +253,14 @@ GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN
 						else IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "QUIT :" );
 					}
 				}
-				Channel_RemoveClient( c, FwdMsg ? FwdMsg : c->id );
+				Channel_Quit( c, FwdMsg ? FwdMsg : c->id );
 			}
 			else if( c->type == CLIENT_SERVER )
 			{
 				if( c != This_Server )
 				{
-					if( c->conn_id != NONE ) Log( LOG_NOTICE, "Server \"%s\" unregistered (connection %d): %s", c->id, c->conn_id, txt );
-					else Log( LOG_NOTICE, "Server \"%s\" unregistered: %s", c->id, txt );
+					if( c->conn_id != NONE ) Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" unregistered (connection %d): %s", c->id, c->conn_id, txt );
+					else Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" unregistered: %s", c->id, txt );
 				}
 
 				/* andere Server informieren */
@@ -273,12 +288,13 @@ GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN
 			break;
 		}
 		last = c;
-		c = c->next;
+		c = (CLIENT *)c->next;
 	}
 } /* Client_Destroy */
 
 
-GLOBAL VOID Client_SetHostname( CLIENT *Client, CHAR *Hostname )
+GLOBAL VOID
+Client_SetHostname( CLIENT *Client, CHAR *Hostname )
 {
 	/* Hostname eines Clients setzen */
 	
@@ -290,19 +306,24 @@ GLOBAL VOID Client_SetHostname( CLIENT *Client, CHAR *Hostname )
 } /* Client_SetHostname */
 
 
-GLOBAL VOID Client_SetID( CLIENT *Client, CHAR *ID )
+GLOBAL VOID
+Client_SetID( CLIENT *Client, CHAR *ID )
 {
-	/* Hostname eines Clients setzen */
+	/* Hostname eines Clients setzen, Hash-Wert berechnen */
 
 	assert( Client != NULL );
 	assert( ID != NULL );
 	
 	strncpy( Client->id, ID, CLIENT_ID_LEN - 1 );
 	Client->id[CLIENT_ID_LEN - 1] = '\0';
+
+	/* Hash */
+	Client->hash = Hash( Client->id );
 } /* Client_SetID */
 
 
-GLOBAL VOID Client_SetUser( CLIENT *Client, CHAR *User, BOOLEAN Idented )
+GLOBAL VOID
+Client_SetUser( CLIENT *Client, CHAR *User, BOOLEAN Idented )
 {
 	/* Username eines Clients setzen */
 
@@ -319,7 +340,8 @@ GLOBAL VOID Client_SetUser( CLIENT *Client, CHAR *User, BOOLEAN Idented )
 } /* Client_SetUser */
 
 
-GLOBAL VOID Client_SetInfo( CLIENT *Client, CHAR *Info )
+GLOBAL VOID
+Client_SetInfo( CLIENT *Client, CHAR *Info )
 {
 	/* Hostname eines Clients setzen */
 
@@ -331,9 +353,10 @@ GLOBAL VOID Client_SetInfo( CLIENT *Client, CHAR *Info )
 } /* Client_SetInfo */
 
 
-GLOBAL VOID Client_SetModes( CLIENT *Client, CHAR *Modes )
+GLOBAL VOID
+Client_SetModes( CLIENT *Client, CHAR *Modes )
 {
-	/* Hostname eines Clients setzen */
+	/* Modes eines Clients setzen */
 
 	assert( Client != NULL );
 	assert( Modes != NULL );
@@ -343,7 +366,21 @@ GLOBAL VOID Client_SetModes( CLIENT *Client, CHAR *Modes )
 } /* Client_SetModes */
 
 
-GLOBAL VOID Client_SetPassword( CLIENT *Client, CHAR *Pwd )
+GLOBAL VOID
+Client_SetFlags( CLIENT *Client, CHAR *Flags )
+{
+	/* Flags eines Clients setzen */
+
+	assert( Client != NULL );
+	assert( Flags != NULL );
+
+	strncpy( Client->flags, Flags, CLIENT_FLAGS_LEN - 1 );
+	Client->modes[CLIENT_FLAGS_LEN - 1] = '\0';
+} /* Client_SetFlags */
+
+
+GLOBAL VOID
+Client_SetPassword( CLIENT *Client, CHAR *Pwd )
 {
 	/* Von einem Client geliefertes Passwort */
 
@@ -355,7 +392,8 @@ GLOBAL VOID Client_SetPassword( CLIENT *Client, CHAR *Pwd )
 } /* Client_SetPassword */
 
 
-GLOBAL VOID Client_SetAway( CLIENT *Client, CHAR *Txt )
+GLOBAL VOID
+Client_SetAway( CLIENT *Client, CHAR *Txt )
 {
 	/* Von einem Client gelieferte AWAY-Nachricht */
 
@@ -378,7 +416,8 @@ GLOBAL VOID Client_SetAway( CLIENT *Client, CHAR *Txt )
 } /* Client_SetAway */
 
 
-GLOBAL VOID Client_SetType( CLIENT *Client, INT Type )
+GLOBAL VOID
+Client_SetType( CLIENT *Client, INT Type )
 {
 	assert( Client != NULL );
 	Client->type = Type;
@@ -386,21 +425,24 @@ GLOBAL VOID Client_SetType( CLIENT *Client, INT Type )
 } /* Client_SetType */
 
 
-GLOBAL VOID Client_SetHops( CLIENT *Client, INT Hops )
+GLOBAL VOID
+Client_SetHops( CLIENT *Client, INT Hops )
 {
 	assert( Client != NULL );
 	Client->hops = Hops;
 } /* Client_SetHops */
 
 
-GLOBAL VOID Client_SetToken( CLIENT *Client, INT Token )
+GLOBAL VOID
+Client_SetToken( CLIENT *Client, INT Token )
 {
 	assert( Client != NULL );
 	Client->token = Token;
 } /* Client_SetToken */
 
 
-GLOBAL VOID Client_SetIntroducer( CLIENT *Client, CLIENT *Introducer )
+GLOBAL VOID
+Client_SetIntroducer( CLIENT *Client, CLIENT *Introducer )
 {
 	assert( Client != NULL );
 	assert( Introducer != NULL );
@@ -408,14 +450,16 @@ GLOBAL VOID Client_SetIntroducer( CLIENT *Client, CLIENT *Introducer )
 } /* Client_SetIntroducer */
 
 
-GLOBAL VOID Client_SetOperByMe( CLIENT *Client, BOOLEAN OperByMe )
+GLOBAL VOID
+Client_SetOperByMe( CLIENT *Client, BOOLEAN OperByMe )
 {
 	assert( Client != NULL );
 	Client->oper_by_me = OperByMe;
 } /* Client_SetOperByMe */
 
 
-GLOBAL BOOLEAN Client_ModeAdd( CLIENT *Client, CHAR Mode )
+GLOBAL BOOLEAN
+Client_ModeAdd( CLIENT *Client, CHAR Mode )
 {
 	/* Mode soll gesetzt werden. TRUE wird geliefert, wenn der
 	 * Mode neu gesetzt wurde, FALSE, wenn der Client den Mode
@@ -436,7 +480,8 @@ GLOBAL BOOLEAN Client_ModeAdd( CLIENT *Client, CHAR Mode )
 } /* Client_ModeAdd */
 
 
-GLOBAL BOOLEAN Client_ModeDel( CLIENT *Client, CHAR Mode )
+GLOBAL BOOLEAN
+Client_ModeDel( CLIENT *Client, CHAR Mode )
 {
 	/* Mode soll geloescht werden. TRUE wird geliefert, wenn der
 	* Mode entfernt wurde, FALSE, wenn der Client den Mode
@@ -461,7 +506,8 @@ GLOBAL BOOLEAN Client_ModeDel( CLIENT *Client, CHAR Mode )
 } /* Client_ModeDel */
 
 
-GLOBAL CLIENT *Client_GetFromConn( CONN_ID Idx )
+GLOBAL CLIENT *
+Client_GetFromConn( CONN_ID Idx )
 {
 	/* Client-Struktur, die zur lokalen Verbindung Idx gehoert,
 	 * liefern. Wird keine gefunden, so wird NULL geliefert. */
@@ -474,39 +520,48 @@ GLOBAL CLIENT *Client_GetFromConn( CONN_ID Idx )
 	while( c )
 	{
 		if( c->conn_id == Idx ) return c;
-		c = c->next;
+		c = (CLIENT *)c->next;
 	}
 	return NULL;
 } /* Client_GetFromConn */
 
 
-GLOBAL CLIENT *Client_GetFromID( CHAR *Nick )
+GLOBAL CLIENT *
+Client_Search( CHAR *Nick )
 {
 	/* Client-Struktur, die den entsprechenden Nick hat, liefern.
 	 * Wird keine gefunden, so wird NULL geliefert. */
 
-	CHAR n[CLIENT_ID_LEN], *ptr;
+	CHAR search_id[CLIENT_ID_LEN], *ptr;
 	CLIENT *c = NULL;
+	UINT32 search_hash;
 
 	assert( Nick != NULL );
 
 	/* Nick kopieren und ggf. Host-Mask abschneiden */
-	strncpy( n, Nick, CLIENT_ID_LEN - 1 );
-	n[CLIENT_ID_LEN - 1] = '\0';
-	ptr = strchr( n, '!' );
+	strncpy( search_id, Nick, CLIENT_ID_LEN - 1 );
+	search_id[CLIENT_ID_LEN - 1] = '\0';
+	ptr = strchr( search_id, '!' );
 	if( ptr ) *ptr = '\0';
 
+	search_hash = Hash( search_id );
+
 	c = My_Clients;
 	while( c )
 	{
-		if( strcasecmp( c->id, n ) == 0 ) return c;
-		c = c->next;
+		if( c->hash == search_hash )
+		{
+			/* lt. Hash-Wert: Treffer! */
+			if( strcasecmp( c->id, search_id ) == 0 ) return c;
+		}
+		c = (CLIENT *)c->next;
 	}
 	return NULL;
-} /* Client_GetFromID */
+} /* Client_Search */
 
 
-GLOBAL CLIENT *Client_GetFromToken( CLIENT *Client, INT Token )
+GLOBAL CLIENT *
+Client_GetFromToken( CLIENT *Client, INT Token )
 {
 	/* Client-Struktur, die den entsprechenden Introducer (=Client)
 	 * und das gegebene Token hat, liefern. Wird keine gefunden,
@@ -521,27 +576,30 @@ GLOBAL CLIENT *Client_GetFromToken( CLIENT *Client, INT Token )
 	while( c )
 	{
 		if(( c->type == CLIENT_SERVER ) && ( c->introducer == Client ) && ( c->token == Token )) return c;
-		c = c->next;
+		c = (CLIENT *)c->next;
 	}
 	return NULL;
 } /* Client_GetFromToken */
 
 
-GLOBAL INT Client_Type( CLIENT *Client )
+GLOBAL INT
+Client_Type( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Client->type;
 } /* Client_Type */
 
 
-GLOBAL CONN_ID Client_Conn( CLIENT *Client )
+GLOBAL CONN_ID
+Client_Conn( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Client->conn_id;
 } /* Client_Conn */
 
 
-GLOBAL CHAR *Client_ID( CLIENT *Client )
+GLOBAL CHAR *
+Client_ID( CLIENT *Client )
 {
 	assert( Client != NULL );
 
@@ -554,71 +612,89 @@ GLOBAL CHAR *Client_ID( CLIENT *Client )
 } /* Client_ID */
 
 
-GLOBAL CHAR *Client_Info( CLIENT *Client )
+GLOBAL CHAR *
+Client_Info( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Client->info;
 } /* Client_Info */
 
 
-GLOBAL CHAR *Client_User( CLIENT *Client )
+GLOBAL CHAR *
+Client_User( CLIENT *Client )
 {
 	assert( Client != NULL );
-	if( Client->user ) return Client->user;
+	if( Client->user[0] ) return Client->user;
 	else return "~";
 } /* Client_User */
 
 
-GLOBAL CHAR *Client_Hostname( CLIENT *Client )
+GLOBAL CHAR *
+Client_Hostname( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Client->host;
 } /* Client_Hostname */
 
 
-GLOBAL CHAR *Client_Password( CLIENT *Client )
+GLOBAL CHAR *
+Client_Password( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Client->pwd;
 } /* Client_Password */
 
 
-GLOBAL CHAR *Client_Modes( CLIENT *Client )
+GLOBAL CHAR *
+Client_Modes( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Client->modes;
 } /* Client_Modes */
 
 
-GLOBAL BOOLEAN Client_OperByMe( CLIENT *Client )
+GLOBAL CHAR *
+Client_Flags( CLIENT *Client )
+{
+	assert( Client != NULL );
+	return Client->flags;
+} /* Client_Flags */
+
+
+GLOBAL BOOLEAN
+Client_OperByMe( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Client->oper_by_me;
 } /* Client_OperByMe */
 
 
-GLOBAL INT Client_Hops( CLIENT *Client )
+GLOBAL INT
+Client_Hops( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Client->hops;
 } /* Client_Hops */
 
 
-GLOBAL INT Client_Token( CLIENT *Client )
+GLOBAL INT
+Client_Token( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Client->token;
 } /* Client_Token */
 
 
-GLOBAL INT Client_MyToken( CLIENT *Client )
+GLOBAL INT
+Client_MyToken( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Client->mytoken;
 } /* Client_MyToken */
 
 
-GLOBAL CLIENT *Client_NextHop( CLIENT *Client )
+GLOBAL CLIENT *
+Client_NextHop( CLIENT *Client )
 {
 	CLIENT *c;
 	
@@ -630,7 +706,8 @@ GLOBAL CLIENT *Client_NextHop( CLIENT *Client )
 } /* Client_NextHop */
 
 
-GLOBAL CHAR *Client_Mask( CLIENT *Client )
+GLOBAL CHAR *
+Client_Mask( CLIENT *Client )
 {
 	/* Client-"ID" liefern, wie sie z.B. fuer
 	 * Prefixe benoetigt wird. */
@@ -639,33 +716,37 @@ GLOBAL CHAR *Client_Mask( CLIENT *Client )
 	
 	if( Client->type == CLIENT_SERVER ) return Client->id;
 
-	sprintf( GetID_Buffer, "%s!%s@%s", Client->id, Client->user, Client->host );
+	snprintf( GetID_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, Client->host );
 	return GetID_Buffer;
 } /* Client_Mask */
 
 
-GLOBAL CLIENT *Client_Introducer( CLIENT *Client )
+GLOBAL CLIENT *
+Client_Introducer( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Client->introducer;
 } /* Client_Introducer */
 
 
-GLOBAL CLIENT *Client_TopServer( CLIENT *Client )
+GLOBAL CLIENT *
+Client_TopServer( CLIENT *Client )
 {
 	assert( Client != NULL );
 	return Client->topserver;
 } /* Client_TopServer */
 
 
-GLOBAL BOOLEAN Client_HasMode( CLIENT *Client, CHAR Mode )
+GLOBAL BOOLEAN
+Client_HasMode( CLIENT *Client, CHAR Mode )
 {
 	assert( Client != NULL );
 	return strchr( Client->modes, Mode ) != NULL;
 } /* Client_HasMode */
 
 
-GLOBAL CHAR *Client_Away( CLIENT *Client )
+GLOBAL CHAR *
+Client_Away( CLIENT *Client )
 {
 	/* AWAY-Text liefern */
 
@@ -674,12 +755,11 @@ GLOBAL CHAR *Client_Away( CLIENT *Client )
 } /* Client_Away */
 
 
-GLOBAL BOOLEAN Client_CheckNick( CLIENT *Client, CHAR *Nick )
+GLOBAL BOOLEAN
+Client_CheckNick( CLIENT *Client, CHAR *Nick )
 {
 	/* Nick ueberpruefen */
 
-	CLIENT *c;
-	
 	assert( Client != NULL );
 	assert( Nick != NULL );
 	
@@ -691,23 +771,19 @@ GLOBAL BOOLEAN Client_CheckNick( CLIENT *Client, CHAR *Nick )
 	}
 
 	/* Nick bereits vergeben? */
-	c = My_Clients;
-	while( c )
+	if( Client_Search( Nick ))
 	{
-		if( strcasecmp( c->id, Nick ) == 0 )
-		{
-			/* den Nick gibt es bereits */
-			IRC_WriteStrClient( Client, ERR_NICKNAMEINUSE_MSG, Client_ID( Client ), Nick );
-			return FALSE;
-		}
-		c = c->next;
+		/* den Nick gibt es bereits */
+		IRC_WriteStrClient( Client, ERR_NICKNAMEINUSE_MSG, Client_ID( Client ), Nick );
+		return FALSE;
 	}
 
 	return TRUE;
 } /* Client_CheckNick */
 
 
-GLOBAL BOOLEAN Client_CheckID( CLIENT *Client, CHAR *ID )
+GLOBAL BOOLEAN
+Client_CheckID( CLIENT *Client, CHAR *ID )
 {
 	/* Nick ueberpruefen */
 
@@ -737,33 +813,15 @@ GLOBAL BOOLEAN Client_CheckID( CLIENT *Client, CHAR *ID )
 			Conn_Close( Client->conn_id, str, str, TRUE );
 			return FALSE;
 		}
-		c = c->next;
+		c = (CLIENT *)c->next;
 	}
 
 	return TRUE;
 } /* Client_CheckID */
 
 
-GLOBAL CLIENT *Client_Search( CHAR *ID )
-{
-	/* Client suchen, auf den ID passt */
-
-	CLIENT *c;
-
-	assert( ID != NULL );
-
-	c = My_Clients;
-	while( c )
-	{
-		if( strcasecmp( c->id, ID ) == 0 ) return c;
-		c = c->next;
-	}
-	
-	return NULL;
-} /* Client_Search */
-
-
-GLOBAL CLIENT *Client_First( VOID )
+GLOBAL CLIENT *
+Client_First( VOID )
 {
 	/* Ersten Client liefern. */
 
@@ -771,53 +829,71 @@ GLOBAL CLIENT *Client_First( VOID )
 } /* Client_First */
 
 
-GLOBAL CLIENT *Client_Next( CLIENT *c )
+GLOBAL CLIENT *
+Client_Next( CLIENT *c )
 {
 	/* Naechsten Client liefern. Existiert keiner,
 	 * so wird NULL geliefert. */
 
 	assert( c != NULL );
-	return c->next;
+	return (CLIENT *)c->next;
 } /* Client_Next */
 
 
-GLOBAL INT Client_UserCount( VOID )
+GLOBAL INT
+Client_UserCount( VOID )
 {
 	return Count( CLIENT_USER );
 } /* Client_UserCount */
 
 
-GLOBAL INT Client_ServiceCount( VOID )
+GLOBAL INT
+Client_ServiceCount( VOID )
 {
 	return Count( CLIENT_SERVICE );;
 } /* Client_ServiceCount */
 
 
-GLOBAL INT Client_ServerCount( VOID )
+GLOBAL INT
+Client_ServerCount( VOID )
 {
 	return Count( CLIENT_SERVER );
 } /* Client_ServerCount */
 
 
-GLOBAL INT Client_MyUserCount( VOID )
+GLOBAL INT
+Client_MyUserCount( VOID )
 {
 	return MyCount( CLIENT_USER );
 } /* Client_MyUserCount */
 
 
-GLOBAL INT Client_MyServiceCount( VOID )
+GLOBAL INT
+Client_MyServiceCount( VOID )
 {
 	return MyCount( CLIENT_SERVICE );
 } /* Client_MyServiceCount */
 
 
-GLOBAL INT Client_MyServerCount( VOID )
+GLOBAL INT
+Client_MyServerCount( VOID )
 {
-	return MyCount( CLIENT_SERVER );
+	CLIENT *c;
+	INT cnt;
+
+	cnt = 0;
+	c = My_Clients;
+	while( c )
+	{
+		if(( c->type == CLIENT_SERVER ) && ( c->hops == 1 )) cnt++;
+		c = (CLIENT *)c->next;
+	}
+	return cnt;
 } /* Client_MyServerCount */
 
 
-GLOBAL INT Client_OperCount( VOID )
+GLOBAL INT
+Client_OperCount( VOID )
 {
 	CLIENT *c;
 	INT cnt;
@@ -827,13 +903,14 @@ GLOBAL INT Client_OperCount( VOID )
 	while( c )
 	{
 		if( c && ( c->type == CLIENT_USER ) && ( strchr( c->modes, 'o' ))) cnt++;
-		c = c->next;
+		c = (CLIENT *)c->next;
 	}
 	return cnt;
 } /* Client_OperCount */
 
 
-GLOBAL INT Client_UnknownCount( VOID )
+GLOBAL INT
+Client_UnknownCount( VOID )
 {
 	CLIENT *c;
 	INT cnt;
@@ -843,20 +920,23 @@ GLOBAL INT Client_UnknownCount( VOID )
 	while( c )
 	{
 		if( c && ( c->type != CLIENT_USER ) && ( c->type != CLIENT_SERVICE ) && ( c->type != CLIENT_SERVER )) cnt++;
-		c = c->next;
+		c = (CLIENT *)c->next;
 	}
 	return cnt;
 } /* Client_UnknownCount */
 
 
-GLOBAL BOOLEAN Client_IsValidNick( CHAR *Nick )
+GLOBAL BOOLEAN
+Client_IsValidNick( CHAR *Nick )
 {
 	/* Ist der Nick gueltig? */
 
-	CHAR *ptr, 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;
@@ -873,7 +953,8 @@ GLOBAL BOOLEAN Client_IsValidNick( CHAR *Nick )
 } /* Client_IsValidNick */
 
 
-LOCAL INT Count( CLIENT_TYPE Type )
+LOCAL INT
+Count( CLIENT_TYPE Type )
 {
 	CLIENT *c;
 	INT cnt;
@@ -882,14 +963,15 @@ LOCAL INT Count( CLIENT_TYPE Type )
 	c = My_Clients;
 	while( c )
 	{
-		if( c && ( c->type == Type )) cnt++;
-		c = c->next;
+		if( c->type == Type ) cnt++;
+		c = (CLIENT *)c->next;
 	}
 	return cnt;
 } /* Count */
 
 
-LOCAL INT MyCount( CLIENT_TYPE Type )
+LOCAL INT
+MyCount( CLIENT_TYPE Type )
 {
 	CLIENT *c;
 	INT cnt;
@@ -898,14 +980,15 @@ LOCAL INT MyCount( CLIENT_TYPE Type )
 	c = My_Clients;
 	while( c )
 	{
-		if( c && ( c->introducer == This_Server ) && ( c->type == Type )) cnt++;
-		c = c->next;
+		if(( c->introducer == This_Server ) && ( c->type == Type )) cnt++;
+		c = (CLIENT *)c->next;
 	}
 	return cnt;
 } /* MyCount */
 
 
-LOCAL CLIENT *New_Client_Struct( VOID )
+LOCAL CLIENT *
+New_Client_Struct( VOID )
 {
 	/* Neue CLIENT-Struktur pre-initialisieren */
 	
@@ -914,11 +997,12 @@ LOCAL CLIENT *New_Client_Struct( VOID )
 	c = malloc( sizeof( CLIENT ));
 	if( ! c )
 	{
-		Log( LOG_EMERG, "Can't allocate memory!" );
+		Log( LOG_EMERG, "Can't allocate memory! [New_Client_Struct]" );
 		return NULL;
 	}
 
 	c->next = NULL;
+	c->hash = 0;
 	c->type = CLIENT_UNKNOWN;
 	c->conn_id = NONE;
 	c->introducer = NULL;
@@ -934,12 +1018,14 @@ LOCAL CLIENT *New_Client_Struct( VOID )
 	c->token = -1;
 	c->mytoken = -1;
 	strcpy( c->away, "" );
+	strcpy( c->flags, "" );
 
 	return c;
 } /* New_Client */
 
 
-LOCAL VOID Generate_MyToken( CLIENT *Client )
+LOCAL VOID
+Generate_MyToken( CLIENT *Client )
 {
 	CLIENT *c;
 	INT token;
@@ -955,7 +1041,7 @@ LOCAL VOID Generate_MyToken( CLIENT *Client )
 			c = My_Clients;
 			continue;
 		}
-		else c = c->next;
+		else c = (CLIENT *)c->next;
 	}
 	Client->mytoken = token;
 	Log( LOG_DEBUG, "Assigned token %d to server \"%s\".", token, Client->id );