X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fclient.c;h=917b230eb74edcc9be73d8518476d6cd1edb1a18;hp=c44b55ea3e82c75d95106c636a9f061a31454343;hb=dce77559fa6a0ad31b306615600957f024618587;hpb=f755190093cef4d8d2e69d667d85fc4a1db0049a

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index c44b55ea..917b230e 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.19 2002/01/04 01:21:22 alex Exp $
+ * $Id: client.c,v 1.46 2002/03/10 22:03:20 alex Exp $
  *
  * client.c: Management aller Clients
  *
@@ -21,6 +21,89 @@
  * Server gewesen, so existiert eine entsprechende CONNECTION-Struktur.
  *
  * $Log: client.c,v $
+ * Revision 1.46  2002/03/10 22:03:20  alex
+ * - Netz-Splits werden nun als soche ausgegeben.
+ *
+ * Revision 1.45  2002/03/10 17:15:20  alex
+ * - der Bindestrich ("-") ist nun auch in Nicknames erlaubt.
+ *
+ * Revision 1.44  2002/03/06 14:30:43  alex
+ * - ein paar assert()-Tests ergaenzt.
+ *
+ * Revision 1.43  2002/03/04 01:04:46  alex
+ * - neuen Clients mit Mode "a" wird nun auch der Default-Away-Text gesetzt.
+ *
+ * Revision 1.42  2002/03/03 17:17:01  alex
+ * - strncpy() und vsnprintf() kopieren nun etwas "optimierter" (1 Byte weniger) :-)
+ *
+ * Revision 1.41  2002/03/02 01:35:50  alex
+ * - Channel- und Nicknames werden nun ordentlich validiert.
+ *
+ * Revision 1.40  2002/02/27 23:23:53  alex
+ * - Includes fuer einige Header bereinigt.
+ *
+ * Revision 1.39  2002/02/27 18:22:09  alex
+ * - neue Funktion Client_SetAway() und Client_Away() implementiert.
+ *
+ * Revision 1.38  2002/02/27 14:47:53  alex
+ * - Logging beim Abmelden von Clients (erneut) geaendert: nun ist's aber gut ;-)
+ *
+ * Revision 1.37  2002/02/17 19:02:49  alex
+ * - Client_CheckNick() und Client_CheckID() lieferten u.U. falsche Ergebnisse.
+ *
+ * Revision 1.36  2002/02/06 16:49:41  alex
+ * - neue Funktion Client_IsValidNick(), Nicknames werden besser validiert.
+ *
+ * Revision 1.35  2002/01/29 00:14:49  alex
+ * - neue Funktion Client_TopServer(), Client_NewXXX() angepasst.
+ *
+ * Revision 1.34  2002/01/27 22:07:36  alex
+ * - Client_GetFromID() besser dokumentiert, kleinere Aenderungen.
+ *
+ * Revision 1.33  2002/01/27 21:56:54  alex
+ * - weitere Anpassungen an Chennals, v.a. ueber Server-Links.
+ *
+ * Revision 1.32  2002/01/27 18:27:12  alex
+ * - Client_GetFromID() kommt nun auch mit Host-Masken zurecht.
+ *
+ * Revision 1.31  2002/01/21 00:08:50  alex
+ * - wird ein Client entfernt, so wird er auch aus allen Channels geloescht.
+ *
+ * Revision 1.30  2002/01/18 15:32:01  alex
+ * - bei Client_SetModes() wurde das NULL-Byte falsch gesetzt. Opsa.
+ *
+ * Revision 1.29  2002/01/16 22:10:35  alex
+ * - neue Funktionen Client_xxxCount().
+ *
+ * Revision 1.28  2002/01/11 23:50:40  alex
+ * - Hop-Count fuer den Server selber (0) wird korrekt initialisiert.
+ *
+ * Revision 1.27  2002/01/09 01:08:08  alex
+ * - wird ein Server abgemeldet, so wird anderen Server ein SQUIT geschickt.
+ *
+ * Revision 1.26  2002/01/07 23:42:12  alex
+ * - Es werden fuer alle Server eigene Token generiert,
+ * - QUIT von einem Server fuer einen User wird an andere Server geforwarded,
+ * - ebenso NICK-Befehle, die "fremde" User einfuehren.
+ *
+ * Revision 1.25  2002/01/07 15:31:00  alex
+ * - Bei Log-Meldungen ueber Clients wird nun immer die "Client Mask" verwendet.
+ *
+ * Revision 1.24  2002/01/06 15:18:14  alex
+ * - Loglevel und Meldungen nochmals geaendert. Level passen nun besser.
+ *
+ * Revision 1.23  2002/01/05 23:26:05  alex
+ * - Vorbereitungen fuer Ident-Abfragen in Client-Strukturen.
+ *
+ * Revision 1.22  2002/01/05 20:08:17  alex
+ * - neue Funktion Client_NextHop().
+ *
+ * Revision 1.21  2002/01/05 19:15:03  alex
+ * - Fehlerpruefung bei select() in der "Hauptschleife" korrigiert.
+ *
+ * Revision 1.20  2002/01/04 17:57:08  alex
+ * - Client_Destroy() an Server-Links angepasst.
+ *
  * Revision 1.19  2002/01/04 01:21:22  alex
  * - Client-Strukturen koennen von anderen Modulen nun nur noch ueber die
  *   enstprechenden (zum Teil neuen) Funktionen angesprochen werden.
