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=7d6e07d04c58402a4a420e897823bb32363e5623;hp=68bb84d87d9ee4bca4e58b8bc96e5c67f66e07d2;hb=48326e061aacd954e24f76c53ded10448cbc28eb;hpb=f56a1bdf20a54bf2ee92bde9c9d3b6b1595b8934

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 68bb84d8..7d6e07d0 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -1,256 +1,359 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
  *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * Login and logout
  */
 
-
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-login.c,v 1.42 2005/03/21 22:22:09 alex Exp $";
+/**
+ * @file
+ * Login and logout
+ */
 
 #include "imp.h"
 #include <assert.h>
-#include <stdio.h>
+#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 
-#include "ngircd.h"
-#include "resolve.h"
 #include "conn-func.h"
+#include "class.h"
 #include "conf.h"
-#include "client.h"
 #include "channel.h"
 #include "log.h"
+#include "login.h"
 #include "messages.h"
 #include "parse.h"
 #include "irc.h"
 #include "irc-info.h"
 #include "irc-write.h"
-#include "cvs-version.h"
 
 #include "exp.h"
 #include "irc-login.h"
 
+static void Kill_Nick PARAMS(( char *Nick, char *Reason ));
 
-LOCAL bool Hello_User PARAMS(( CLIENT *Client ));
-LOCAL void Kill_Nick PARAMS(( char *Nick, char *Reason ));
-
-
+/**
+ * Handler for the IRC "PASS" command.
+ *
+ * See RFC 2813 section 4.1.1, and RFC 2812 section 3.1.1.
+ *
+ * @param Client	The client from which this command has been received.
+ * @param Req		Request structure with prefix and all parameters.
+ * @returns		CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_PASS( CLIENT *Client, REQUEST *Req )
 {
+	char *type, *orig_flags;
+	int protohigh, protolow;
+
 	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_UNKNOWN ) && ( Req->argc == 1))
-	{
-		/* noch nicht registrierte unbekannte Verbindung */
-		Log( LOG_DEBUG, "Connection %d: got PASS command ...", Client_Conn( Client ));
+	/* Return an error if this is not a local client */
+	if (Client_Conn(Client) <= NONE)
+		return IRC_WriteStrClient(Client, ERR_UNKNOWNCOMMAND_MSG,
+					  Client_ID(Client), Req->command);
+
+	if (Client_Type(Client) == CLIENT_UNKNOWN && Req->argc == 1) {
+		/* Not yet registered "unknown" connection, PASS with one
+		 * argument: either a regular client, service, or server
+		 * using the old RFC 1459 section 4.1.1 syntax. */
+		LogDebug("Connection %d: got PASS command (RFC 1459) ...",
+			 Client_Conn(Client));
+	} else if ((Client_Type(Client) == CLIENT_UNKNOWN ||
+		    Client_Type(Client) == CLIENT_UNKNOWNSERVER) &&
+		   (Req->argc == 3 || Req->argc == 4)) {
+		/* Not yet registered "unknown" connection or outgoing server
+		 * link, PASS with three or four argument: server using the
+		 * RFC 2813 section 4.1.1 syntax. */
+		LogDebug("Connection %d: got PASS command (RFC 2813, new server link) ...",
+			 Client_Conn(Client));
+	} else if (Client_Type(Client) == CLIENT_UNKNOWN ||
+		   Client_Type(Client) == CLIENT_UNKNOWNSERVER) {
+		/* Unregistered connection, but wrong number of arguments: */
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
+	} else {
+		/* Registered connection, PASS command is not allowed! */
+		return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG,
+					  Client_ID(Client));
+	}
 
-		/* Passwort speichern */
-		Client_SetPassword( Client, Req->argv[0] );
+	Conn_SetPassword(Client_Conn(Client), Req->argv[0]);
 
-		Client_SetType( Client, CLIENT_GOTPASS );
-		return CONNECTED;
+	/* Protocol version */
+	if (Req->argc >= 2 && strlen(Req->argv[1]) >= 4) {
+		int c2, c4;
+
+		c2 = Req->argv[1][2];
+		c4 = Req->argv[1][4];
+
+		Req->argv[1][4] = '\0';
+		protolow = atoi(&Req->argv[1][2]);
+		Req->argv[1][2] = '\0';
+		protohigh = atoi(Req->argv[1]);
+
+		Req->argv[1][2] = c2;
+		Req->argv[1][4] = c4;
+
+		Client_SetType(Client, CLIENT_GOTPASS_2813);
+	} else {
+		protohigh = protolow = 0;
+		Client_SetType(Client, CLIENT_GOTPASS);
 	}
