X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-login.c;h=594ddcc303d9c76bdbda8b737fbce76d85acc401;hp=46670536b501a8fa1db3dece23c3cba37491b10d;hb=5aa9c8f44cdee19b40440a61bc212ca6351117ca;hpb=0370c4843f3a837460b1c2f2db520f9f57b5ce3e

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 46670536..594ddcc3 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -9,46 +9,42 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc-login.c,v 1.2 2002/03/02 00:49:11 alex Exp $
+ * $Id: irc-login.c,v 1.18 2002/09/03 18:55:03 alex Exp $
  *
  * irc-login.c: Anmeldung und Abmeldung im IRC
- *
- * $Log: irc-login.c,v $
- * Revision 1.2  2002/03/02 00:49:11  alex
- * - Bei der USER-Registrierung wird NICK nicht mehr sofort geforwarded,
- *   sondern erst dann, wenn auch ein gueltiges USER empfangen wurde.
- *
- * Revision 1.1  2002/02/27 23:26:21  alex
- * - Modul aus irc.c bzw. irc.h ausgegliedert.
- *
  */
 
 
-#include <portab.h>
-#include "global.h"
+#include "portab.h"
 
-#include <imp.h>
+#include "imp.h"
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "ngircd.h"
+#include "resolve.h"
 #include "conf.h"
-#include "irc.h"
-#include "irc-write.h"
+#include "conn.h"
+#include "client.h"
+#include "channel.h"
 #include "log.h"
 #include "messages.h"
+#include "parse.h"
+#include "irc.h"
+#include "irc-write.h"
 
-#include <exp.h>
+#include "exp.h"
 #include "irc-login.h"
 
 