@@ -103,10 +186,11 @@
 #include "client.h"
 
 #include <imp.h>
+#include "ngircd.h"
 #include "channel.h"
 #include "conf.h"
 #include "conn.h"
-#include "irc.h"
+#include "irc-write.h"
 #include "log.h"
 #include "messages.h"
 
@@ -117,7 +201,11 @@ LOCAL CLIENT *This_Server, *My_Clients;
 LOCAL CHAR GetID_Buffer[CLIENT_ID_LEN];
 
 
+LOCAL INT Count( CLIENT_TYPE Type );
+LOCAL INT MyCount( CLIENT_TYPE Type );
+
 LOCAL CLIENT *New_Client_Struct( VOID );
+LOCAL VOID Generate_MyToken( CLIENT *Client );
 
 
 GLOBAL VOID Client_Init( VOID )
@@ -137,6 +225,8 @@ GLOBAL VOID Client_Init( VOID )
 	This_Server->type = CLIENT_SERVER;
 	This_Server->conn_id = NONE;
 	This_Server->introducer = This_Server;
+	This_Server->mytoken = 1;
+	This_Server->hops = 0;
 
 	gethostname( This_Server->host, CLIENT_HOST_LEN );
 	h = gethostbyname( This_Server->host );
@@ -154,7 +244,7 @@ GLOBAL VOID Client_Exit( VOID )
 	CLIENT *c, *next;
 	INT cnt;
 
-	Client_Destroy( This_Server );
+	Client_Destroy( This_Server, "Server going down.", NULL );
 	
 	cnt = 0;
 	c = My_Clients;
@@ -166,7 +256,7 @@ GLOBAL VOID Client_Exit( VOID )
 		c = next;
 	}
 	if( cnt ) Log( LOG_INFO, "Freed %d client structure%s.", cnt, cnt == 1 ? "" : "s" );
-} /* Client Exit */
+} /* Client_Exit */
 
 
 GLOBAL CLIENT *Client_ThisServer( VOID )
@@ -175,28 +265,28 @@ GLOBAL CLIENT *Client_ThisServer( VOID )
 } /* Client_ThisServer */
 
 
-GLOBAL CLIENT *Client_NewLocal( CONN_ID Idx, CHAR *Hostname, INT Type )
+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, Type, NULL, NULL, Hostname, NULL, 0, 0, NULL );
+	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, INT Hops, INT Token, CHAR *Info )
+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, CLIENT_SERVER, Hostname, NULL, Hostname, Info, Hops, Token, NULL );
+	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 )
+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, CLIENT_USER, Nick, User, Hostname, Info, Hops, Token, NULL );
+	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, INT Type, CHAR *ID, CHAR *User, CHAR *Hostname, CHAR *Info, INT Hops, INT Token, CHAR *Modes )
+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;
 