-	else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 )))
-	{
-		char c2, c4, *type, *impl, *serverver, *flags, *ptr, *ircflags;
-		int protohigh, protolow;
 
-		/* noch nicht registrierte Server-Verbindung */
-		Log( LOG_DEBUG, "Connection %d: got PASS command (new server link) ...", Client_Conn( Client ));
+	/* Protocol type, see doc/Protocol.txt */
+	if (Req->argc >= 2 && strlen(Req->argv[1]) > 4)
+		type = &Req->argv[1][4];
+	else
+		type = NULL;
 
-		/* Passwort speichern */
-		Client_SetPassword( Client, Req->argv[0] );
+	/* Protocol flags/options */
+	if (Req->argc >= 4)
+		orig_flags = Req->argv[3];
+	else
+		orig_flags = "";
 
-		/* Protokollversion ermitteln */
-		if( strlen( Req->argv[1] ) >= 4 )
-		{
-			c2 = Req->argv[1][2];
-			c4 = Req->argv[1][4];
-
-			Req->argv[1][4] = '\0';
-			protolow = atoi( &Req->argv[1][2] );
-			Req->argv[1][2] = '\0';
-			protohigh = atoi( Req->argv[1] );
-			
-			Req->argv[1][2] = c2;
-			Req->argv[1][4] = c4;
-		}			
-		else protohigh = protolow = 0;
-
-		/* Protokoll-Typ */
-		if( strlen( Req->argv[1] ) > 4 ) type = &Req->argv[1][4];
-		else type = NULL;
-
-		/* IRC-Flags (nach RFC 2813) */
-		if( Req->argc >= 4 ) ircflags = Req->argv[3];
-		else ircflags = "";
-
-		/* Implementation, Version und ngIRCd-Flags */
-		impl = Req->argv[2];
-		ptr = strchr( impl, '|' );
-		if( ptr ) *ptr = '\0';
+	/* Implementation, version and IRC+ flags */
+	if (Req->argc >= 3) {
+		char *impl, *ptr, *serverver, *flags;
 
-		if( type && ( strcmp( type, PROTOIRCPLUS ) == 0 ))
-		{
-			/* auf der anderen Seite laeuft ein Server, der
-			 * ebenfalls das IRC+-Protokoll versteht */
-			serverver = ptr + 1;
-			flags = strchr( serverver, ':' );
-			if( flags )
-			{
+		impl = Req->argv[2];
+		ptr = strchr(impl, '|');
+		if (ptr)
+			*ptr = '\0';
+
+		if (type && strcmp(type, PROTOIRCPLUS) == 0) {
+			/* The peer seems to be a server which supports the
+			 * IRC+ protocol (see doc/Protocol.txt). */
+			serverver = ptr ? ptr + 1 : "?";
+			flags = strchr(ptr ? serverver : impl, ':');
+			if (flags) {
 				*flags = '\0';
 				flags++;
-			}
-			else flags = "";
-			Log( LOG_INFO, "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", impl, serverver, protohigh, protolow, flags );
-		}
-		else
-		{
-			/* auf der anderen Seite laeuft ein Server, der
-			 * nur das Originalprotokoll unterstuetzt */
-			serverver = "";
-			if( strchr( ircflags, 'Z' )) flags = "Z";
-			else flags = "";
-			Log( LOG_INFO, "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", impl, protohigh, protolow, flags );
+			} else
+				flags = "";
+			Log(LOG_INFO,
+			    "Peer on conenction %d announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").",
+			    Client_Conn(Client), impl, serverver,
+			    protohigh, protolow, flags);
+		} else {
+			/* The peer seems to be a server supporting the
+			 * "original" IRC protocol (RFC 2813). */
+			if (strchr(orig_flags, 'Z'))
+				flags = "Z";
+			else
+				flags = "";
+			Log(LOG_INFO,
+			    "Peer on connection %d announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").",
+			    Client_Conn(Client), impl,
+			    protohigh, protolow, flags);
 		}
-
-		Client_SetType( Client, CLIENT_GOTPASSSERVER );
-		Client_SetFlags( Client, flags );
-
-		return CONNECTED;
+		Client_SetFlags(Client, flags);
 	}
-	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 ));
+
+	return CONNECTED;
 } /* IRC_PASS */
 
 
+/**
+ * Handler for the IRC "NICK" command.
+ *
+ * See RFC 2812, 3.1.2 "Nick message", and RFC 2813, 4.1.3 "Nick".
+ *
+ * This function implements the IRC command "NICK" which is used to register
+ * with the server, to change already registered nicknames and to introduce
+ * new users which are connected to other servers.
+ *
+ * @param Client	The client from which this command has been received.
+ * @param Req		Request structure with prefix and all parameters.
+ * @returns		CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_NICK( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *intr_c, *target, *c;
-	char *modes;
+	char *nick, *user, *hostname, *modes, *info;
+	int token, hops;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Zumindest BitchX sendet NICK-USER in der falschen Reihenfolge. */
+	/* Some IRC clients, for example BitchX, send the NICK and USER
+	 * commands in the wrong order ... */
+	if(Client_Type(Client) == CLIENT_UNKNOWN
+	    || Client_Type(Client) == CLIENT_GOTPASS
+	    || Client_Type(Client) == CLIENT_GOTNICK
 #ifndef STRICT_RFC
-	if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTUSER || Client_Type( Client ) == CLIENT_USER || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
-#else
-	if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_USER || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
+	    || Client_Type(Client) == CLIENT_GOTUSER
 #endif
+	    || Client_Type(Client) == CLIENT_USER
+	    || Client_Type(Client) == CLIENT_SERVICE
+	    || (Client_Type(Client) == CLIENT_SERVER && Req->argc == 1))
 	{
-		/* User-Registrierung bzw. Nick-Aenderung */
+		/* User registration or change of nickname */
 
-		/* Falsche Anzahl Parameter? */
-		if( Req->argc != 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+		/* Wrong number of arguments? */
+		if( Req->argc != 1 )
+			return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG,
+						   Client_ID( Client ),
+						   Req->command );
 
-		/* "Ziel-Client" ermitteln */
+		/* Search "target" client */
 		if( Client_Type( Client ) == CLIENT_SERVER )
 		{
 			target = Client_Search( Req->prefix );
-			if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] );
+			if( ! target )
+				return IRC_WriteStrClient( Client,
+							   ERR_NOSUCHNICK_MSG,
+							   Client_ID( Client ),
+							   Req->argv[0] );
 		}
 		else
 		{
-			/* Ist der Client "restricted"? */
-			if( Client_HasMode( Client, 'r' )) return IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client ));
+			/* Is this a restricted client? */
+			if( Client_HasMode( Client, 'r' ))
+				return IRC_WriteStrClient( Client,
+							   ERR_RESTRICTED_MSG,
+							   Client_ID( Client ));
+
 			target = Client;
 		}
 
 #ifndef STRICT_RFC
