X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fclient.c;h=46736cc01be35eff1f307c563b380d70eff76133;hp=1d08f47650ff02106191207d859bb503d7d2fbd8;hb=ad98f2c20d199f08714ed09fc3663516050cb4db;hpb=95a4b1b1587f33692830153d6d03081b5e51d172

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 1d08f476..46736cc0 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.52 2002/03/25 19:11:01 alex Exp $
+ * $Id: client.c,v 1.63 2002/11/26 08:36:34 alex Exp $
  *
  * client.c: Management aller Clients
  *
@@ -35,14 +35,16 @@
 #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"
@@ -51,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 LONG Count PARAMS(( CLIENT_TYPE Type ));
+LOCAL LONG 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;
 	
@@ -70,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 );
 	}
 
@@ -93,12 +99,14 @@ GLOBAL VOID Client_Init( VOID )
 } /* 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;
@@ -113,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;
 
@@ -176,7 +189,8 @@ GLOBAL CLIENT *Client_New( CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, I
 } /* 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. */
 	
@@ -239,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 */
@@ -279,7 +293,8 @@ GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN
 } /* Client_Destroy */
 
 
-GLOBAL VOID Client_SetHostname( CLIENT *Client, CHAR *Hostname )
+GLOBAL VOID
+Client_SetHostname( CLIENT *Client, CHAR *Hostname )
 {
 	/* Hostname eines Clients setzen */
 	
@@ -291,7 +306,8 @@ 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, Hash-Wert berechnen */
 
@@ -306,7 +322,8 @@ GLOBAL VOID Client_SetID( CLIENT *Client, CHAR *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 */
 
@@ -323,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 */
 
@@ -335,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 );
@@ -347,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->flags[CLIENT_FLAGS_LEN - 1] = '\0';
+} /* Client_SetFlags */
+
+
+GLOBAL VOID
+Client_SetPassword( CLIENT *Client, CHAR *Pwd )
 {
 	/* Von einem Client geliefertes Passwort */
 
@@ -359,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 */
 
@@ -382,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;
@@ -390,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 );
@@ -412,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
@@ -440,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
@@ -465,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. */
@@ -484,7 +526,8 @@ GLOBAL CLIENT *Client_GetFromConn( CONN_ID Idx )
 } /* Client_GetFromConn */
 
 
-GLOBAL CLIENT *Client_Search( CHAR *Nick )
+GLOBAL CLIENT *
+Client_Search( CHAR *Nick )
 {
 	/* Client-Struktur, die den entsprechenden Nick hat, liefern.
 	 * Wird keine gefunden, so wird NULL geliefert. */
@@ -517,7 +560,8 @@ GLOBAL CLIENT *Client_Search( CHAR *Nick )
 } /* 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,
@@ -538,21 +582,24 @@ GLOBAL CLIENT *Client_GetFromToken( CLIENT *Client, INT Token )
 } /* 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 );
 
@@ -565,14 +612,16 @@ 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[0] ) return Client->user;
@@ -580,56 +629,72 @@ GLOBAL CHAR *Client_User( CLIENT *Client )
 } /* 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;
 	
@@ -641,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. */
@@ -650,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 */
 
@@ -685,7 +755,8 @@ 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 */
 
@@ -711,7 +782,8 @@ GLOBAL BOOLEAN Client_CheckNick( CLIENT *Client, CHAR *Nick )
 } /* Client_CheckNick */
 
 
-GLOBAL BOOLEAN Client_CheckID( CLIENT *Client, CHAR *ID )
+GLOBAL BOOLEAN
+Client_CheckID( CLIENT *Client, CHAR *ID )
 {
 	/* Nick ueberpruefen */
 
@@ -748,7 +820,8 @@ GLOBAL BOOLEAN Client_CheckID( CLIENT *Client, CHAR *ID )
 } /* Client_CheckID */
 
 
-GLOBAL CLIENT *Client_First( VOID )
+GLOBAL CLIENT *
+Client_First( VOID )
 {
 	/* Ersten Client liefern. */
 
@@ -756,7 +829,8 @@ 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. */
@@ -766,46 +840,63 @@ GLOBAL CLIENT *Client_Next( CLIENT *c )
 } /* Client_Next */
 
 
-GLOBAL INT Client_UserCount( VOID )
+GLOBAL LONG
+Client_UserCount( VOID )
 {
 	return Count( CLIENT_USER );
 } /* Client_UserCount */
 
 
-GLOBAL INT Client_ServiceCount( VOID )
+GLOBAL LONG
+Client_ServiceCount( VOID )
 {
 	return Count( CLIENT_SERVICE );;
 } /* Client_ServiceCount */
 
 
-GLOBAL INT Client_ServerCount( VOID )
+GLOBAL LONG
+Client_ServerCount( VOID )
 {
 	return Count( CLIENT_SERVER );
 } /* Client_ServerCount */
 
 
-GLOBAL INT Client_MyUserCount( VOID )
+GLOBAL LONG
+Client_MyUserCount( VOID )
 {
 	return MyCount( CLIENT_USER );
 } /* Client_MyUserCount */
 
 
-GLOBAL INT Client_MyServiceCount( VOID )
+GLOBAL LONG
+Client_MyServiceCount( VOID )
 {
 	return MyCount( CLIENT_SERVICE );
 } /* Client_MyServiceCount */
 
 
-GLOBAL INT Client_MyServerCount( VOID )
+GLOBAL LONG
+Client_MyServerCount( VOID )
 {
-	return MyCount( CLIENT_SERVER );
+	CLIENT *c;
+	LONG 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 LONG
+Client_OperCount( VOID )
 {
 	CLIENT *c;
-	INT cnt;
+	LONG cnt;
 
 	cnt = 0;
 	c = My_Clients;
@@ -818,10 +909,11 @@ GLOBAL INT Client_OperCount( VOID )
 } /* Client_OperCount */
 
 
-GLOBAL INT Client_UnknownCount( VOID )
+GLOBAL LONG
+Client_UnknownCount( VOID )
 {
 	CLIENT *c;
-	INT cnt;
+	LONG cnt;
 
 	cnt = 0;
 	c = My_Clients;
@@ -834,14 +926,17 @@ GLOBAL INT Client_UnknownCount( VOID )
 } /* 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;
@@ -858,39 +953,42 @@ GLOBAL BOOLEAN Client_IsValidNick( CHAR *Nick )
 } /* Client_IsValidNick */
 
 
-LOCAL INT Count( CLIENT_TYPE Type )
+LOCAL LONG
+Count( CLIENT_TYPE Type )
 {
 	CLIENT *c;
-	INT cnt;
+	LONG cnt;
 
 	cnt = 0;
 	c = My_Clients;
 	while( c )
 	{
-		if( c && ( c->type == Type )) cnt++;
+		if( c->type == Type ) cnt++;
 		c = (CLIENT *)c->next;
 	}
 	return cnt;
 } /* Count */
 
 
-LOCAL INT MyCount( CLIENT_TYPE Type )
+LOCAL LONG
+MyCount( CLIENT_TYPE Type )
 {
 	CLIENT *c;
-	INT cnt;
+	LONG cnt;
 
 	cnt = 0;
 	c = My_Clients;
 	while( c )
 	{
-		if( c && ( c->introducer == This_Server ) && ( c->type == Type )) cnt++;
+		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 */
 	
@@ -899,7 +997,7 @@ 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;
 	}
 
@@ -920,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;