@@ -210,14 +300,19 @@ GLOBAL CLIENT *Client_New( CONN_ID Idx, CLIENT *Introducer, INT Type, CHAR *ID,
 	/* Initialisieren */
 	client->conn_id = Idx;
 	client->introducer = Introducer;
+	client->topserver = TopServer;
 	client->type = Type;
 	if( ID ) Client_SetID( client, ID );
-	if( User ) Client_SetUser( client, User );
+	if( User ) Client_SetUser( client, User, Idented );
 	if( Hostname ) Client_SetHostname( client, Hostname );
 	if( Info ) Client_SetInfo( client, Info );
 	client->hops = Hops;
 	client->token = Token;
 	if( Modes ) Client_SetModes( client, Modes );
+	if( Type == CLIENT_SERVER ) Generate_MyToken( client );
+
+	/* ist der User away? */
+	if( strchr( client->modes, 'a' )) strcpy( client->away, DEFAULT_AWAY_MSG );
 
 	/* Verketten */
 	client->next = My_Clients;
@@ -227,24 +322,94 @@ GLOBAL CLIENT *Client_New( CONN_ID Idx, CLIENT *Introducer, INT Type, CHAR *ID,
 } /* Client_New */
 
 
-GLOBAL VOID Client_Destroy( CLIENT *Client )
+GLOBAL VOID Client_Destroy( CLIENT *Client, CHAR *LogMsg, CHAR *FwdMsg )
 {
 	/* Client entfernen. */
 	
 	CLIENT *last, *c;
+	CHAR msg[LINE_LEN], *txt;
 
 	assert( Client != NULL );
-	
+
+	if( LogMsg ) txt = LogMsg;
+	else txt = FwdMsg;
+	if( ! txt ) txt = "Reason unknown.";
+
+	if( Client->type == CLIENT_SERVER )
+	{
+		/* Netz-Split-Nachricht vorbereiten */
+		sprintf( msg, "%s | %s", Client_ID( Client ), Client_ID( Client_TopServer( Client ) ? Client_TopServer( Client ) : Client_ThisServer( )));
+	}
+
 	last = NULL;
 	c = My_Clients;
 	while( c )
 	{
+		if(( Client->type == CLIENT_SERVER ) && ( c->introducer == Client ) && ( c != Client ))
+		{
+			/* der Client, der geloescht wird ist ein Server. Der Client, den wir gerade
+			 * pruefen, ist ein Child von diesem und muss daher auch entfernt werden */
+			Client_Destroy( c, NULL, msg);
+			last = NULL;
+			c = My_Clients;
+			continue;
+		}
 		if( c == Client )
 		{
+			/* Wir haben den Client gefunden: entfernen */
 			if( last ) last->next = c->next;
 			else My_Clients = c->next;
 
-			if( c->type == CLIENT_USER ) Log( LOG_NOTICE, "User \"%s!%s@%s\" exited (connection %d).", c->id, c->user, c->host, c->conn_id );
+			if( c->type == CLIENT_USER )
+			{
+				if( c->conn_id != NONE )
+				{
+					/* Ein lokaler User. Alle andere Server informieren! */
+					Log( LOG_NOTICE, "User \"%s\" unregistered (connection %d): %s", Client_Mask( c ), c->conn_id, txt );
+
+					if( FwdMsg ) IRC_WriteStrServersPrefix( NULL, c, "QUIT :%s", FwdMsg );
+					else IRC_WriteStrServersPrefix( NULL, c, "QUIT :" );
+				}
+				else
+				{
+					/* Remote User. 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. */
+					Log( LOG_DEBUG, "User \"%s\" unregistered: %s", Client_Mask( c ), txt );
+					
+					if( FwdMsg ) IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "QUIT :%s", FwdMsg );
+					else IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "QUIT :" );
+				}
+				Channel_RemoveClient( 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 );
+				}
+
+				/* andere Server informieren */
+				if( ! NGIRCd_Quit )
+				{
+					if( FwdMsg ) IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "SQUIT %s :%s", c->id, FwdMsg );
+					else IRC_WriteStrServersPrefix( Client_NextHop( c ), c, "SQUIT %s :", c->id );
+				}
+			}
+			else
+			{
+				if( c->conn_id != NONE )
+				{
+					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 );
+				}
+			}
 
 			free( c );
 			break;