-LOCAL BOOLEAN Hello_User( CLIENT *Client );
-LOCAL VOID Kill_Nick( CHAR *Nick, CHAR *Reason );
+LOCAL BOOLEAN Hello_User PARAMS(( CLIENT *Client ));
+LOCAL VOID Kill_Nick PARAMS(( CHAR *Nick, CHAR *Reason ));
 
 
-GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_PASS( CLIENT *Client, REQUEST *Req )
 {
 	assert( Client != NULL );
 	assert( Req != NULL );
@@ -69,290 +65,65 @@ GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req )
 	}
 	else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 )))
 	{
+		CHAR *impl, *serverver, *flags, *ptr;
+		INT protohigh, protolow;
+
 		/* noch nicht registrierte Server-Verbindung */
 		Log( LOG_DEBUG, "Connection %d: got PASS command (new server link) ...", Client_Conn( Client ));
 
 		/* Passwort speichern */
 		Client_SetPassword( Client, Req->argv[0] );
 
-		Client_SetType( Client, CLIENT_GOTPASSSERVER );
-		return CONNECTED;
-	}
-	else if(( Client_Type( Client ) == CLIENT_UNKNOWN  ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER ))
-	{
-		/* Falsche Anzahl Parameter? */
-		return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-	}
-	else return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client ));
-} /* IRC_PASS */
-
-
-GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req )
-{
-	CHAR str[LINE_LEN], *ptr;
-	CLIENT *from, *c, *cl;
-	CL2CHAN *cl2chan;
-	INT max_hops, i;
-	CHANNEL *chan;
-	BOOLEAN ok;
-	
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	/* Fehler liefern, wenn kein lokaler Client */
-	if( Client_Conn( Client ) <= NONE ) return IRC_WriteStrClient( Client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( Client ), Req->command );
-
-	if( Client_Type( Client ) == CLIENT_GOTPASSSERVER )
-	{
-		/* Verbindung soll als Server-Server-Verbindung registriert werden */
-		Log( LOG_DEBUG, "Connection %d: got SERVER command (new server link) ...", Client_Conn( Client ));
-
-		/* Falsche Anzahl Parameter? */
-		if(( Req->argc != 2 ) && ( Req->argc != 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-		/* Ist dieser Server bei uns konfiguriert? */
-		for( i = 0; i < Conf_Server_Count; i++ ) if( strcasecmp( Req->argv[0], Conf_Server[i].name ) == 0 ) break;
-		if( i >= Conf_Server_Count )
-		{
-			/* Server ist nicht konfiguriert! */
-			Log( LOG_ERR, "Connection %d: Server \"%s\" not configured here!", Client_Conn( Client ), Req->argv[0] );
-			Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", TRUE );
-			return DISCONNECTED;
-		}
-		if( strcmp( Client_Password( Client ), Conf_Server[i].pwd ) != 0 )
+		/* Protokollversion ueberpruefen */
+		if( strlen( Req->argv[1] ) > 4 ) Req->argv[1][4] = '\0';
+		if( strlen( Req->argv[1] ) != 4 ) protohigh = protolow = 0;
+		else
 		{
-			/* Falsches Passwort */
-			Log( LOG_ERR, "Connection %d: Bad password for server \"%s\"!", Client_Conn( Client ), Req->argv[0] );
-			Conn_Close( Client_Conn( Client ), NULL, "Bad password", TRUE );
-			return DISCONNECTED;
+			protolow = atoi( &Req->argv[1][2] );
+			Req->argv[1][2] = '\0';
+			protohigh = atoi( Req->argv[1] );
 		}
-		
-		/* Ist ein Server mit dieser ID bereits registriert? */
-		if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED;
 
-		/* Server-Strukturen fuellen ;-) */
-		Client_SetID( Client, Req->argv[0] );
-		Client_SetHops( Client, 1 );
-		Client_SetInfo( Client, Req->argv[Req->argc - 1] );
-		
-		/* Meldet sich der Server bei uns an? */
-		if( Req->argc == 2 )
-		{
-			/* Unseren SERVER- und PASS-Befehl senden */
-			ok = TRUE;
-			if( ! IRC_WriteStrClient( Client, "PASS %s "PASSSERVERADD, Conf_Server[i].pwd )) ok = FALSE;
-			else ok = IRC_WriteStrClient( Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo );
-			if( ! ok )
-			{
-				Conn_Close( Client_Conn( Client ), "Unexpected server behavior!", NULL, FALSE );
-				return DISCONNECTED;
-			}
-			Client_SetIntroducer( Client, Client );
-			Client_SetToken( Client, 1 );
-		}
-		else  Client_SetToken( Client, atoi( Req->argv[1] ));
+		/* Implementation, Version und ngIRCd-Flags */
+		impl = Req->argv[2];
+		ptr = strchr( impl, '|' );
+		if( ptr ) *ptr = '\0';
 
-		Log( LOG_NOTICE, "Server \"%s\" registered (connection %d, 1 hop - direct link).", Client_ID( Client ), Client_Conn( Client ));
-
-		Client_SetType( Client, CLIENT_SERVER );
-
-		/* maximalen Hop Count ermitteln */
-		max_hops = 0;
-		c = Client_First( );
-		while( c )
-		{
-			if( Client_Hops( c ) > max_hops ) max_hops = Client_Hops( c );
-			c = Client_Next( c );
-		}
-		
-		/* Alle bisherigen Server dem neuen Server bekannt machen,
-		 * die bisherigen Server ueber den neuen informierenn */
-		for( i = 0; i < ( max_hops + 1 ); i++ )
+		if( strcmp( impl, PACKAGE ) == 0 )
 		{
-			c = Client_First( );
-			while( c )
+			/* auf der anderen Seite laeuft auch ein ngIRCd */
+			serverver = ptr + 1;
+			flags = strchr( serverver, ':' );
+			if( flags )
 			{
-				if(( Client_Type( c ) == CLIENT_SERVER ) && ( c != Client ) && ( c != Client_ThisServer( )) && ( Client_Hops( c ) == i ))
-				{
-					if( Client_Conn( c ) > NONE )
-					{
-						/* Dem gefundenen Server gleich den neuen
-						 * Server bekannt machen */
-						if( ! IRC_WriteStrClient( c, "SERVER %s %d %d :%s", Client_ID( Client ), Client_Hops( Client ) + 1, Client_MyToken( Client ), Client_Info( Client ))) return DISCONNECTED;
-					}
-					
-					/* Den neuen Server ueber den alten informieren */
-					if( ! IRC_WriteStrClientPrefix( Client, Client_Hops( c ) == 1 ? Client_ThisServer( ) : Client_Introducer( c ), "SERVER %s %d %d :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_MyToken( c ), Client_Info( c ))) return DISCONNECTED;
-				}
-				c = Client_Next( c );
+				*flags = '\0';
+				flags++;
 			}
+			else flags = "";
+			Log( LOG_INFO, "Connection %d: Peer announces itself as %s-%s (flags: \"%s\") using protocol version %d.%d.", Client_Conn( Client ), impl, serverver, flags, protohigh, protolow );
 		}
-
-		/* alle User dem neuen Server bekannt machen */
-		c = Client_First( );
-		while( c )
+		else
 		{
-			if( Client_Type( c ) == CLIENT_USER )
-			{
-				/* User an neuen Server melden */
-				if( ! IRC_WriteStrClient( Client, "NICK %s %d %s %s %d +%s :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_User( c ), Client_Hostname( c ), Client_MyToken( Client_Introducer( c )), Client_Modes( c ), Client_Info( c ))) return DISCONNECTED;
-			}
-			c = Client_Next( c );
+			serverver = flags = "";
+			Log( LOG_INFO, "Connection %d: Peer announces itself as server of type \"%s\" usinf protocol version %d.%d.", Client_Conn( Client ), impl, protohigh, protolow );
 		}
 
-		/* Channels dem neuen Server bekannt machen */
-		chan = Channel_First( );
-		while( chan )
-		{
-			sprintf( str, "NJOIN %s :", Channel_Name( chan ));
-
-			/* alle Member suchen */
-			cl2chan = Channel_FirstMember( chan );
-			while( cl2chan )
-			{
-				cl = Channel_GetClient( cl2chan );
-				assert( cl != NULL );
-
-				/* Nick, ggf. mit Modes, anhaengen */
-				if( str[strlen( str ) - 1] != ':' ) strcat( str, "," );
-				if( strchr( Channel_UserModes( chan, cl ), 'v' )) strcat( str, "+" );
-				if( strchr( Channel_UserModes( chan, cl ), 'o' )) strcat( str, "@" );
-				strcat( str, Client_ID( cl ));
-
-				if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
-				{
-					/* Zeile senden */
-					if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
-					sprintf( str, "NJOIN %s :", Channel_Name( chan ));
-				}
-				
-				cl2chan = Channel_NextMember( chan, cl2chan );
-			}
-
-			/* noch Daten da? */
-			if( str[strlen( str ) - 1] != ':')
-			{
-				/* Ja; Also senden ... */
-				if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
-			}
+		Client_SetType( Client, CLIENT_GOTPASSSERVER );
+		Client_SetFlags( Client, flags );
 
-			/* naechsten Channel suchen */
-			chan = Channel_Next( chan );
-		}
-		
 		return CONNECTED;
 	}
-	else if( Client_Type( Client ) == CLIENT_SERVER )
+	else if(( Client_Type( Client ) == CLIENT_UNKNOWN  ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER ))
 	{
-		/* Neuer Server wird im Netz angekuendigt */
-
 		/* Falsche Anzahl Parameter? */
-		if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-		/* Ist ein Server mit dieser ID bereits registriert? */
-		if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED;
-
-		/* Ueberfluessige Hostnamen aus Info-Text entfernen */
-		ptr = strchr( Req->argv[3] + 2, '[' );
-		if( ! ptr ) ptr = Req->argv[3];
-
-		from = Client_GetFromID( Req->prefix );
-		if( ! from )
-		{
-			/* Hm, Server, der diesen einfuehrt, ist nicht bekannt!? */
-			Log( LOG_ALERT, "Unknown ID in prefix of SERVER: \"%s\"! (on connection %d)", Req->prefix, Client_Conn( Client ));
-			Conn_Close( Client_Conn( Client ), NULL, "Unknown ID in prefix of SERVER", TRUE );
-			return DISCONNECTED;
-		}
-
-		/* Neue Client-Struktur anlegen */
-		c = Client_NewRemoteServer( Client, Req->argv[0], from, atoi( Req->argv[1] ), atoi( Req->argv[2] ), ptr, TRUE );
-		if( ! c )
-		{
-			/* Neue Client-Struktur konnte nicht angelegt werden */
-			Log( LOG_ALERT, "Can't create client structure for server! (on connection %d)", Client_Conn( Client ));
-			Conn_Close( Client_Conn( Client ), NULL, "Can't allocate client structure for remote server", TRUE );
-			return DISCONNECTED;
-		}
-
-		/* Log-Meldung zusammenbauen und ausgeben */
-		if(( Client_Hops( c ) > 1 ) && ( Req->prefix[0] )) sprintf( str, "connected to %s, ", Client_ID( from ));
-		else strcpy( str, "" );
-		Log( LOG_NOTICE, "Server \"%s\" registered (via %s, %s%d hop%s).", Client_ID( c ), Client_ID( Client ), str, Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" );
-
-		/* Andere Server informieren */
-		IRC_WriteStrServersPrefix( Client, from, "SERVER %s %d %d :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_MyToken( c ), Client_Info( c ));
-
-		return CONNECTED;
-	}
-	else return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-} /* IRC_SERVER */
-
-
-GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req )
-{
-	CHAR *channame, *ptr, modes[8];
-	BOOLEAN is_op, is_voiced;
-	CHANNEL *chan;
-	CLIENT *c;
-	
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( Client_Type( Client ) != CLIENT_SERVER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTEREDSERVER_MSG, Client_ID( Client ));
-
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-	channame = Req->argv[0];
-	ptr = strtok( Req->argv[1], "," );
-	while( ptr )
-	{
-		is_op = is_voiced = FALSE;
-		
-		/* Prefixe abschneiden */
-		while(( *ptr == '@' ) || ( *ptr == '+' ))
-		{
-			if( *ptr == '@' ) is_op = TRUE;
-			if( *ptr == '+' ) is_voiced = TRUE;
-			ptr++;
-		}
-
-		c = Client_GetFromID( ptr );
-		if( c )
-		{
-			Channel_Join( c, channame );
-			chan = Channel_Search( channame );
-			assert( chan != NULL );
-			
-			if( is_op ) Channel_UserModeAdd( chan, c, 'o' );
-			if( is_voiced ) Channel_UserModeAdd( chan, c, 'v' );
-
-			/* im Channel bekannt machen */
-			IRC_WriteStrChannelPrefix( Client, chan, c, FALSE, "JOIN :%s", channame );
-
-			/* Channel-User-Modes setzen */
-			strcpy( modes, Channel_UserModes( chan, c ));
-			if( modes[0] )
-			{
-				/* Modes im Channel bekannt machen */
-				IRC_WriteStrChannelPrefix( Client, chan, Client, FALSE, "MODE %s +%s %s", channame, modes, Client_ID( c ));
-			}
-		}
-		else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, channame );
-		
-		/* naechsten Nick suchen */
-		ptr = strtok( NULL, "," );
+		return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 	}
-
-	/* an andere Server weiterleiten */
-	IRC_WriteStrServersPrefix( Client, Client_ThisServer( ), "NJOIN %s :%s", Req->argv[0], Req->argv[1] );
-
-	return CONNECTED;
-} /* IRC_NJOIN */
+	else return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client ));
+} /* IRC_PASS */
 
 
-GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_NICK( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *intr_c, *target, *c;
 	CHAR *modes;
@@ -375,7 +146,7 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
 		/* "Ziel-Client" ermitteln */
 		if( Client_Type( Client ) == CLIENT_SERVER )
 		{
-			target = Client_GetFromID( Req->prefix );
+			target = Client_Search( Req->prefix );
 			if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] );
 		}
 		else
@@ -391,7 +162,7 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
 		 * wenn wir es nicht so machen. Ob es so okay ist? Hm ... */
 		if( strcmp( Client_ID( target ), Req->argv[0] ) == 0 ) return CONNECTED;
 #endif
-		
+
 		/* pruefen, ob Nick bereits vergeben. Speziallfall: der Client
 		 * will nur die Gross- und Kleinschreibung aendern. Das darf
 		 * er natuerlich machen :-) */
@@ -415,7 +186,16 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
 		else
 		{
 			/* Nick-Aenderung */
-			Log( LOG_INFO, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] );
+			if( Client_Conn( target ) > NONE )
+			{
+				/* lokaler Client */
+				Log( LOG_INFO, "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", Client_Mask( target ), Client_Conn( target ), Client_ID( target ), Req->argv[0] );
+			}
+			else
+			{
+				/* Remote-Client */
+				Log( LOG_DEBUG, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] );
+			}
 
 			/* alle betroffenen User und Server ueber Nick-Aenderung informieren */
 			if( Client_Type( Client ) == CLIENT_USER ) IRC_WriteStrClientPrefix( Client, Client, "NICK :%s", Req->argv[0] );
@@ -436,7 +216,7 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
 		if( Req->argc != 7 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
 		/* Nick ueberpruefen */
-		c = Client_GetFromID( Req->argv[0] );
+		c = Client_Search( Req->argv[0] );
 		if( c )
 		{
 			/* Der neue Nick ist auf diesem Server bereits registriert:
@@ -481,7 +261,8 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
 } /* IRC_NICK */
 
 
-GLOBAL BOOLEAN IRC_USER( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_USER( CLIENT *Client, REQUEST *Req )
 {
 	assert( Client != NULL );
 	assert( Req != NULL );
@@ -511,26 +292,15 @@ GLOBAL BOOLEAN IRC_USER( CLIENT *Client, REQUEST *Req )
 } /* IRC_USER */
 
 
-GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_QUIT( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *target;
 	
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if(( Client_Type( Client ) == CLIENT_USER ) || ( Client_Type( Client ) == CLIENT_SERVICE ))
-	{
-		/* User / Service */
-		
-		/* Falsche Anzahl Parameter? */
-		if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-		if( Req->argc == 0 ) Conn_Close( Client_Conn( Client ), "Got QUIT command.", NULL, TRUE );
-		else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], TRUE );
-		
-		return DISCONNECTED;
-	}
-	else if ( Client_Type( Client ) == CLIENT_SERVER )
+	if ( Client_Type( Client ) == CLIENT_SERVER )
 	{
 		/* Server */
 
@@ -540,69 +310,33 @@ GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req )
 		target = Client_Search( Req->prefix );
 		if( ! target )
 		{
-			Log( LOG_ERR, "Got QUIT from %s for unknown client!?", Client_ID( Client ));
+			/* Den Client kennen wir nicht (mehr), also nichts zu tun. */
+			Log( LOG_WARNING, "Got QUIT from %s for unknown client!?", Client_ID( Client ));
 			return CONNECTED;
 		}
 
-		if( Req->argc == 0 ) Client_Destroy( target, "Got QUIT command.", NULL );
-		else Client_Destroy( target, "Got QUIT command.", Req->argv[0] );
-
-		return CONNECTED;
-	}
-	else return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
-} /* IRC_QUIT */
-
-
-GLOBAL BOOLEAN IRC_SQUIT( CLIENT *Client, REQUEST *Req )
-{
-	CLIENT *target;
-	CHAR msg[LINE_LEN + 64];
-	
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	/* SQUIT ist nur fuer Server erlaubt */
-	if( Client_Type( Client ) != CLIENT_SERVER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
-
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-	Log( LOG_DEBUG, "Got SQUIT from %s for \"%s\": \"%s\" ...", Client_ID( Client ), Req->argv[0], Req->argv[1] );
-	
-	/* SQUIT an alle Server weiterleiten */
-	IRC_WriteStrServers( Client, "SQUIT %s :%s", Req->argv[0], Req->argv[1] );
+		if( Req->argc == 0 ) Client_Destroy( target, "Got QUIT command.", NULL, TRUE );
+		else Client_Destroy( target, "Got QUIT command.", Req->argv[0], TRUE );
 
-	target = Client_GetFromID( Req->argv[0] );
-	if( ! target )
-	{
-		Log( LOG_ERR, "Got SQUIT from %s for unknown server \"%s\"!?", Client_ID( Client ), Req->argv[0] );
 		return CONNECTED;
 	}
-
-	if( Req->argv[1][0] )
+	else
 	{
-		if( strlen( Req->argv[1] ) > LINE_LEN ) Req->argv[1][LINE_LEN] = '\0';
-		sprintf( msg, "%s (SQUIT from %s).", Req->argv[1], Client_ID( Client ));
-	}
-	else sprintf( msg, "Got SQUIT from %s.", Client_ID( Client ));
+		/* User, Service, oder noch nicht registriert */
+		
+		/* Falsche Anzahl Parameter? */
+		if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-	if( Client_Conn( target ) > NONE )
-	{
-		/* dieser Server hat die Connection */
-		if( Req->argv[1][0] ) Conn_Close( Client_Conn( target ), msg, Req->argv[1], TRUE );
-		else Conn_Close( Client_Conn( target ), msg, NULL, TRUE );
+		if( Req->argc == 0 ) Conn_Close( Client_Conn( Client ), "Got QUIT command.", NULL, TRUE );
+		else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], TRUE );
+		
 		return DISCONNECTED;
 	}
-	else
-	{
-		/* Verbindung hielt anderer Server */
-		Client_Destroy( target, msg, Req->argv[1] );
-		return CONNECTED;
-	}
-} /* IRC_SQUIT */
+} /* IRC_QUIT */
 
 
-GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_PING( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *target, *from;
 
@@ -613,17 +347,19 @@ GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req )
 
 	/* Falsche Anzahl Parameter? */
 	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client ));