-		/* Wenn der Client zu seinem eigenen Nick wechseln will, so machen
-		 * wir nichts. So macht es das Original und mind. Snak hat probleme,
-		 * wenn wir es nicht so machen. Ob es so okay ist? Hm ... */
-		if( strcmp( Client_ID( target ), Req->argv[0] ) == 0 ) return CONNECTED;
+		/* If the clients tries to change to its own nickname we won't
+		 * do anything. This is how the original ircd behaves and some
+		 * clients (for example Snak) expect it to be like this.
+		 * But I doubt that this is "really the right thing" ... */
+		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 :-) */
+		/* Check that the new nickname is available. Special case:
+		 * the client only changes from/to upper to lower case. */
 		if( strcasecmp( Client_ID( target ), Req->argv[0] ) != 0 )
 		{
-			if( ! Client_CheckNick( target, Req->argv[0] )) return CONNECTED;
+			if( ! Client_CheckNick( target, Req->argv[0] ))
+				return CONNECTED;
 		}
 
-		if(( Client_Type( target ) != CLIENT_USER ) && ( Client_Type( target ) != CLIENT_SERVER ))
-		{
-			/* Neuer Client */
-			Log( LOG_DEBUG, "Connection %d: got valid NICK command ...", Client_Conn( Client ));
+		if (Client_Type(target) != CLIENT_USER &&
+		    Client_Type(target) != CLIENT_SERVICE &&
+		    Client_Type(target) != CLIENT_SERVER) {
+			/* New client */
+			LogDebug("Connection %d: got valid NICK command ...",
+			     Client_Conn( Client ));
 
-			/* Client-Nick registrieren */
+			/* Register new nickname of this client */
 			Client_SetID( target, Req->argv[0] );
 
-			/* schon ein USER da? Dann registrieren! */
-			if( Client_Type( Client ) == CLIENT_GOTUSER ) return Hello_User( Client );
-			else Client_SetType( Client, CLIENT_GOTNICK );
-		}
-		else
-		{
-			/* Nick-Aenderung */
-			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] );
+#ifndef STRICT_RFC
+			if (Conf_AuthPing) {
+				Conn_SetAuthPing(Client_Conn(Client), rand());
+				IRC_WriteStrClient(Client, "PING :%ld",
+					Conn_GetAuthPing(Client_Conn(Client)));
+				LogDebug("Connection %d: sent AUTH PING %ld ...",
+					Client_Conn(Client),
+					Conn_GetAuthPing(Client_Conn(Client)));
 			}
+#endif
+
+			/* If we received a valid USER command already then
+			 * register the new client! */
+			if( Client_Type( Client ) == CLIENT_GOTUSER )
+				return Login_User( Client );
 			else
-			{
-				/* Remote-Client */
-				Log( LOG_DEBUG, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] );
+				Client_SetType( Client, CLIENT_GOTNICK );
+		} else {
+			/* Nickname change */
+			if (Client_Conn(target) > NONE) {
+				/* Local client */
+				Log(LOG_INFO,
+				    "%s \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".",
+				    Client_TypeText(target), Client_Mask(target),
+				    Client_Conn(target), Client_ID(target),
+				    Req->argv[0]);
+				Conn_UpdateIdle(Client_Conn(target));
+			} else {
+				/* Remote client */
+				LogDebug("%s \"%s\" changed nick: \"%s\" -> \"%s\".",
+					 Client_TypeText(target),
+					 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] );
-			IRC_WriteStrServersPrefix( Client, target, "NICK :%s", Req->argv[0] );
-			IRC_WriteStrRelatedPrefix( target, target, false, "NICK :%s", Req->argv[0] );
-			
-			/* neuen Client-Nick speichern */
+			/* Inform all users and servers (which have to know)
+			 * of this nickname change */
+			if( Client_Type( Client ) == CLIENT_USER )
+				IRC_WriteStrClientPrefix( Client, Client,
+							  "NICK :%s",
+							  Req->argv[0] );
+			IRC_WriteStrServersPrefix( Client, target,
+						   "NICK :%s", Req->argv[0] );
+			IRC_WriteStrRelatedPrefix( target, target, false,
+						   "NICK :%s", Req->argv[0] );
+
+			/* Register old nickname for WHOWAS queries */
+			Client_RegisterWhowas( target );
+
+			/* Save new nickname */
 			Client_SetID( target, Req->argv[0] );
+
 			IRC_SetPenalty( target, 2 );
 		}
 
 		return CONNECTED;