@@ -260,7 +425,9 @@ GLOBAL VOID Client_SetHostname( CLIENT *Client, CHAR *Hostname )
 	/* Hostname eines Clients setzen */
 	
 	assert( Client != NULL );
-	strncpy( Client->host, Hostname, CLIENT_HOST_LEN );
+	assert( Hostname != NULL );
+	
+	strncpy( Client->host, Hostname, CLIENT_HOST_LEN - 1 );
 	Client->host[CLIENT_HOST_LEN - 1] = '\0';
 } /* Client_SetHostname */
 
@@ -270,17 +437,26 @@ GLOBAL VOID Client_SetID( CLIENT *Client, CHAR *ID )
 	/* Hostname eines Clients setzen */
 
 	assert( Client != NULL );
-	strncpy( Client->id, ID, CLIENT_ID_LEN );
+	assert( ID != NULL );
+	
+	strncpy( Client->id, ID, CLIENT_ID_LEN - 1 );
 	Client->id[CLIENT_ID_LEN - 1] = '\0';
 } /* Client_SetID */
 
 
-GLOBAL VOID Client_SetUser( CLIENT *Client, CHAR *User )
+GLOBAL VOID Client_SetUser( CLIENT *Client, CHAR *User, BOOLEAN Idented )
 {
 	/* Username eines Clients setzen */
 
 	assert( Client != NULL );
-	strncpy( Client->user, User, CLIENT_USER_LEN );
+	assert( User != NULL );
+	
+	if( Idented ) strncpy( Client->user, User, CLIENT_USER_LEN - 1 );
+	else
+	{
+		Client->user[0] = '~';
+		strncpy( Client->user + 1, User, CLIENT_USER_LEN - 2 );
+	}
 	Client->user[CLIENT_USER_LEN - 1] = '\0';
 } /* Client_SetUser */
 
@@ -290,7 +466,9 @@ GLOBAL VOID Client_SetInfo( CLIENT *Client, CHAR *Info )
 	/* Hostname eines Clients setzen */
 
 	assert( Client != NULL );
-	strncpy( Client->info, Info, CLIENT_INFO_LEN );
+	assert( Info != NULL );
+	
+	strncpy( Client->info, Info, CLIENT_INFO_LEN - 1 );
 	Client->info[CLIENT_INFO_LEN - 1] = '\0';
 } /* Client_SetInfo */
 
@@ -300,8 +478,10 @@ GLOBAL VOID Client_SetModes( CLIENT *Client, CHAR *Modes )
 	/* Hostname eines Clients setzen */
 
 	assert( Client != NULL );
-	strncpy( Client->modes, Modes, CLIENT_MODE_LEN );
-	Client->info[CLIENT_MODE_LEN - 1] = '\0';
+	assert( Modes != NULL );
+
+	strncpy( Client->modes, Modes, CLIENT_MODE_LEN - 1 );
+	Client->modes[CLIENT_MODE_LEN - 1] = '\0';
 } /* Client_SetModes */
 
 
@@ -310,15 +490,41 @@ GLOBAL VOID Client_SetPassword( CLIENT *Client, CHAR *Pwd )
 	/* Von einem Client geliefertes Passwort */
 
 	assert( Client != NULL );
-	strncpy( Client->pwd, Pwd, CLIENT_PASS_LEN );
+	assert( Pwd != NULL );
+	
+	strncpy( Client->pwd, Pwd, CLIENT_PASS_LEN - 1 );
 	Client->pwd[CLIENT_PASS_LEN - 1] = '\0';
 } /* Client_SetPassword */
 
 