+#ifdef STRICT_RFC
 	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+#endif
 
-	if( Req->argc == 2 )
+	if( Req->argc > 1 )
 	{
 		/* es wurde ein Ziel-Client angegeben */
-		target = Client_GetFromID( Req->argv[1] );
+		target = Client_Search( Req->argv[1] );
 		if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
 		if( target != Client_ThisServer( ))
 		{
 			/* ok, forwarden */
-			if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+			if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
 			else from = Client;
 			if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
 			return IRC_WriteStrClientPrefix( target, from, "PING %s :%s", Client_ID( from ), Req->argv[1] );
@@ -635,7 +371,8 @@ GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req )
 } /* IRC_PING */
 
 
-GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN
+IRC_PONG( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *target, *from;
 
@@ -651,12 +388,12 @@ GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req )
 	/* forwarden? */
 	if( Req->argc == 2 )
 	{
-		target = Client_GetFromID( Req->argv[1] );
+		target = Client_Search( Req->argv[1] );
 		if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
 		if( target != Client_ThisServer( ))
 		{
 			/* ok, forwarden */
-			if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+			if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
 			else from = Client;
 			if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
 			return IRC_WriteStrClientPrefix( target, from, "PONG %s :%s", Client_ID( from ), Req->argv[1] );
@@ -664,7 +401,7 @@ GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req )
 	}
 
 	/* Der Connection-Timestamp wurde schon beim Lesen aus dem Socket
-		* aktualisiert, daher muss das hier nicht mehr gemacht werden. */
+	 * aktualisiert, daher muss das hier nicht mehr gemacht werden. */
 
 	if( Client_Conn( Client ) > NONE ) Log( LOG_DEBUG, "Connection %d: received PONG. Lag: %ld seconds.", Client_Conn( Client ), time( NULL ) - Conn_LastPing( Client_Conn( Client )));
 	else Log( LOG_DEBUG, "Connection %d: received PONG.", Client_Conn( Client ));