-	}
-	else if( Client_Type( Client ) == CLIENT_SERVER )
-	{
-		/* Server fuehrt neuen Client ein */
-
-		/* Falsche Anzahl Parameter? */
-		if( Req->argc != 7 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+	} else if(Client_Type(Client) == CLIENT_SERVER ||
+		  Client_Type(Client) == CLIENT_SERVICE) {
+		/* Server or service introduces new client */
+
+		/* Bad number of parameters? */
+		if (Req->argc != 2 && Req->argc != 7)
+			return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+						  Client_ID(Client), Req->command);
+
+		if (Req->argc >= 7) {
+			/* RFC 2813 compatible syntax */
+			nick = Req->argv[0];
+			hops = atoi(Req->argv[1]);
+			user = Req->argv[2];
+			hostname = Req->argv[3];
+			token = atoi(Req->argv[4]);
+			modes = Req->argv[5] + 1;
+			info = Req->argv[6];
+		} else {
+			/* RFC 1459 compatible syntax */
+			nick = Req->argv[0];
+			hops = 1;
+			user = Req->argv[0];
+			hostname = Client_ID(Client);
+			token = atoi(Req->argv[1]);
+			modes = "";
+			info = Req->argv[0];
+		}
 
-		/* Nick ueberpruefen */
-		c = Client_Search( Req->argv[0] );
-		if( c )
-		{
-			/* Der neue Nick ist auf diesem Server bereits registriert:
-			 * sowohl der neue, als auch der alte Client muessen nun
-			 * disconnectiert werden. */
+		c = Client_Search(nick);
+		if(c) {
+			/*
+			 * the new nick is already present on this server:
+			 * the new and the old one have to be disconnected now.
+			 */
 			Log( LOG_ERR, "Server %s introduces already registered nick \"%s\"!", Client_ID( Client ), Req->argv[0] );
 			Kill_Nick( Req->argv[0], "Nick collision" );
 			return CONNECTED;
 		}
 
-		/* Server, zu dem der Client connectiert ist, suchen */
-		intr_c = Client_GetFromToken( Client, atoi( Req->argv[4] ));
+		/* Find the Server this client is connected to */
+		intr_c = Client_GetFromToken(Client, token);
 		if( ! intr_c )
 		{
 			Log( LOG_ERR, "Server %s introduces nick \"%s\" on unknown server!?", Client_ID( Client ), Req->argv[0] );
@@ -258,24 +361,26 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 			return CONNECTED;
 		}
 
-		/* Neue Client-Struktur anlegen */
-		c = Client_NewRemoteUser( intr_c, Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], atoi( Req->argv[4] ), Req->argv[5] + 1, Req->argv[6], true);
+		c = Client_NewRemoteUser(intr_c, nick, hops, user, hostname,
+					 token, modes, info, true);
 		if( ! c )
 		{
-			/* Eine neue Client-Struktur konnte nicht angelegt werden.
-			 * Der Client muss disconnectiert werden, damit der Netz-
-			 * status konsistent bleibt. */
+			/* out of memory, need to disconnect client to keep network state consistent */
 			Log( LOG_ALERT, "Can't create client structure! (on connection %d)", Client_Conn( Client ));
 			Kill_Nick( Req->argv[0], "Server error" );
 			return CONNECTED;
 		}
 
-		modes = Client_Modes( c );
-		if( *modes ) Log( LOG_DEBUG, "User \"%s\" (+%s) registered (via %s, on %s, %d hop%s).", Client_Mask( c ), modes, Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" );
-		else Log( LOG_DEBUG, "User \"%s\" registered (via %s, on %s, %d hop%s).", Client_Mask( c ), Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" );
-
-		/* Andere Server, ausser dem Introducer, informieren */
-		IRC_WriteStrServersPrefix( Client, Client, "NICK %s %d %s %s %d %s :%s", Req->argv[0], atoi( Req->argv[1] ) + 1, Req->argv[2], Req->argv[3], Client_MyToken( intr_c ), Req->argv[5], Req->argv[6] );
+		/* RFC 2813: client is now fully registered, inform all the
+		 * other servers about the new user.
+		 * RFC 1459: announce the new client only after receiving the
+		 * USER command, first we need more information! */
+		if (Req->argc < 7) {
+			LogDebug("Client \"%s\" is being registered (RFC 1459) ...",
+				 Client_Mask(c));
+			Client_SetType(c, CLIENT_GOTNICK);
+		} else
+			Client_Introduce(Client, c, CLIENT_USER);
 
 		return CONNECTED;
 	}
@@ -283,239 +388,540 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 } /* IRC_NICK */
 
 
+/**
+ * Handler for the IRC "USER" command.
+ *
+ * See RFC 2812, 3.1.3 "User message".
+ *
+ * @param Client	The client from which this command has been received.
+ * @param Req		Request structure with prefix and all parameters.
+ * @returns		CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
-IRC_USER( CLIENT *Client, REQUEST *Req )
+IRC_USER(CLIENT * Client, REQUEST * Req)
 {
-#ifdef IDENTAUTH
+	CLIENT *c;
 	char *ptr;
-#endif
 
-	assert( Client != NULL );
-	assert( Req != NULL );
+	assert(Client != NULL);
+	assert(Req != NULL);
 
+	if (Client_Type(Client) == CLIENT_GOTNICK ||
 #ifndef STRICT_RFC
-	if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_UNKNOWN )
-#else
-	if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS )
+	    Client_Type(Client) == CLIENT_UNKNOWN ||
 #endif
+	    Client_Type(Client) == CLIENT_GOTPASS)
 	{
-		/* Wrong number of parameters? */
-		if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+		/* New connection */
+		if (Req->argc != 4)
+			return IRC_WriteStrClient(Client,
+						  ERR_NEEDMOREPARAMS_MSG,
+						  Client_ID(Client),
+						  Req->command);
+
+		/* User name: only alphanumeric characters and limited
+		   punctuation is allowed.*/
+		ptr = Req->argv[0];
+		while (*ptr) {
+			if (!isalnum(*ptr) &&
+			    *ptr != '+' && *ptr != '-' &&
+			    *ptr != '.' && *ptr != '_') {
+				Conn_Close(Client_Conn(Client), NULL,
+					   "Invalid user name", true);
+				return DISCONNECTED;
+			}
+			ptr++;
+		}
 
-		/* User name */
 #ifdef IDENTAUTH
-		ptr = Client_User( Client );
-		if( ! ptr || ! *ptr || *ptr == '~' ) Client_SetUser( Client, Req->argv[0], false );
+		ptr = Client_User(Client);
+		if (!ptr || !*ptr || *ptr == '~')
+			Client_SetUser(Client, Req->argv[0], false);
 #else
-		Client_SetUser( Client, Req->argv[0], false );
+		Client_SetUser(Client, Req->argv[0], false);
 #endif
+		Client_SetOrigUser(Client, Req->argv[0]);
 
-		/* "Real name" or user info text: Don't set it to the empty string, the original ircd
-		 * can't deal with such "real names" (e. g. "USER user * * :") ... */
-		if( *Req->argv[3] ) Client_SetInfo( Client, Req->argv[3] );
-		else Client_SetInfo( Client, "-" );
+		/* "Real name" or user info text: Don't set it to the empty
+		 * string, the original ircd can't deal with such "real names"
+		 * (e. g. "USER user * * :") ... */
+		if (*Req->argv[3])
+			Client_SetInfo(Client, Req->argv[3]);
+		else
+			Client_SetInfo(Client, "-");
 
-		Log( LOG_DEBUG, "Connection %d: got valid USER command ...", Client_Conn( Client ));
-		if( Client_Type( Client ) == CLIENT_GOTNICK ) return Hello_User( Client );
-		else Client_SetType( Client, CLIENT_GOTUSER );
+		LogDebug("Connection %d: got valid USER command ...",
+		    Client_Conn(Client));
+		if (Client_Type(Client) == CLIENT_GOTNICK)
+			return Login_User(Client);
+		else
+			Client_SetType(Client, CLIENT_GOTUSER);
 		return CONNECTED;
+
+	} else if (Client_Type(Client) == CLIENT_SERVER ||
+		   Client_Type(Client) == CLIENT_SERVICE) {
+		/* Server/service updating an user */
+		if (Req->argc != 4)
+			return IRC_WriteStrClient(Client,
+						  ERR_NEEDMOREPARAMS_MSG,
+						  Client_ID(Client),
+						  Req->command);
+		c = Client_Search(Req->prefix);
+		if (!c)
+			return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+						  Client_ID(Client),
+						  Req->prefix);
+
+		Client_SetUser(c, Req->argv[0], true);
+		Client_SetOrigUser(c, Req->argv[0]);
+		Client_SetHostname(c, Req->argv[1]);
+		Client_SetInfo(c, Req->argv[3]);
+
+		LogDebug("Connection %d: got valid USER command for \"%s\".",
+			 Client_Conn(Client), Client_Mask(c));
+
+		/* RFC 1459 style user registration?
+		 * Introduce client to network: */
+		if (Client_Type(c) == CLIENT_GOTNICK)
+			Client_Introduce(Client, c, CLIENT_USER);
+
+		return CONNECTED;
+	} else if (Client_Type(Client) == CLIENT_USER) {
+		/* Already registered connection */
+		return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG,
+					  Client_ID(Client));
+	} else {
+		/* Unexpected/invalid connection state? */
+		return IRC_WriteStrClient(Client, ERR_NOTREGISTERED_MSG,
+					  Client_ID(Client));
 	}