+GLOBAL VOID Client_SetAway( CLIENT *Client, CHAR *Txt )
+{
+	/* Von einem Client gelieferte AWAY-Nachricht */
+
+	assert( Client != NULL );
+
+	if( Txt )
+	{
+		/* Client AWAY setzen */
+		strncpy( Client->away, Txt, CLIENT_AWAY_LEN - 1 );
+		Client->away[CLIENT_AWAY_LEN - 1] = '\0';
+		Client_ModeAdd( Client, 'a' );
+		Log( LOG_DEBUG, "User \"%s\" is away: %s", Client_Mask( Client ), Txt );
+	}
+	else
+	{
+		/* AWAY loeschen */
+		Client_ModeDel( Client, 'a' );
+		Log( LOG_DEBUG, "User \"%s\" is no longer away.", Client_Mask( Client ));
+	}
+} /* Client_SetAway */
+
+
 GLOBAL VOID Client_SetType( CLIENT *Client, INT Type )
 {
 	assert( Client != NULL );
 	Client->type = Type;
+	if( Type == CLIENT_SERVER ) Generate_MyToken( Client );
 } /* Client_SetType */
 
 
@@ -339,6 +545,7 @@ GLOBAL VOID Client_SetToken( CLIENT *Client, INT Token )
 GLOBAL VOID Client_SetIntroducer( CLIENT *Client, CLIENT *Introducer )
 {
 	assert( Client != NULL );
+	assert( Introducer != NULL );
 	Client->introducer = Introducer;
 } /* Client_SetIntroducer */
 
@@ -417,17 +624,24 @@ GLOBAL CLIENT *Client_GetFromConn( CONN_ID Idx )
 
 GLOBAL CLIENT *Client_GetFromID( CHAR *Nick )
 {
-	/* Client-Struktur, die den entsprechenden Nick hat,
-	* liefern. Wird keine gefunden, so wird NULL geliefert. */
+	/* Client-Struktur, die den entsprechenden Nick hat, liefern.
+	 * Wird keine gefunden, so wird NULL geliefert. */
 
-	CLIENT *c;
+	CHAR n[CLIENT_ID_LEN], *ptr;
+	CLIENT *c = NULL;
 
 	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, '!' );
+	if( ptr ) *ptr = '\0';
+
 	c = My_Clients;
 	while( c )
 	{
-		if( strcasecmp( c->id, Nick ) == 0 ) return c;
+		if( strcasecmp( c->id, n ) == 0 ) return c;
 		c = c->next;
 	}
 	return NULL;
@@ -473,6 +687,10 @@ GLOBAL CHAR *Client_ID( CLIENT *Client )
 {
 	assert( Client != NULL );
 
+#ifdef DEBUG
+	if( Client->type == CLIENT_USER ) assert( strlen( Client->id ) < CLIENT_NICK_LEN );
+#endif
+						   
 	if( Client->id[0] ) return Client->id;
 	else return "*";
 } /* Client_ID */
@@ -535,6 +753,25 @@ GLOBAL INT Client_Token( CLIENT *Client )
 } /* Client_Token */
 
 
+GLOBAL INT Client_MyToken( CLIENT *Client )
+{
+	assert( Client != NULL );
+	return Client->mytoken;
+} /* Client_MyToken */
+
+
+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;
+	return c;
+} /* Client_NextHop */
+
+
 GLOBAL CHAR *Client_Mask( CLIENT *Client )
 {
 	/* Client-"ID" liefern, wie sie z.B. fuer
@@ -556,6 +793,13 @@ GLOBAL CLIENT *Client_Introducer( CLIENT *Client )
 } /* Client_Introducer */
 
 
+GLOBAL CLIENT *Client_TopServer( CLIENT *Client )
+{
+	assert( Client != NULL );
+	return Client->topserver;
+} /* Client_TopServer */
+
+
 GLOBAL BOOLEAN Client_HasMode( CLIENT *Client, CHAR Mode )
 {
 	assert( Client != NULL );
@@ -563,6 +807,15 @@ GLOBAL BOOLEAN Client_HasMode( CLIENT *Client, CHAR Mode )
 } /* Client_HasMode */
 
 
+GLOBAL CHAR *Client_Away( CLIENT *Client )
+{
+	/* AWAY-Text liefern */
+
+	assert( Client != NULL );
+	return Client->away;
+} /* Client_Away */
+
+
 GLOBAL BOOLEAN Client_CheckNick( CLIENT *Client, CHAR *Nick )
 {
 	/* Nick ueberpruefen */
@@ -572,8 +825,12 @@ GLOBAL BOOLEAN Client_CheckNick( CLIENT *Client, CHAR *Nick )
 	assert( Client != NULL );
 	assert( Nick != NULL );
 	
-	/* Nick zu lang? */
-	if( strlen( Nick ) > CLIENT_NICK_LEN ) return IRC_WriteStrClient( Client, This_Server, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), Nick );
+	/* Nick ungueltig? */
+	if( ! Client_IsValidNick( Nick ))
+	{
+		IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), Nick );
+		return FALSE;
+	}
 
 	/* Nick bereits vergeben? */
 	c = My_Clients;