@@ -673,7 +410,8 @@ GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req )
 } /* IRC_PONG */
 
 
-LOCAL BOOLEAN Hello_User( CLIENT *Client )
+LOCAL BOOLEAN
+Hello_User( CLIENT *Client )
 {
 	assert( Client != NULL );
 
@@ -692,9 +430,9 @@ LOCAL BOOLEAN Hello_User( CLIENT *Client )
 	IRC_WriteStrServers( NULL, "NICK %s 1 %s %s 1 +%s :%s", Client_ID( Client ), Client_User( Client ), Client_Hostname( Client ), Client_Modes( Client ), Client_Info( Client ));
 
 	if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return FALSE;
-	if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return FALSE;
+	if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, TARGET_CPU, TARGET_CPU, TARGET_OS )) return FALSE;
 	if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return FALSE;
-	if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return FALSE;
+	if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, USERMODES, CHANMODES )) return FALSE;
 
 	Client_SetType( Client, CLIENT_USER );
 
@@ -705,7 +443,8 @@ LOCAL BOOLEAN Hello_User( CLIENT *Client )
 } /* Hello_User */
 
 
-LOCAL VOID Kill_Nick( CHAR *Nick, CHAR *Reason )
+LOCAL VOID
+Kill_Nick( CHAR *Nick, CHAR *Reason )
 {
 	CLIENT *c;
 
@@ -718,7 +457,7 @@ LOCAL VOID Kill_Nick( CHAR *Nick, CHAR *Reason )
 	IRC_WriteStrServers( NULL, "KILL %s :%s", Nick, Reason );
 
 	/* Ggf. einen eigenen Client toeten */
-	c = Client_GetFromID( Nick );
+	c = Client_Search( Nick );
 	if( c && ( Client_Conn( c ) != NONE )) Conn_Close( Client_Conn( c ), NULL, Reason, TRUE );
 } /* Kill_Nick */