-	else if( Client_Type( Client ) == CLIENT_USER || Client_Type( Client ) == CLIENT_SERVER || Client_Type( Client ) == CLIENT_SERVICE )
-	{
-		return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client ));
-	}
-	else return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
 } /* IRC_USER */
 
 
+/**
+ * Handler for the IRC "SERVICE" command.
+ *
+ * This function implements IRC Services registration using the SERVICE command
+ * defined in RFC 2812 3.1.6 and RFC 2813 4.1.4.
+ *
+ * At the moment ngIRCd doesn't support directly linked services, so this
+ * function returns ERR_ERRONEUSNICKNAME when the SERVICE command has not been
+ * received from a peer server.
+ *
+ * @param Client	The client from which this command has been received.
+ * @param Req		Request structure with prefix and all parameters.
+ * @returns		CONNECTED or DISCONNECTED..
+ */
+GLOBAL bool
+IRC_SERVICE(CLIENT *Client, REQUEST *Req)
+{
+	CLIENT *c, *intr_c;
+	char *nick, *user, *host, *info, *modes, *ptr;
+	int token, hops;
+
+	assert(Client != NULL);
+	assert(Req != NULL);
+
+	if (Client_Type(Client) != CLIENT_GOTPASS &&
+	    Client_Type(Client) != CLIENT_SERVER)
+		return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG,
+					  Client_ID(Client));
+
+	if (Req->argc != 6)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
+
+	if (Client_Type(Client) != CLIENT_SERVER)
+		return IRC_WriteStrClient(Client, ERR_ERRONEUSNICKNAME_MSG,
+				  Client_ID(Client), Req->argv[0]);
+
+	/* Bad number of parameters? */
+	if (Req->argc != 6)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
+
+	nick = Req->argv[0];
+	user = NULL; host = NULL;
+	token = atoi(Req->argv[1]);
+	hops = atoi(Req->argv[4]);
+	info = Req->argv[5];
+
+	/* Validate service name ("nickname") */
+	c = Client_Search(nick);
+	if(c) {
+		/* Nickname collission: disconnect (KILL) both clients! */
+		Log(LOG_ERR, "Server %s introduces already registered service \"%s\"!",
+		    Client_ID(Client), nick);
+		Kill_Nick(nick, "Nick collision");
+		return CONNECTED;
+	}
+
+	/* Get the server to which the service is connected */
+	intr_c = Client_GetFromToken(Client, token);
+	if (! intr_c) {
+		Log(LOG_ERR, "Server %s introduces service \"%s\" on unknown server!?",
+		    Client_ID(Client), nick);
+		Kill_Nick(nick, "Unknown server");
+		return CONNECTED;
+	}
+
+	/* Get user and host name */
+	ptr = strchr(nick, '@');
+	if (ptr) {
+		*ptr = '\0';
+		host = ++ptr;
+	}
+	if (!host)
+		host = Client_Hostname(intr_c);
+	ptr = strchr(nick, '!');
+	if (ptr) {
+		*ptr = '\0';
+		user = ++ptr;
+	}
+	if (!user)
+		user = nick;
+
+	/* According to RFC 2812/2813 parameter 4 <type> "is currently reserved
+	 * for future usage"; but we use it to transfer the modes and check
+	 * that the first character is a '+' sign and ignore it otherwise. */
+	modes = (Req->argv[3][0] == '+') ? ++Req->argv[3] : "";
+
+	c = Client_NewRemoteUser(intr_c, nick, hops, user, host,
+				 token, modes, info, true);
+	if (! c) {
+		/* Couldn't create client structure, so KILL the service to
+		 * keep network status consistent ... */
+		Log(LOG_ALERT, "Can't create client structure! (on connection %d)",
+		    Client_Conn(Client));
+		Kill_Nick(nick, "Server error");
+		return CONNECTED;
+	}
+
+	Client_Introduce(Client, c, CLIENT_SERVICE);
+	return CONNECTED;
+} /* IRC_SERVICE */
+
+
+/**
+ * Handler for the IRC "WEBIRC" command.
+ *
+ * See doc/Protocol.txt, section II.4:
+ * "Update webchat/proxy client information".
+ *
+ * @param Client	The client from which this command has been received.
+ * @param Req		Request structure with prefix and all parameters.
+ * @returns		CONNECTED or DISCONNECTED.
+ */
+GLOBAL bool
+IRC_WEBIRC(CLIENT *Client, REQUEST *Req)
+{
+	/* Exactly 4 parameters are requited */
+	if (Req->argc != 4)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
+
+	if (!Conf_WebircPwd[0] || strcmp(Req->argv[0], Conf_WebircPwd) != 0)
+		return IRC_WriteStrClient(Client, ERR_PASSWDMISMATCH_MSG,
+					  Client_ID(Client));
+
+	LogDebug("Connection %d: got valid WEBIRC command: user=%s, host=%s, ip=%s",
+		 Client_Conn(Client), Req->argv[1], Req->argv[2], Req->argv[3]);
+
+	Client_SetUser(Client, Req->argv[1], true);
+	Client_SetOrigUser(Client, Req->argv[1]);
+	Client_SetHostname(Client, Req->argv[2]);
+	return CONNECTED;
+} /* IRC_WEBIRC */
+
+
+/**
+ * Handler for the IRC "QUIT" command.
+ *
+ * See RFC 2812, 3.1.7 "Quit", and RFC 2813, 4.1.5 "Quit".
+ *
+ * @param Client	The client from which this command has been received.
+ * @param Req		Request structure with prefix and all parameters.
+ * @returns		CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_QUIT( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *target;
-	
-	assert( Client != NULL );
-	assert( Req != NULL );
+	char quitmsg[LINE_LEN];
 
-	if ( Client_Type( Client ) == CLIENT_SERVER )
-	{
-		/* Server */
+	assert(Client != NULL);
+	assert(Req != NULL);
 