@@ -582,7 +839,7 @@ GLOBAL BOOLEAN Client_CheckNick( CLIENT *Client, CHAR *Nick )
 		if( strcasecmp( c->id, Nick ) == 0 )
 		{
 			/* den Nick gibt es bereits */
-			IRC_WriteStrClient( Client, This_Server, ERR_NICKNAMEINUSE_MSG, Client_ID( Client ), Nick );
+			IRC_WriteStrClient( Client, ERR_NICKNAMEINUSE_MSG, Client_ID( Client ), Nick );
 			return FALSE;
 		}
 		c = c->next;
@@ -604,7 +861,11 @@ GLOBAL BOOLEAN Client_CheckID( CLIENT *Client, CHAR *ID )
 	assert( ID != NULL );
 
 	/* Nick zu lang? */
-	if( strlen( ID ) > CLIENT_ID_LEN ) return IRC_WriteStrClient( Client, This_Server, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), ID );
+	if( strlen( ID ) > CLIENT_ID_LEN )
+	{
+		IRC_WriteStrClient( Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID( Client ), ID );
+		return FALSE;
+	}
 
 	/* ID bereits vergeben? */
 	c = My_Clients;
@@ -614,8 +875,8 @@ GLOBAL BOOLEAN Client_CheckID( CLIENT *Client, CHAR *ID )
 		{
 			/* die Server-ID gibt es bereits */
 			sprintf( str, "ID \"%s\" already registered!", ID );
-			Log( LOG_ALERT, "%s (on connection %d)", str, Client->conn_id );
-			Conn_Close( Client->conn_id, str );
+			Log( LOG_ERR, "%s (on connection %d)", str, Client->conn_id );
+			Conn_Close( Client->conn_id, str, str, TRUE );
 			return FALSE;
 		}
 		c = c->next;
@@ -662,12 +923,135 @@ GLOBAL CLIENT *Client_Next( CLIENT *c )
 } /* Client_Next */
 
 