-		/* Falsche Anzahl Parameter? */
-		if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+	/* Wrong number of arguments? */
+	if (Req->argc > 1)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
 
-		target = Client_Search( Req->prefix );
-		if( ! target )
-		{
-			/* Den Client kennen wir nicht (mehr), also nichts zu tun. */
-			Log( LOG_WARNING, "Got QUIT from %s for unknown client!?", Client_ID( Client ));
+	if (Req->argc == 1)
+		strlcpy(quitmsg, Req->argv[0], sizeof quitmsg);
+
+	if (Client_Type(Client) == CLIENT_SERVER) {
+		/* Server */
+		target = Client_Search(Req->prefix);
+		if (!target) {
+			Log(LOG_WARNING,
+			    "Got QUIT from %s for unknown client!?",
+			    Client_ID(Client));
+			return CONNECTED;
+		}
+
+		if (target != Client) {
+			Client_Destroy(target, "Got QUIT command.",
+				       Req->argc == 1 ? quitmsg : NULL, true);
 			return CONNECTED;
+		} else {
+			Conn_Close(Client_Conn(Client), "Got QUIT command.",
+				   Req->argc == 1 ? quitmsg : NULL, true);
+			return DISCONNECTED;
+		}
+	} else {
+		if (Req->argc == 1 && quitmsg[0] != '\"') {
+			/* " " to avoid confusion */
+			strlcpy(quitmsg, "\"", sizeof quitmsg);
+			strlcat(quitmsg, Req->argv[0], sizeof quitmsg-1);
+			strlcat(quitmsg, "\"", sizeof quitmsg );
 		}
 
-		if( Req->argc == 0 ) Client_Destroy( target, "Got QUIT command.", NULL, true);
-		else Client_Destroy( target, "Got QUIT command.", Req->argv[0], true);
+		/* User, Service, or not yet registered */
+		Conn_Close(Client_Conn(Client), "Got QUIT command.",
+			   Req->argc == 1 ? quitmsg : NULL, true);
 
-		return CONNECTED;
-	}
-	else
-	{
-		/* 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( 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;
 	}
 } /* IRC_QUIT */
 
 
+#ifndef STRICT_RFC
+
+/**
+ * Handler for HTTP command, e.g. GET and POST
+ *
+ * We handle these commands here to avoid the quite long timeout when
+ * some user tries to access this IRC daemon using an web browser ...
+ *
+ * @param Client	The client from which this command has been received.
+ * @param Req		Request structure with prefix and all parameters.
+ * @returns		CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
-IRC_PING( CLIENT *Client, REQUEST *Req )
+IRC_QUIT_HTTP( CLIENT *Client, REQUEST *Req )
 {
-	CLIENT *target, *from;
+	Req->argc = 1;
+	Req->argv[0] = "Oops, HTTP request received? This is IRC!";
+	return IRC_QUIT(Client, Req);
+} /* IRC_QUIT_HTTP */
 
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	/* 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 > 1 )
-	{
-		/* es wurde ein Ziel-Client angegeben */
-		target = Client_Search( Req->argv[1] );
-		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) 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_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] );
-		}
-	}
-
-	Log( LOG_DEBUG, "Connection %d: got PING, sending PONG ...", Client_Conn( Client ));
-	return IRC_WriteStrClient( Client, "PONG %s :%s", Client_ID( Client_ThisServer( )), Client_ID( Client ));
-} /* IRC_PING */
-
 
+/**
+ * Handler for the IRC "PING" command.
+ *
+ * See RFC 2812, 3.7.2 "Ping message".
+ *
+ * @param Client	The client from which this command has been received.
+ * @param Req		Request structure with prefix and all parameters.
+ * @returns		CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
-IRC_PONG( CLIENT *Client, REQUEST *Req )
+IRC_PING(CLIENT *Client, REQUEST *Req)
 {
 	CLIENT *target, *from;
 
-	assert( Client != NULL );
-	assert( Req != NULL );
+	assert(Client != NULL);
+	assert(Req != NULL);
+
+	if (Req->argc < 1)
+		return IRC_WriteStrClient(Client, ERR_NOORIGIN_MSG,
+					  Client_ID(Client));
+#ifdef STRICT_RFC
+	/* Don't ignore additional arguments when in "strict" mode */
+	if (Req->argc > 2)
+		 return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					   Client_ID(Client), Req->command);
+#endif
 
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client ));
-	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+	if (Req->argc > 1) {
+		/* A target has been specified ... */
+		target = Client_Search(Req->argv[1]);
 
-	/* forwarden? */
-	if( Req->argc == 2 )
-	{
-		target = Client_Search( Req->argv[1] );
-		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) 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_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] );
+		if (!target || Client_Type(target) != CLIENT_SERVER)
+			return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+					Client_ID(Client), Req->argv[1]);
+
+		if (target != Client_ThisServer()) {
+			/* Ok, we have to forward the PING */
+			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", Req->argv[0],
+					Req->argv[1] );
 		}
 	}
 
-	/* Der Connection-Timestamp wurde schon beim Lesen aus dem Socket
-	 * aktualisiert, daher muss das hier nicht mehr gemacht werden. */
+	if (Client_Type(Client) == CLIENT_SERVER) {
+		if (Req->prefix)
+			from = Client_Search(Req->prefix);
+		else
+			from = Client;
+	} else
+		from = Client_ThisServer();
+	if (!from)
+		return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+					Client_ID(Client), Req->prefix);
 
-	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 ));
+	Log(LOG_DEBUG, "Connection %d: got PING, sending PONG ...",
+	    Client_Conn(Client));
 
-	return CONNECTED;
-} /* IRC_PONG */
+#ifdef STRICT_RFC
+	return IRC_WriteStrClient(Client, "PONG %s :%s",
+		Client_ID(from), Client_ID(Client));
+#else
+	/* Some clients depend on the argument being returned in the PONG
+	 * reply (not mentioned in any RFC, though) */
+	return IRC_WriteStrClient(Client, "PONG %s :%s",
+		Client_ID(from), Req->argv[0]);
+#endif
+} /* IRC_PING */
 
 
-LOCAL bool
-Hello_User( CLIENT *Client )
+/**
+ * Handler for the IRC "PONG" command.
+ *
+ * See RFC 2812, 3.7.3 "Pong message".
+ *
+ * @param Client	The client from which this command has been received.
+ * @param Req		Request structure with prefix and all parameters.
+ * @returns		CONNECTED or DISCONNECTED.
+ */
+GLOBAL bool
+IRC_PONG(CLIENT *Client, REQUEST *Req)
 {
-#ifdef CVSDATE
-	char ver[12], vertxt[30];
+	CLIENT *target, *from;
+	CONN_ID conn;
+#ifndef STRICT_RFC
+	long auth_ping;
 #endif
+	char *s;
 
-	assert( Client != NULL );
+	assert(Client != NULL);
+	assert(Req != NULL);
 
-	/* Check password ... */
-	if( strcmp( Client_Password( Client ), Conf_ServerPwd ) != 0 )
-	{
-		/* Bad password! */
-		Log( LOG_ERR, "User \"%s\" rejected (connection %d): Bad password!", Client_Mask( Client ), Client_Conn( Client ));
-		Conn_Close( Client_Conn( Client ), NULL, "Bad password", true);
-		return DISCONNECTED;
+	/* Wrong number of arguments? */
+	if (Req->argc < 1) {
+		if (Client_Type(Client) == CLIENT_USER)
+			return IRC_WriteStrClient(Client, ERR_NOORIGIN_MSG,
+						  Client_ID(Client));
+		else
+			return CONNECTED;
+	}
+	if (Req->argc > 2) {
+		if (Client_Type(Client) == CLIENT_USER)
+			return IRC_WriteStrClient(Client,
+						  ERR_NEEDMOREPARAMS_MSG,
+						  Client_ID(Client),
+						  Req->command);
+		else
+			return CONNECTED;
 	}
 
-	Log( LOG_NOTICE, "User \"%s\" registered (connection %d).", Client_Mask( Client ), Client_Conn( Client ));
-
-	/* Inform other servers */
-	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 ));
+	/* Forward? */
+	if (Req->argc == 2 && Client_Type(Client) == CLIENT_SERVER) {
+		target = Client_Search(Req->argv[0]);
+		if (!target)
+			return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+					Client_ID(Client), Req->argv[0]);
 