+GLOBAL INT Client_UserCount( VOID )
+{
+	return Count( CLIENT_USER );
+} /* Client_UserCount */
+
+
+GLOBAL INT Client_ServiceCount( VOID )
+{
+	return Count( CLIENT_SERVICE );;
+} /* Client_ServiceCount */
+
+
+GLOBAL INT Client_ServerCount( VOID )
+{
+	return Count( CLIENT_SERVER );
+} /* Client_ServerCount */
+
+
+GLOBAL INT Client_MyUserCount( VOID )
+{
+	return MyCount( CLIENT_USER );
+} /* Client_MyUserCount */
+
+
+GLOBAL INT Client_MyServiceCount( VOID )
+{
+	return MyCount( CLIENT_SERVICE );
+} /* Client_MyServiceCount */
+
+
+GLOBAL INT Client_MyServerCount( VOID )
+{
+	return MyCount( CLIENT_SERVER );
+} /* Client_MyServerCount */
+
+
+GLOBAL INT Client_OperCount( VOID )
+{
+	CLIENT *c;
+	INT cnt;
+
+	cnt = 0;
+	c = My_Clients;
+	while( c )
+	{
+		if( c && ( c->type == CLIENT_USER ) && ( strchr( c->modes, 'o' ))) cnt++;
+		c = c->next;
+	}
+	return cnt;
+} /* Client_OperCount */
+
+
+GLOBAL INT Client_UnknownCount( VOID )
+{
+	CLIENT *c;
+	INT cnt;
+
+	cnt = 0;
+	c = My_Clients;
+	while( c )
+	{
+		if( c && ( c->type != CLIENT_USER ) && ( c->type != CLIENT_SERVICE ) && ( c->type != CLIENT_SERVER )) cnt++;
+		c = c->next;
+	}
+	return cnt;
+} /* Client_UnknownCount */
+
+
+GLOBAL BOOLEAN Client_IsValidNick( CHAR *Nick )
+{
+	/* Ist der Nick gueltig? */
+
+	CHAR *ptr, goodchars[] = ";0123456789-";
+	
+	assert( Nick != NULL );
+
+	if( Nick[0] == '#' ) return FALSE;
+	if( strchr( goodchars, Nick[0] )) return FALSE;
+	if( strlen( Nick ) >= CLIENT_NICK_LEN ) return FALSE;
+
+	ptr = Nick;
+	while( *ptr )
+	{
+		if(( *ptr < 'A' ) && ( ! strchr( goodchars, *ptr ))) return FALSE;
+		if(( *ptr > '}' ) && ( ! strchr( goodchars, *ptr ))) return FALSE;
+		ptr++;
+	}
+	
+	return TRUE;
+} /* Client_IsValidNick */
+
+
+LOCAL INT Count( CLIENT_TYPE Type )
+{
+	CLIENT *c;
+	INT cnt;
+
+	cnt = 0;
+	c = My_Clients;
+	while( c )
+	{
+		if( c && ( c->type == Type )) cnt++;
+		c = c->next;
+	}
+	return cnt;
+} /* Count */
+
+
+LOCAL INT MyCount( CLIENT_TYPE Type )
+{
+	CLIENT *c;
+	INT cnt;
+
+	cnt = 0;
+	c = My_Clients;
+	while( c )
+	{
+		if( c && ( c->introducer == This_Server ) && ( c->type == Type )) cnt++;
+		c = c->next;
+	}
+	return cnt;
+} /* MyCount */
+
+
 LOCAL CLIENT *New_Client_Struct( VOID )
 {
 	/* Neue CLIENT-Struktur pre-initialisieren */
 	
 	CLIENT *c;
-	INT i;
 	
 	c = malloc( sizeof( CLIENT ));
 	if( ! c )
@@ -680,19 +1064,44 @@ LOCAL CLIENT *New_Client_Struct( VOID )
 	c->type = CLIENT_UNKNOWN;
 	c->conn_id = NONE;
 	c->introducer = NULL;
+	c->topserver = NULL;
 	strcpy( c->id, "" );
 	strcpy( c->pwd, "" );
 	strcpy( c->host, "" );
 	strcpy( c->user, "" );
 	strcpy( c->info, "" );
-	for( i = 0; i < MAX_CHANNELS; c->channels[i++] = NULL );
 	strcpy( c->modes, "" );
 	c->oper_by_me = FALSE;
 	c->hops = -1;
 	c->token = -1;
+	c->mytoken = -1;
+	strcpy( c->away, "" );
 
 	return c;
 } /* New_Client */
 
 
+LOCAL VOID Generate_MyToken( CLIENT *Client )
+{
+	CLIENT *c;
+	INT token;
+
+	c = My_Clients;
+	token = 2;
+	while( c )
+	{
+		if( c->mytoken == token )
+		{
+			/* Das Token wurde bereits vergeben */
+			token++;
+			c = My_Clients;
+			continue;
+		}
+		else c = c->next;
+	}
+	Client->mytoken = token;
+	Log( LOG_DEBUG, "Assigned token %d to server \"%s\".", token, Client->id );
+} /* Generate_MyToken */
+
+
 /* -eof- */