-	/* Welcome :-) */
-	if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return false;
+		from = Client_Search(Req->prefix);
 
-	/* Version and system type */
-#ifdef CVSDATE
-	strlcpy( ver, CVSDATE, sizeof( ver ));
-	strncpy( ver + 4, ver + 5, 2 );
-	strncpy( ver + 6, ver + 8, 3 );
-	snprintf( vertxt, sizeof( vertxt ), "%s(%s)", PACKAGE_VERSION, ver );
-	if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), vertxt, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return false;
-#else
-	if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, TARGET_CPU, TARGET_VENDOR, TARGET_OS )) return false;
-#endif
+		if (target != Client_ThisServer() && target != from) {
+			/* Ok, we have to forward the message. */
+			if (!from)
+				return IRC_WriteStrClient(Client,
+						ERR_NOSUCHSERVER_MSG,
+						Client_ID(Client), Req->prefix);
 
-	if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return false;
-#ifdef CVSDATE
-	if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), vertxt, USERMODES, CHANMODES )) return false;	
-#else
-	if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), PACKAGE_VERSION, USERMODES, CHANMODES )) return false;
-#endif
+			if (Client_Type(Client_NextHop(target)) != CLIENT_SERVER)
+				s = Client_ID(from);
+			else
+				s = Req->argv[0];
+			return IRC_WriteStrClientPrefix(target, from,
+				 "PONG %s :%s", s, Req->argv[1]);
+		}
+	}
 
-	/* Features */
-	if( ! IRC_WriteStrClient( Client, RPL_ISUPPORT_MSG, Client_ID( Client ), CLIENT_NICK_LEN - 1, CHANNEL_TOPIC_LEN - 1, CLIENT_AWAY_LEN - 1, Conf_MaxJoins )) return DISCONNECTED;
+	/* The connection timestamp has already been updated when the data has
+	 * been read from so socket, so we don't need to update it here. */
 
-	Client_SetType( Client, CLIENT_USER );
+	conn = Client_Conn(Client);
 
-	if( ! IRC_Send_LUSERS( Client )) return DISCONNECTED;
-	if( ! IRC_Show_MOTD( Client )) return DISCONNECTED;
+#ifndef STRICT_RFC
+	/* Check authentication PING-PONG ... */
+	auth_ping = Conn_GetAuthPing(conn);
+	if (auth_ping) {
+		LogDebug("AUTH PONG: waiting for token \"%ld\", got \"%s\" ...",
+			 auth_ping, Req->argv[0]);
+		if (auth_ping == atoi(Req->argv[0])) {
+			Conn_SetAuthPing(conn, 0);
+			if (Client_Type(Client) == CLIENT_WAITAUTHPING)
+				Login_User(Client);
+		} else
+			if (!IRC_WriteStrClient(Client,
+					"To connect, type /QUOTE PONG %ld",
+					auth_ping))
+				return DISCONNECTED;
+	}
+#endif
 
-	/* Suspend the client for a second ... */
-	IRC_SetPenalty( Client, 1 );
+	if (Client_Type(Client) == CLIENT_SERVER && Conn_LastPing(conn) == 0) {
+		Log(LOG_INFO,
+		    "Synchronization with \"%s\" done (connection %d): %ld seconds [%ld users, %ld channels]",
+		    Client_ID(Client), conn, time(NULL) - Conn_GetSignon(conn),
+		    Client_UserCount(), Channel_CountVisible(NULL));
+		Conn_UpdatePing(conn);
+	} else
+		LogDebug("Connection %d: received PONG. Lag: %ld seconds.",
+			 conn, time(NULL) - Conn_LastPing(conn));
 
 	return CONNECTED;
-} /* Hello_User */
+} /* IRC_PONG */
 
 
-LOCAL void
-Kill_Nick( char *Nick, char *Reason )
+/**
+ * Kill all users with a specific nickname in the network.
+ *
+ * @param Nick		Nickname.
+ * @param Reason	Reason for the KILL.
+ */
+static void
+Kill_Nick(char *Nick, char *Reason)
 {
 	REQUEST r;
 
-	assert( Nick != NULL );
-	assert( Reason != NULL );
+	assert (Nick != NULL);
+	assert (Reason != NULL);
 
-	r.prefix = (char *)Client_ThisServer( );
+	r.prefix = NULL;
 	r.argv[0] = Nick;
 	r.argv[1] = Reason;
 	r.argc = 2;
 
-	Log( LOG_ERR, "User(s) with nick \"%s\" will be disconnected: %s", Nick, Reason );
-	IRC_KILL( Client_ThisServer( ), &r );
+	Log(LOG_ERR, "User(s) with nick \"%s\" will be disconnected: %s",
+	    Nick, Reason);
+
+	IRC_KILL(Client_ThisServer(), &r);
 } /* Kill_Nick */