X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=306ab1c5284d959117634ad47cef90cb0ecb7d92;hb=c74115f25c8ea3f67c75120c0a1398975bac03ad;hp=cbec071c72bae4945406e7261ec73174beb40172;hpb=03d971d99481244e7039bc960cfb962795fbe905;p=ngircd-alex.git

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index cbec071c..e4f48307 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -1,793 +1,759 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
- *
- * $Id: irc.c,v 1.18 2002/01/02 02:44:36 alex Exp $
- *
- * irc.c: IRC-Befehle
- *
- * $Log: irc.c,v $
- * Revision 1.18  2002/01/02 02:44:36  alex
- * - neue Defines fuer max. Anzahl Server und Operatoren.
- *
- * Revision 1.17  2001/12/31 15:33:13  alex
- * - neuer Befehl NAMES, kleinere Bugfixes.
- * - Bug bei PING behoben: war zu restriktiv implementiert :-)
- *
- * Revision 1.16  2001/12/31 02:18:51  alex
- * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
- * - neuen Header "defines.h" mit (fast) allen Konstanten.
- * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes.
- *
- * Revision 1.15  2001/12/30 19:26:11  alex
- * - Unterstuetzung fuer die Konfigurationsdatei eingebaut.
- *
- * Revision 1.14  2001/12/30 11:42:00  alex
- * - der Server meldet nun eine ordentliche "Start-Zeit".
- *
- * Revision 1.13  2001/12/29 03:10:06  alex
- * - Neue Funktion IRC_MODE() implementiert, div. Aenderungen.
- * - neue configure-Optione "--enable-strict-rfc".
- *
- * Revision 1.12  2001/12/27 19:17:26  alex
- * - neue Befehle PRIVMSG, NOTICE, PING.
- *
- * Revision 1.11  2001/12/27 16:55:41  alex
- * - neu: IRC_WriteStrRelated(), Aenderungen auch in IRC_WriteStrClient().
- *
- * Revision 1.10  2001/12/26 22:48:53  alex
- * - MOTD-Datei ist nun konfigurierbar und wird gelesen.
- *
- * Revision 1.9  2001/12/26 14:45:37  alex
- * - "Code Cleanups".
- *
- * Revision 1.8  2001/12/26 03:21:46  alex
- * - PING/PONG-Befehle implementiert,
- * - Meldungen ueberarbeitet: enthalten nun (fast) immer den Nick.
- *
- * Revision 1.7  2001/12/25 23:25:18  alex
- * - und nochmal Aenderungen am Logging ;-)
- *
- * Revision 1.6  2001/12/25 23:13:33  alex
- * - Debug-Meldungen angepasst.
- *
- * Revision 1.5  2001/12/25 22:02:42  alex
- * - neuer IRC-Befehl "/QUIT". Verbessertes Logging & Debug-Ausgaben.
- *
- * Revision 1.4  2001/12/25 19:19:30  alex
- * - bessere Fehler-Abfragen, diverse Bugfixes.
- * - Nicks werden nur einmal vergeben :-)
- * - /MOTD wird unterstuetzt.
- *
- * Revision 1.3  2001/12/24 01:34:06  alex
- * - USER und NICK wird nun in beliebiger Reihenfolge akzeptiert (wg. BitchX)
- * - MOTD-Ausgabe begonnen zu implementieren.
- *
- * Revision 1.2  2001/12/23 21:57:16  alex
- * - erste IRC-Befehle zu implementieren begonnen.
- *
- * Revision 1.1  2001/12/14 08:13:43  alex
- * - neues Modul begonnen :-)
+ * 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.
  */
 
+#include "portab.h"
 
-#include <portab.h>
-#include "global.h"
+/**
+ * @file
+ * IRC commands
+ */
 
-#include <imp.h>
+#include "imp.h"
 #include <assert.h>
-#include <errno.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "ngircd.h"
-#include "client.h"
+#include "conn-func.h"
 #include "conf.h"
-#include "conn.h"
+#include "channel.h"
+#include "conn-encoding.h"
+#include "defines.h"
+#include "irc-macros.h"
+#include "irc-write.h"
 #include "log.h"
+#include "match.h"
 #include "messages.h"
 #include "parse.h"
 #include "tool.h"
 
-#include <exp.h>
+#include "exp.h"
 #include "irc.h"
 
+static char *Option_String PARAMS((CONN_ID Idx));
+static bool Send_Message PARAMS((CLIENT *Client, REQUEST *Req, int ForceType,
+				 bool SendErrors));
+static bool Send_Message_Mask PARAMS((CLIENT *from, char *command,
+				      char *targetMask, char *message,
+				      bool SendErrors));
+static bool Help PARAMS((CLIENT *Client, const char *Topic));
 
-#define CONNECTED TRUE
-#define DISCONNECTED FALSE
-
-
-LOCAL BOOLEAN Check_Valid_User( CLIENT *Client );
-
-LOCAL BOOLEAN Hello_User( CLIENT *Client );
-LOCAL BOOLEAN Show_MOTD( CLIENT *Client );
-
-
-GLOBAL VOID IRC_Init( VOID )
-{
-} /* IRC_Init */
-
-
-GLOBAL VOID IRC_Exit( VOID )
-{
-} /* IRC_Exit */
-
-
-GLOBAL BOOLEAN IRC_WriteStrClient( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... )
-{
-	/* Text an Clients, lokal bzw. remote, senden. */
-
-	CHAR buffer[1000];
-	BOOLEAN ok = CONNECTED;
-	CONN_ID send_to;
-	va_list ap;
-
-	assert( Client != NULL );
-	assert( Format != NULL );
-
-	va_start( ap, Format );
-	vsnprintf( buffer, 1000, Format, ap );
-	va_end( ap );
-
-	if( Client->conn_id != NONE ) send_to = Client->conn_id;
-	else send_to = Client->introducer->conn_id;
-
-	if( Prefix ) ok = Conn_WriteStr( Client->conn_id, ":%s %s", Client_GetID( Prefix ), buffer );
-	else ok = Conn_WriteStr( Client->conn_id, buffer );
-
-	return ok;
-} /* IRC_WriteStrClient */
-
-
-GLOBAL BOOLEAN IRC_WriteStrRelated( CLIENT *Client, CHAR *Format, ... )
-{
-	CHAR buffer[1000];
-	BOOLEAN ok = CONNECTED;
-	va_list ap;
-
-	assert( Client != NULL );
-	assert( Format != NULL );
-
-	va_start( ap, Format );
-	vsnprintf( buffer, 1000, Format, ap );
-	va_end( ap );
-
-	/* an den Client selber */
-	ok = IRC_WriteStrClient( Client, Client, buffer );
-
-	return ok;
-} /* IRC_WriteStrRelated */
-
-
-GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req )
+/**
+ * Check if a list limit is reached and inform client accordingly.
+ *
+ * @param From The client.
+ * @param Count Reply item count.
+ * @param Limit Reply limit.
+ * @param Name Name of the list.
+ * @return true if list limit has been reached; false otherwise.
+ */
+GLOBAL bool
+IRC_CheckListTooBig(CLIENT *From, const int Count, const int Limit,
+		    const char *Name)
 {
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( Client->type == CLIENT_UNKNOWN )
-	{
-		Log( LOG_DEBUG, "Connection %d: got PASS command ...", Client->conn_id );
-		return IRC_WriteStrClient( Client, This_Server, ERR_UNKNOWNCOMMAND_MSG, Client_Nick( Client ), Req->command );
-	}
-	else return IRC_WriteStrClient( Client, This_Server, ERR_ALREADYREGISTRED_MSG, Client_Nick( Client ));
-} /* IRC_PASS */
-
-
-GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
+	assert(From != NULL);
+	assert(Count >= 0);
+	assert(Limit > 0);
+	assert(Name != NULL);
+
+	if (Count < Limit)
+		return false;
+
+	(void)IRC_WriteStrClient(From,
+				 "NOTICE %s :%s list limit (%d) reached!",
+				 Client_ID(From), Name, Limit);
+	IRC_SetPenalty(From, 2);
+	return true;
+}
+
+/**
+ * Handler for the IRC "ERROR" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+*/
+GLOBAL bool
+IRC_ERROR(CLIENT *Client, REQUEST *Req)
 {
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Zumindest BitchX sendet NICK-USER in der falschen Reihenfolge. */
-#ifndef STRICT_RFC
-	if( Client->type == CLIENT_UNKNOWN || Client->type == CLIENT_GOTPASS || Client->type == CLIENT_GOTNICK || Client->type == CLIENT_GOTUSER || Client->type == CLIENT_USER )
-#else
-	if( Client->type == CLIENT_UNKNOWN || Client->type == CLIENT_GOTPASS || Client->type == CLIENT_GOTNICK || Client->type == CLIENT_USER  )
-#endif
-	{
-		/* Falsche Anzahl Parameter? */
-		if( Req->argc != 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-
-		/* Ist der Client "restricted"? */
-		if( strchr( Client->modes, 'r' )) return IRC_WriteStrClient( Client, This_Server, ERR_RESTRICTED_MSG, Client_Nick( Client ));
-
-		/* 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 ... */
-#ifndef STRICT_RFC
-		if( strcasecmp( Client->nick, Req->argv[0] ) == 0 ) return CONNECTED;
-#endif
-		
-		/* pruefen, ob Nick bereits vergeben */
-		if( ! Client_CheckNick( Client, Req->argv[0] )) return CONNECTED;
-
-		if( Client->type == CLIENT_USER )
-		{
-			/* Nick-Aenderung: allen mitteilen! */
-			Log( LOG_INFO, "User \"%s!%s@%s\" changed nick: \"%s\" -> \"%s\".", Client->nick, Client->user, Client->host, Client->nick, Req->argv[0] );
-			IRC_WriteStrRelated( Client, "NICK :%s", Req->argv[0] );
-		}
-		
-		/* Client-Nick registrieren */
-		strcpy( Client->nick, Req->argv[0] );
-
-		if( Client->type != CLIENT_USER )
-		{
-			/* Neuer Client */
-			Log( LOG_DEBUG, "Connection %d: got NICK command ...", Client->conn_id );
-			if( Client->type == CLIENT_GOTUSER ) return Hello_User( Client );
-			else Client->type = CLIENT_GOTNICK;
-		}
+	if (Client_Type(Client) != CLIENT_GOTPASS
+	    && Client_Type(Client) != CLIENT_GOTPASS_2813
+	    && Client_Type(Client) != CLIENT_UNKNOWNSERVER
+	    && Client_Type(Client) != CLIENT_SERVER
+	    && Client_Type(Client) != CLIENT_SERVICE) {
+		LogDebug("Ignored ERROR command from \"%s\" ...",
+			 Client_Mask(Client));
+		IRC_SetPenalty(Client, 2);
 		return CONNECTED;
 	}
-	else return IRC_WriteStrClient( Client, This_Server, ERR_ALREADYREGISTRED_MSG, Client_Nick( Client ));
-} /* IRC_NICK */
 
+	if (Req->argc < 1)
+		Log(LOG_NOTICE, "Got ERROR from \"%s\"!",
+		    Client_Mask(Client));
+	else
+		Log(LOG_NOTICE, "Got ERROR from \"%s\": \"%s\"!",
+		    Client_Mask(Client), Req->argv[0]);
 
-GLOBAL BOOLEAN IRC_USER( CLIENT *Client, REQUEST *Req )
-{
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-#ifndef STRICT_RFC
-	if( Client->type == CLIENT_GOTNICK || Client->type == CLIENT_GOTPASS || Client->type == CLIENT_UNKNOWN )
-#else
-	if( Client->type == CLIENT_GOTNICK || Client->type == CLIENT_GOTPASS )
-#endif
-	{
-		/* Falsche Anzahl Parameter? */
-		if( Req->argc != 4 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-
-		strncpy( Client->user, Req->argv[0], CLIENT_USER_LEN );
-		Client->user[CLIENT_USER_LEN - 1] = '\0';
-		strncpy( Client->name, Req->argv[3], CLIENT_NAME_LEN );
-		Client->name[CLIENT_NAME_LEN - 1] = '\0';
-
-		Log( LOG_DEBUG, "Connection %d: got USER command ...", Client->conn_id );
-		if( Client->type == CLIENT_GOTNICK ) return Hello_User( Client );
-		else Client->type = CLIENT_GOTUSER;
-		return CONNECTED;
-	}
-	else if( Client->type == CLIENT_USER || Client->type == CLIENT_SERVER || Client->type == CLIENT_SERVICE )
-	{
-		return IRC_WriteStrClient( Client, This_Server, ERR_ALREADYREGISTRED_MSG, Client_Nick( Client ));
-	}
-	else return IRC_WriteStrClient( Client, This_Server, ERR_NOTREGISTERED_MSG, Client_Nick( Client ));
-} /* IRC_USER */
-
+	return CONNECTED;
+} /* IRC_ERROR */
 
-GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req )
+/**
+ * Handler for the IRC "KILL" command.
+ *
+ * This function implements the IRC command "KILL" which is used to selectively
+ * disconnect clients. It can be used by IRC operators and servers, for example
+ * to "solve" nick collisions after netsplits. See RFC 2812 section 3.7.1.
+ *
+ * Please note that this function is also called internally, without a real
+ * KILL command being received over the network! Client is Client_ThisServer()
+ * in this case, and the prefix in Req is NULL.
+ *
+ * @param Client The client from which this command has been received or
+ * Client_ThisServer() when generated interanlly.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
+GLOBAL bool
+IRC_KILL(CLIENT *Client, REQUEST *Req)
 {
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( Client->type != CLIENT_SERVER && Client->type != CLIENT_SERVICE )
-	{
-		/* Falsche Anzahl Parameter? */
-		if( Req->argc > 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-
-		Conn_Close( Client->conn_id, "Client wants to quit." );
-		return DISCONNECTED;
+	CLIENT *prefix, *c;
+	char reason[COMMAND_LEN], *msg;
+	CONN_ID my_conn, conn;
+
+	assert (Client != NULL);
+	assert (Req != NULL);
+
+	if (Client_Type(Client) != CLIENT_SERVER && !Client_OperByMe(Client))
+		return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG,
+					  Client_ID(Client));
+
+	_IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2)
+
+	/* Get prefix (origin); use the client if no prefix is given. */
+	if (Req->prefix)
+		prefix = Client_Search(Req->prefix);
+	else
+		prefix = Client;
+
+	/* Log a warning message and use this server as origin when the
+	 * prefix (origin) is invalid. And this is the reason why we don't
+	 * use the _IRC_GET_SENDER_OR_RETURN_ macro above! */
+	if (!prefix) {
+		Log(LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!",
+		    Req->prefix );
+		prefix = Client_ThisServer();
 	}
-	else return IRC_WriteStrClient( Client, This_Server, ERR_NOTREGISTERED_MSG, Client_Nick( Client ));
-} /* IRC_QUIT */
-
-
-GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req )
-{
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( ! Check_Valid_User( Client )) return CONNECTED;
-
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NOORIGIN_MSG, Client_Nick( Client ));
-	if( Req->argc > 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-
-	return IRC_WriteStrClient( Client, This_Server, "PONG %s :%s", Client_Nick( This_Server), Client_Nick( Client ));
-} /* IRC_PING */
 
+	if (Client != Client_ThisServer())
+		Log(LOG_NOTICE|LOG_snotice,
+		    "Got KILL command from \"%s\" for \"%s\": \"%s\".",
+		    Client_Mask(prefix), Req->argv[0], Req->argv[1]);
+
+	/* Build reason string: Prefix the "reason" if the originator is a
+	 * regular user, so users can't spoof KILLs of servers. */
+	if (Client_Type(Client) == CLIENT_USER)
+		snprintf(reason, sizeof(reason), "KILLed by %s: %s",
+			 Client_ID(Client), Req->argv[1]);
+	else
+		strlcpy(reason, Req->argv[1], sizeof(reason));
+
+	/* Inform other servers */
+	IRC_WriteStrServersPrefix(Client, prefix, "KILL %s :%s",
+				  Req->argv[0], reason);
+
+	/* Save ID of this connection */
+	my_conn = Client_Conn( Client );
+
+	/* Do we host such a client? */
+	c = Client_Search( Req->argv[0] );
+	if (c) {
+		if (Client_Type(c) != CLIENT_USER
+		    && Client_Type(c) != CLIENT_GOTNICK) {
+			/* Target of this KILL is not a regular user, this is
+			 * invalid! So we ignore this case if we received a
+			 * regular KILL from the network and try to kill the
+			 * client/connection anyway (but log an error!) if the
+			 * origin is the local server. */
+
+			if (Client != Client_ThisServer()) {
+				/* Invalid KILL received from remote */
+				if (Client_Type(c) == CLIENT_SERVER)
+					msg = ERR_CANTKILLSERVER_MSG;
+				else
+					msg = ERR_NOPRIVILEGES_MSG;
+				return IRC_WriteStrClient(Client, msg,
+							  Client_ID(Client));
+			}
 
-GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req )
-{
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( ! Check_Valid_User( Client )) return CONNECTED;
-
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NOORIGIN_MSG, Client_Nick( Client ));
-	if( Req->argc > 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-
-	/* Der Connection-Timestamp wurde schon beim Lesen aus dem Socket
-	 * aktualisiert, daher muss das hier nicht mehr gemacht werden. */
+			Log(LOG_ERR,
+			    "Got KILL for invalid client type: %d, \"%s\"!",
+			    Client_Type( c ), Req->argv[0] );
+		}
 
-	Log( LOG_DEBUG, "Connection %d: received PONG.", Client->conn_id );
-	return CONNECTED;
-} /* IRC_PONG */
+		/* Kill the client NOW:
+		 *  - Close the local connection (if there is one),
+		 *  - Destroy the CLIENT structure for remote clients.
+		 * Note: Conn_Close() removes the CLIENT structure as well. */
+		conn = Client_Conn( c );
+		if(conn > NONE)
+			Conn_Close(conn, NULL, reason, true);
+		else
+			Client_Destroy(c, NULL, reason, false);
+	}
+	else
+		Log(LOG_NOTICE, "Client with nick \"%s\" is unknown here.",
+		    Req->argv[0]);
 
+	/* Are we still connected or were we killed, too? */
+	if (my_conn > NONE && Conn_GetClient(my_conn))
+		return CONNECTED;
+	else
+		return DISCONNECTED;
+} /* IRC_KILL */
 
-GLOBAL BOOLEAN IRC_MOTD( CLIENT *Client, REQUEST *Req )
+/**
+ * Handler for the IRC "NOTICE" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+*/
+GLOBAL bool
+IRC_NOTICE(CLIENT *Client, REQUEST *Req)
 {
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( ! Check_Valid_User( Client )) return CONNECTED;
-
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc != 0 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-
-	return Show_MOTD( Client );
-} /* IRC_MOTD */
-
+	return Send_Message(Client, Req, CLIENT_USER, false);
+} /* IRC_NOTICE */
 
-GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
+/**
+ * Handler for the IRC "PRIVMSG" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
+GLOBAL bool
+IRC_PRIVMSG(CLIENT *Client, REQUEST *Req)
 {
-	CLIENT *to;
-	
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( ! Check_Valid_User( Client )) return CONNECTED;
-
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc == 0 ) return IRC_WriteStrClient( Client, This_Server, ERR_NORECIPIENT_MSG, Client_Nick( Client ), Req->command );
-	if( Req->argc == 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NOTEXTTOSEND_MSG, Client_Nick( Client ));
-	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-
-	to = Client_Search( Req->argv[0] );
-	if( to )
-	{
-		/* Okay, Ziel ist ein User */
-		if( Client->conn_id >= 0 ) Conn_UpdateIdle( Client->conn_id );
-		return IRC_WriteStrClient( to, Client, "PRIVMSG %s :%s", to->nick, Req->argv[1] );
-	}
-
-	return IRC_WriteStrClient( Client, This_Server, ERR_NOSUCHNICK_MSG, Client_Nick( Client ), Req->argv[0] );
+	return Send_Message(Client, Req, CLIENT_USER, true);
 } /* IRC_PRIVMSG */
 
-
-GLOBAL BOOLEAN IRC_NOTICE( CLIENT *Client, REQUEST *Req )
+/**
+ * Handler for the IRC "SQUERY" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
+GLOBAL bool
+IRC_SQUERY(CLIENT *Client, REQUEST *Req)
 {
-	CLIENT *to;
-
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( ! Check_Valid_User( Client )) return CONNECTED;
-
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc != 2 ) return CONNECTED;
-
-	to = Client_Search( Req->argv[0] );
-	if( to )
-	{
-		/* Okay, Ziel ist ein User */
-		return IRC_WriteStrClient( to, Client, "NOTICE %s :%s", to->nick, Req->argv[1] );
-	}
-
-	return CONNECTED;
-} /* IRC_NOTICE */
-
+	return Send_Message(Client, Req, CLIENT_SERVICE, true);
+} /* IRC_SQUERY */
 
-GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
+/*
+ * Handler for the IRC "TRACE" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
+ GLOBAL bool
+IRC_TRACE(CLIENT *Client, REQUEST *Req)
 {
-	CHAR x[2], new_modes[CLIENT_MODE_LEN], *ptr, *p;
-	BOOLEAN set, ok;
-	
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( ! Check_Valid_User( Client )) return CONNECTED;
-
-	/* Falsche Anzahl Parameter? */
-	if(( Req->argc > 2 ) || ( Req->argc < 1 )) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-
-	/* MODE ist nur fuer sich selber zulaessig */
-	if( Client_Search( Req->argv[0] ) != Client ) return IRC_WriteStrClient( Client, This_Server, ERR_USERSDONTMATCH_MSG, Client_Nick( Client ));
-
-	/* Werden die Modes erfragt? */
-	if( Req->argc == 1 ) return IRC_WriteStrClient( Client, This_Server, RPL_UMODEIS_MSG, Client_Nick( Client ), Client->modes );
-
-	ptr = Req->argv[1];
-
-	/* Sollen Modes gesetzt oder geloescht werden? */
-	if( *ptr == '+' ) set = TRUE;
-	else if( *ptr == '-' ) set = FALSE;
-	else return IRC_WriteStrClient( Client, This_Server, ERR_UMODEUNKNOWNFLAG_MSG, Client_Nick( Client ));
-
-	/* Reply-String mit Aenderungen vorbereiten */
-	if( set ) strcpy( new_modes, "+" );
-	else strcpy( new_modes, "-" );
+	CLIENT *from, *target, *c;
+	CONN_ID idx, idx2;
+	char user[CLIENT_USER_LEN];
+
+	assert(Client != NULL);
+	assert(Req != NULL);
+
+	IRC_SetPenalty(Client, 3);
+
+	/* Bad number of arguments? */
+	if (Req->argc > 1)
+		return IRC_WriteStrClient(Client, ERR_NORECIPIENT_MSG,
+					  Client_ID(Client), Req->command);
+
+	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
+	_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from)
+
+	/* Forward command to other server? */
+	if (target != Client_ThisServer()) {
+		/* Send RPL_TRACELINK back to initiator */
+		idx = Client_Conn(Client);
+		assert(idx > NONE);
+		idx2 = Client_Conn(Client_NextHop(target));
+		assert(idx2 > NONE);
+
+		if (!IRC_WriteStrClient(from, RPL_TRACELINK_MSG,
+					Client_ID(from), PACKAGE_NAME,
+					PACKAGE_VERSION, Client_ID(target),
+					Client_ID(Client_NextHop(target)),
+					Option_String(idx2),
+					time(NULL) - Conn_StartTime(idx2),
+					Conn_SendQ(idx), Conn_SendQ(idx2)))
+			return DISCONNECTED;
+
+		/* Forward command */
+		IRC_WriteStrClientPrefix(target, from, "TRACE %s", Req->argv[0]);
+		return CONNECTED;
+	}
 
-	ptr++;
-	ok = TRUE;
-	x[1] = '\0';
-	while( *ptr )
-	{
-		x[0] = '\0';
-		switch( *ptr )
-		{
-			case 'i':
-				/* invisible */
-				x[0] = 'i';
-				break;
-			case 'r':
-				/* restricted (kann nur gesetzt werden) */
-				if( set ) x[0] = 'r';
-				else ok = IRC_WriteStrClient( Client, This_Server, ERR_RESTRICTED_MSG, Client_Nick( Client ));
-				break;
-			case 'o':
-				/* operator (kann nur geloescht werden) */
-				if( ! set )
-				{
-					Client->oper_by_me = FALSE;
-					x[0] = 'o';
-				}
-				else ok = IRC_WriteStrClient( Client, This_Server, ERR_UMODEUNKNOWNFLAG_MSG, Client_Nick( Client ));
-				break;
-			default:
-				ok = IRC_WriteStrClient( Client, This_Server, ERR_UMODEUNKNOWNFLAG_MSG, Client_Nick( Client ));
-				x[0] = '\0';
-		}
-		if( ! ok ) break;
-
-		ptr++;
-		if( ! x[0] ) continue;
-
-		/* Okay, gueltigen Mode gefunden */
-		if( set )
-		{
-			/* Modes sollen gesetzt werden */
-			if( ! strchr( Client->modes, x[0] ))
-			{
-				/* Client hat den Mode noch nicht -> setzen */
-				strcat( Client->modes, x );
-				strcat( new_modes, x );
+	/* Infos about all connected servers */
+	c = Client_First();
+	while (c) {
+		if (Client_Conn(c) > NONE) {
+			/* Local client */
+			if (Client_Type(c) == CLIENT_SERVER) {
+				/* Server link */
+				strlcpy(user, Client_User(c), sizeof(user));
+				if (user[0] == '~')
+					strlcpy(user, "unknown", sizeof(user));
+				if (!IRC_WriteStrClient(from,
+						RPL_TRACESERVER_MSG,
+						Client_ID(from), Client_ID(c),
+						user, Client_Hostname(c),
+						Client_Mask(Client_ThisServer()),
+						Option_String(Client_Conn(c))))
+					return DISCONNECTED;
 			}
-		}
-		else
-		{
-			/* Modes sollen geloescht werden */
-			p = strchr( Client->modes, x[0] );
-			if( p )
-			{
-				/* Client hat den Mode -> loeschen */
-				while( *p )
-				{
-					*p = *(p + 1);
-					p++;
-				}
-				strcat( new_modes, x );
+			if (Client_Type(c) == CLIENT_USER
+			    && Client_HasMode(c, 'o')) {
+				/* IRC Operator */
+				if (!IRC_WriteStrClient(from,
+						RPL_TRACEOPERATOR_MSG,
+						Client_ID(from), Client_ID(c)))
+					return DISCONNECTED;
 			}
 		}
+		c = Client_Next( c );
 	}
-	
-	/* Geanderte Modes? */
-	if( new_modes[1] && ok )
-	{
-		ok = IRC_WriteStrRelated( Client, "MODE %s :%s", Client->nick, new_modes );
-		Log( LOG_DEBUG, "User \"%s!%s@%s\": Mode change, now \"%s\".", Client->nick, Client->user, Client->host, Client->modes );
-	}
-	return ok;
-} /* IRC_MODE */
 
+	return IRC_WriteStrClient(from, RPL_TRACEEND_MSG, Client_ID(from),
+				  Conf_ServerName, PACKAGE_NAME,
+				  PACKAGE_VERSION, NGIRCd_DebugLevel);
+} /* IRC_TRACE */
 
-GLOBAL BOOLEAN IRC_OPER( CLIENT *Client, REQUEST *Req )
+/**
+ * Handler for the IRC "HELP" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
+GLOBAL bool
+IRC_HELP(CLIENT *Client, REQUEST *Req)
 {
-	INT i;
-	
-	assert( Client != NULL );
-	assert( Req != NULL );
+	COMMAND *cmd;
 
-	if( ! Check_Valid_User( Client )) return CONNECTED;
-	
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
+	assert(Client != NULL);
+	assert(Req != NULL);
 
-	/* Operator suchen */
-	for( i = 0; i < Conf_Oper_Count; i++)
-	{
-		if( Conf_Oper[i].name[0] && Conf_Oper[i].pwd[0] && ( strcmp( Conf_Oper[i].name, Req->argv[0] ) == 0 )) break;
-	}
-	if( i >= Conf_Oper_Count ) return IRC_WriteStrClient( Client, This_Server, ERR_PASSWDMISMATCH_MSG, Client_Nick( Client ));
+	IRC_SetPenalty(Client, 2);
 
-	/* Stimmt der Name und das Passwort? */
-	if(( strcmp( Conf_Oper[i].name, Req->argv[0] ) != 0 ) || ( strcmp( Conf_Oper[i].pwd, Req->argv[1] ) != 0 )) return IRC_WriteStrClient( Client, This_Server, ERR_PASSWDMISMATCH_MSG, Client_Nick( Client ));
-	
-	if( ! strchr( Client->modes, 'o' ))
-	{
-		/* noch kein o-Mode gesetzt */
-		strcat( Client->modes, "o" );
-		if( ! IRC_WriteStrRelated( Client, "MODE %s :+o", Client->nick )) return DISCONNECTED;
-	}
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
 
-	if( ! Client->oper_by_me ) Log( LOG_NOTICE, "User \"%s!%s@%s\" is now an IRC Operator.", Client->nick, Client->user, Client->host );
+	if ((Req->argc == 0 && array_bytes(&Conf_Helptext) > 0)
+	    || (Req->argc >= 1 && strcasecmp(Req->argv[0], "Commands") != 0)) {
+		/* Help text available and requested */
+		if (Req->argc >= 1)
+			return Help(Client, Req->argv[0]);
 
-	Client->oper_by_me = TRUE;
-	return IRC_WriteStrClient( Client, This_Server, RPL_YOUREOPER_MSG, Client_Nick( Client ));
-} /* IRC_OPER */
-
-
-GLOBAL BOOLEAN IRC_DIE( CLIENT *Client, REQUEST *Req )
-{
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( ! Check_Valid_User( Client )) return CONNECTED;
-
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc != 0 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-
-	if(( ! strchr( Client->modes, 'o' )) || ( ! Client->oper_by_me )) return IRC_WriteStrClient( Client, This_Server, ERR_NOPRIVILEGES_MSG, Client_Nick( Client ));
+		if (!Help(Client, "Intro"))
+			return DISCONNECTED;
+		return CONNECTED;
+	}
 
-	Log( LOG_NOTICE, "Got DIE command from \"%s!%s@%s\", going down!", Client->nick, Client->user, Client->host );
-	NGIRCd_Quit = TRUE;
+	cmd = Parse_GetCommandStruct();
+	while(cmd->name) {
+		if (!IRC_WriteStrClient(Client, "NOTICE %s :%s",
+					Client_ID(Client), cmd->name))
+			return DISCONNECTED;
+		cmd++;
+	}
 	return CONNECTED;
-} /* IRC_DIE */
-
+} /* IRC_HELP */
 
-GLOBAL BOOLEAN IRC_RESTART( CLIENT *Client, REQUEST *Req )
+/**
+ * Send help for a given topic to the client.
+ *
+ * @param Client The client requesting help.
+ * @param Topoc The help topic requested.
+ * @return CONNECTED or DISCONNECTED.
+ */
+static bool
+Help(CLIENT *Client, const char *Topic)
 {
-	assert( Client != NULL );
-	assert( Req != NULL );
+	char *line;
+	size_t helptext_len, len_str, idx_start, lines = 0;
+	bool in_article = false;
+
+	assert(Client != NULL);
+	assert(Topic != NULL);
+
+	helptext_len = array_bytes(&Conf_Helptext);
+	line = array_start(&Conf_Helptext);
+	while (helptext_len > 0) {
+		len_str = strlen(line) + 1;
+		assert(helptext_len >= len_str);
+		helptext_len -= len_str;
+
+		if (in_article) {
+			/* The first character in each article text line must
+			 * be a TAB (ASCII 9) character which will be stripped
+			 * in the output. If it is not a TAB, the end of the
+			 * article has been reached. */
+			if (line[0] != '\t') {
+				if (lines > 0)
+					return CONNECTED;
+				else
+					break;
+			}
 
-	if( ! Check_Valid_User( Client )) return CONNECTED;
+			/* A single '.' character indicates an empty line */
+			if (line[1] == '.' && line[2] == '\0')
+				idx_start = 2;
+			else
+				idx_start = 1;
+
+			if (!IRC_WriteStrClient(Client, "NOTICE %s :%s",
+						Client_ID(Client),
+						&line[idx_start]))
+				return DISCONNECTED;
+			lines++;
+
+		} else {
+			if (line[0] == '-' && line[1] == ' '
+			    && strcasecmp(&line[2], Topic) == 0)
+				in_article = true;
+		}
 
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc != 0 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
+		line += len_str;
+	}
 
-	if(( ! strchr( Client->modes, 'o' )) || ( ! Client->oper_by_me )) return IRC_WriteStrClient( Client, This_Server, ERR_NOPRIVILEGES_MSG, Client_Nick( Client ));
+	/* Help topic not found (or empty)! */
+	if (!IRC_WriteStrClient(Client, "NOTICE %s :No help for \"%s\" found!",
+				Client_ID(Client), Topic))
+		return DISCONNECTED;
 
-	Log( LOG_NOTICE, "Got RESTART command from \"%s!%s@%s\", going down!", Client->nick, Client->user, Client->host );
-	NGIRCd_Restart = TRUE;
 	return CONNECTED;
-} /* IRC_RESTART */
-
+}
 
-GLOBAL BOOLEAN IRC_NAMES( CLIENT *Client, REQUEST *Req )
+static char *
+#ifdef ZLIB
+Option_String(CONN_ID Idx)
+#else
+Option_String(UNUSED CONN_ID Idx)
+#endif
 {
-	CHAR rpl[COMMAND_LEN];
-	CLIENT *c;
-	
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( ! Check_Valid_User( Client )) return CONNECTED;
+	static char option_txt[8];
+#ifdef ZLIB
+	UINT16 options;
 
-	/* Falsche Anzahl Parameter? */
-	if( Req->argc != 0 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-
-	/* Noch alle User ausgeben, die in keinem Channel sind */
-	rpl[0] = '\0';
-	c = Client_First( );
-	while( c )
-	{
-		if( c->type == CLIENT_USER )
-		{
-			/* Okay, das ist ein User */
-			strcat( rpl, Client_Nick( c ));
-			strcat( rpl, " " );
-		}
+	options = Conn_Options(Idx);
+#endif
 
-		/* Antwort zu lang? Splitten. */
-		if( strlen( rpl ) > 480 )
-		{
-			if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
-			if( ! IRC_WriteStrClient( Client, This_Server, RPL_NAMREPLY_MSG, Client_Nick( Client ), "*", "*", rpl )) return DISCONNECTED;
-			rpl[0] = '\0';
-		}
-		
-		c = Client_Next( c );
-	}
-	if( rpl[0] )
-	{
-		/* es wurden User gefunden */
-		if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
-		if( ! IRC_WriteStrClient( Client, This_Server, RPL_NAMREPLY_MSG, Client_Nick( Client ), "*", "*", rpl )) return DISCONNECTED;
-	}
-	return IRC_WriteStrClient( Client, This_Server, RPL_ENDOFNAMES_MSG, Client_Nick( Client ), "*" );
-} /* IRC_NAMES */
+	strcpy(option_txt, "F");	/* No idea what this means, but the
+					 * original ircd sends it ... */
+#ifdef ZLIB
+	if(options & CONN_ZIP)		/* zlib compression supported. */
+		strcat(option_txt, "z");
+#endif
 
+	return option_txt;
+} /* Option_String */
 
-GLOBAL BOOLEAN IRC_ISON( CLIENT *Client, REQUEST *Req )
+static bool
+Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
 {
-	CHAR rpl[COMMAND_LEN];
-	CLIENT *c;
-	CHAR *ptr;
-	INT i;
-	
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( ! Check_Valid_User( Client )) return CONNECTED;
-
-	/* Falsche Anzahl Parameter? */
-	if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-
-	strcpy( rpl, RPL_ISON_MSG );
-	for( i = 0; i < Req->argc; i++ )
-	{
-		ptr = strtok( Req->argv[i], " " );
-		while( ptr )
-		{
-			ngt_TrimStr( ptr );
-			c = Client_GetFromNick( ptr );
-			if( c && ( c->type == CLIENT_USER ))
-			{
-				/* Dieser Nick ist "online" */
-				strcat( rpl, ptr );
-				strcat( rpl, " " );
-			}
-			ptr = strtok( NULL, " " );
-		}
+	CLIENT *cl, *from;
+	CL2CHAN *cl2chan;
+	CHANNEL *chan;
+	char *currentTarget = Req->argv[0];
+	char *lastCurrentTarget = NULL;
+	char *message = NULL;
+
+	assert(Client != NULL);
+	assert(Req != NULL);
+
+	if (Req->argc == 0) {
+		if (!SendErrors)
+			return CONNECTED;
+		return IRC_WriteStrClient(Client, ERR_NORECIPIENT_MSG,
+					  Client_ID(Client), Req->command);
 	}
-	if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
-
-	return IRC_WriteStrClient( Client, This_Server, rpl, Client->nick );
-} /* IRC_ISON */
-
-
-GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req )
-{
-	CLIENT *c;
-	
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( ! Check_Valid_User( Client )) return CONNECTED;
-
-	/* Falsche Anzahl Parameter? */
-	if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-
-	/* Client suchen */
-	c = Client_GetFromNick( Req->argv[0] );
-	if(( ! c ) || ( c->type != CLIENT_USER )) return IRC_WriteStrClient( Client, This_Server, ERR_NOSUCHNICK_MSG, Client_Nick( Client ), Req->argv[0] );
-	
-	/* Nick, User und Name */
-	if( ! IRC_WriteStrClient( Client, This_Server, RPL_WHOISUSER_MSG, Client_Nick( Client ), c->nick, c->user, c->host, c->name )) return DISCONNECTED;
-
-	/* Server */
-	if( ! IRC_WriteStrClient( Client, This_Server, RPL_WHOISSERVER_MSG, Client_Nick( Client ), c->nick, c->introducer->nick, c->introducer->info )) return DISCONNECTED;
-
-	/* IRC-Operator? */
-	if( strchr( c->modes, 'o' ))
-	{
-		if( ! IRC_WriteStrClient( Client, This_Server, RPL_WHOISOPERATOR_MSG, Client_Nick( Client ), c->nick )) return DISCONNECTED;
+	if (Req->argc == 1) {
+		if (!SendErrors)
+			return CONNECTED;
+		return IRC_WriteStrClient(Client, ERR_NOTEXTTOSEND_MSG,
+					  Client_ID(Client));
 	}
-
-	/* Idle (nur lokale Clients) */
-	if( c->conn_id >= 0 )
-	{
-		if( ! IRC_WriteStrClient( Client, This_Server, RPL_WHOISIDLE_MSG, Client_Nick( Client ), c->nick, Conn_GetIdle( c->conn_id ))) return DISCONNECTED;
+	if (Req->argc > 2) {
+		if (!SendErrors)
+			return CONNECTED;
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
 	}
 
-	/* End of Whois */
-	return IRC_WriteStrClient( Client, This_Server, RPL_ENDOFWHOIS_MSG, Client_Nick( Client ), c->nick );
-} /* IRC_WHOIS */
-
+	if (Client_Type(Client) == CLIENT_SERVER)
+		from = Client_Search(Req->prefix);
+	else
+		from = Client;
+	if (!from)
+		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+					  Client_ID(Client), Req->prefix);
+
+#ifdef ICONV
+	if (Client_Conn(Client) > NONE)
+		message = Conn_EncodingFrom(Client_Conn(Client), Req->argv[1]);
+	else
+#endif
+		message = Req->argv[1];
+
+	/* handle msgtarget = msgto *("," msgto) */
+	currentTarget = strtok_r(currentTarget, ",", &lastCurrentTarget);
+	ngt_UpperStr(Req->command);
+
+	while (currentTarget) {
+		/* Check for and handle valid <msgto> of form:
+		 * RFC 2812 2.3.1:
+		 *   msgto =  channel / ( user [ "%" host ] "@" servername )
+		 *   msgto =/ ( user "%" host ) / targetmask
+		 *   msgto =/ nickname / ( nickname "!" user "@" host )
+		 */
+		if (strchr(currentTarget, '!') == NULL)
+			/* nickname */
+			cl = Client_Search(currentTarget);
+		else
+			cl = NULL;
+
+		if (cl == NULL) {
+			/* If currentTarget isn't a nickname check for:
+			 * user ["%" host] "@" servername
+			 * user "%" host
+			 * nickname "!" user "@" host
+			 */
+			char target[COMMAND_LEN];
+			char * nick = NULL;
+			char * user = NULL;
+			char * host = NULL;
+			char * server = NULL;
+
+			strlcpy(target, currentTarget, COMMAND_LEN);
+			server = strchr(target, '@');
+			if (server) {
+				*server = '\0';
+				server++;
+			}
+			host = strchr(target, '%');
+			if (host) {
+				*host = '\0';
+				host++;
+			}
+			user = strchr(target, '!');
+			if (user) {
+				/* msgto form: nick!user@host */
+				*user = '\0';
+				user++;
+				nick = target;
+				host = server; /* not "@server" but "@host" */
+			} else {
+				user = target;
+			}
 
-GLOBAL BOOLEAN IRC_USERHOST( CLIENT *Client, REQUEST *Req )
-{
-	CHAR rpl[COMMAND_LEN];
-	CLIENT *c;
-	INT max, i;
+			for (cl = Client_First(); cl != NULL; cl = Client_Next(cl)) {
+				if (Client_Type(cl) != CLIENT_USER &&
+				    Client_Type(cl) != CLIENT_SERVICE)
+					continue;
+				if (nick != NULL && host != NULL) {
+					if (strcasecmp(nick, Client_ID(cl)) == 0 &&
+					    strcasecmp(user, Client_User(cl)) == 0 &&
+					    strcasecmp(host, Client_HostnameDisplayed(cl)) == 0)
+						break;
+					else
+						continue;
+				}
+				if (strcasecmp(user, Client_User(cl)) != 0)
+					continue;
+				if (host != NULL && strcasecmp(host,
+						Client_HostnameDisplayed(cl)) != 0)
+					continue;
+				if (server != NULL && strcasecmp(server,
+						Client_ID(Client_Introducer(cl))) != 0)
+					continue;
+				break;
+			}
+		}
 
-	assert( Client != NULL );
-	assert( Req != NULL );
+		if (cl) {
+			/* Target is a user, enforce type */
+#ifndef STRICT_RFC
+			if (Client_Type(cl) != ForceType &&
+			    !(ForceType == CLIENT_USER &&
+			      (Client_Type(cl) == CLIENT_USER ||
+			       Client_Type(cl) == CLIENT_SERVICE))) {
+#else
+			if (Client_Type(cl) != ForceType) {
+#endif
+				if (SendErrors && !IRC_WriteStrClient(
+				    from, ERR_NOSUCHNICK_MSG,Client_ID(from),
+				    currentTarget))
+					return DISCONNECTED;
+				goto send_next_target;
+			}
 
-	if( ! Check_Valid_User( Client )) return CONNECTED;
+#ifndef STRICT_RFC
+			if (ForceType == CLIENT_SERVICE &&
+			    (Conn_Options(Client_Conn(Client_NextHop(cl)))
+			     & CONN_RFC1459)) {
+				/* SQUERY command but RFC 1459 link: convert
+				 * request to PRIVMSG command */
+				Req->command = "PRIVMSG";
+			}
+#endif
+			if (Client_HasMode(cl, 'b') &&
+			    !Client_HasMode(from, 'R') &&
+			    !Client_HasMode(from, 'o') &&
+			    !(Client_Type(from) == CLIENT_SERVER) &&
+			    !(Client_Type(from) == CLIENT_SERVICE)) {
+				if (SendErrors && !IRC_WriteStrClient(from,
+						ERR_NONONREG_MSG,
+						Client_ID(from), Client_ID(cl)))
+					return DISCONNECTED;
+				goto send_next_target;
+			}
 
-	/* Falsche Anzahl Parameter? */
-	if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
+			if (Client_HasMode(cl, 'C')) {
+				cl2chan = Channel_FirstChannelOf(cl);
+				while (cl2chan) {
+					chan = Channel_GetChannel(cl2chan);
+					if (Channel_IsMemberOf(chan, from))
+						break;
+					cl2chan = Channel_NextChannelOf(cl, cl2chan);
+				}
+				if (!cl2chan) {
+					if (SendErrors && !IRC_WriteStrClient(
+					    from, ERR_NOTONSAMECHANNEL_MSG,
+					    Client_ID(from), Client_ID(cl)))
+						return DISCONNECTED;
+					goto send_next_target;
+				}
+			}
 
-	if( Req->argc > 5 ) max = 5;
-	else max = Req->argc;
-	
-	strcpy( rpl, RPL_USERHOST_MSG );
-	for( i = 0; i < max; i++ )
-	{
-		c = Client_GetFromNick( Req->argv[i] );
-		if( c && ( c->type == CLIENT_USER ))
-		{
-			/* Dieser Nick ist "online" */
-			strcat( rpl, c->nick );
-			if( strchr( c->modes, 'o' )) strcat( rpl, "*" );
-			strcat( rpl, "=" );
-			if( strchr( c->modes, 'a' )) strcat( rpl, "-" );
-			else strcat( rpl, "+" );
-			strcat( rpl, c->user );
-			strcat( rpl, "@" );
-			strcat( rpl, c->host );
-			strcat( rpl, " " );
+			if (SendErrors && (Client_Type(Client) != CLIENT_SERVER)
+			    && Client_HasMode(cl, 'a')) {
+				/* Target is away */
+				if (!IRC_WriteStrClient(from, RPL_AWAY_MSG,
+							Client_ID(from),
+							Client_ID(cl),
+							Client_Away(cl)))
+					return DISCONNECTED;
+			}
+			if (Client_Conn(from) > NONE) {
+				Conn_UpdateIdle(Client_Conn(from));
+			}
+			if (!IRC_WriteStrClientPrefix(cl, from, "%s %s :%s",
+						      Req->command, Client_ID(cl),
+						      message))
+				return DISCONNECTED;
+		} else if (ForceType != CLIENT_SERVICE
+			   && (chan = Channel_Search(currentTarget))) {
+			if (!Channel_Write(chan, from, Client, Req->command,
+					   SendErrors, message))
+					return DISCONNECTED;
+		} else if (ForceType != CLIENT_SERVICE
+			/* $#: server/target mask, RFC 2812, sec. 3.3.1 */
+			   && strchr("$#", currentTarget[0])
+			   && strchr(currentTarget, '.')) {
+			/* targetmask */
+			if (!Send_Message_Mask(from, Req->command, currentTarget,
+					       message, SendErrors))
+				return DISCONNECTED;
+		} else {
+			if (!SendErrors)
+				return CONNECTED;
+			if (!IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG,
+						Client_ID(from), currentTarget))
+				return DISCONNECTED;
 		}
-	}
-	if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
-
-	return IRC_WriteStrClient( Client, This_Server, rpl, Client->nick );
-} /* IRC_USERHOST */
 
-
-GLOBAL BOOLEAN IRC_ERROR( CLIENT *Client, REQUEST *Req )
-{
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( Req->argc < 1 ) Log( LOG_NOTICE, "Got ERROR from \"%s!%s@%s\"!", Client_Nick( Client ), Client->user, Client->host );
-	else Log( LOG_NOTICE, "Got ERROR from \"%s!%s@%s\": %s!", Client_Nick( Client ), Client->user, Client->host, Req->argv[0] );
+	send_next_target:
+		currentTarget = strtok_r(NULL, ",", &lastCurrentTarget);
+		if (currentTarget)
+			Conn_SetPenalty(Client_Conn(Client), 1);
+	}
 
 	return CONNECTED;
-} /* IRC_ERROR */
+} /* Send_Message */
 
-
-LOCAL BOOLEAN Check_Valid_User( CLIENT *Client )
+static bool
+Send_Message_Mask(CLIENT * from, char * command, char * targetMask,
+		  char * message, bool SendErrors)
 {
-	assert( Client != NULL );
-
-	if( Client->type != CLIENT_USER )
-	{
-		IRC_WriteStrClient( Client, This_Server, ERR_NOTREGISTERED_MSG, Client_Nick( Client ));
-		return FALSE;
+	CLIENT *cl;
+	bool client_match;
+	char *mask = targetMask + 1;
+	const char *check_wildcards;
+
+	cl = NULL;
+
+	if (!Client_HasMode(from, 'o')) {
+		if (!SendErrors)
+			return true;
+		return IRC_WriteStrClient(from, ERR_NOPRIVILEGES_MSG,
+					  Client_ID(from));
 	}
-	else return TRUE;
-} /* Check_Valid_User */
 
-
-LOCAL BOOLEAN Hello_User( CLIENT *Client )
-{
-	assert( Client != NULL );
-	assert( Client->nick[0] );
-	
-	Log( LOG_NOTICE, "User \"%s!%s@%s\" (%s) registered (connection %d).", Client->nick, Client->user, Client->host, Client->name, Client->conn_id );
-
-	IRC_WriteStrClient( Client, This_Server, RPL_WELCOME_MSG, Client->nick, Client_GetID( Client ));
-	IRC_WriteStrClient( Client, This_Server, RPL_YOURHOST_MSG, Client->nick, This_Server->nick );
-	IRC_WriteStrClient( Client, This_Server, RPL_CREATED_MSG, Client->nick, NGIRCd_StartStr );
-	IRC_WriteStrClient( Client, This_Server, RPL_MYINFO_MSG, Client->nick, This_Server->nick );
-
-	Client->type = CLIENT_USER;
-
-	return Show_MOTD( Client );
-} /* Hello_User */
-
-
-LOCAL BOOLEAN Show_MOTD( CLIENT *Client )
-{
-	BOOLEAN ok;
-	CHAR line[127];
-	FILE *fd;
-	
-	assert( Client != NULL );
-	assert( Client->nick[0] );
-
-	fd = fopen( Conf_MotdFile, "r" );
-	if( ! fd )
+	/*
+	 * RFC 2812, sec. 3.3.1 requires that targetMask have at least one
+	 * dot (".") and no wildcards ("*", "?") following the last one.
+	 */
+	check_wildcards = strrchr(targetMask, '.');
+	assert(check_wildcards != NULL);
+	if (check_wildcards &&
+		check_wildcards[strcspn(check_wildcards, "*?")])
 	{
-		Log( LOG_WARNING, "Can't read MOTD file \"%s\": %s", Conf_MotdFile, strerror( errno ));
-		return IRC_WriteStrClient( Client, This_Server, ERR_NOMOTD_MSG, Client->nick );
+		if (!SendErrors)
+			return true;
+		return IRC_WriteStrClient(from, ERR_WILDTOPLEVEL, targetMask);
 	}
-	
-	IRC_WriteStrClient( Client, This_Server, RPL_MOTDSTART_MSG, Client->nick, This_Server->nick );
-	while( TRUE )
-	{
-		if( ! fgets( line, 126, fd )) break;
-		if( line[strlen( line ) - 1] == '\n' ) line[strlen( line ) - 1] = '\0';
-		IRC_WriteStrClient( Client, This_Server, RPL_MOTD_MSG, Client->nick, line );
-	}
-	ok = IRC_WriteStrClient( Client, This_Server, RPL_ENDOFMOTD_MSG, Client->nick );
-
-	fclose( fd );
-	
-	return ok;
-} /* Show_MOTD */
 
+	/* #: hostmask, see RFC 2812, sec. 3.3.1 */
+	if (targetMask[0] == '#') {
+		for (cl = Client_First(); cl != NULL; cl = Client_Next(cl)) {
+			if (Client_Type(cl) != CLIENT_USER)
+				continue;
+			client_match = MatchCaseInsensitive(mask, Client_Hostname(cl));
+			if (client_match)
+				if (!IRC_WriteStrClientPrefix(cl, from, "%s %s :%s",
+						command, Client_ID(cl), message))
+					return false;
+		}
+	} else {
+		assert(targetMask[0] == '$'); /* $: server mask, see RFC 2812, sec. 3.3.1 */
+		for (cl = Client_First(); cl != NULL; cl = Client_Next(cl)) {
+			if (Client_Type(cl) != CLIENT_USER)
+				continue;
+			client_match = MatchCaseInsensitive(mask,
+					Client_ID(Client_Introducer(cl)));
+			if (client_match)
+				if (!IRC_WriteStrClientPrefix(cl, from, "%s %s :%s",
+						command, Client_ID(cl), message))
+					return false;
+		}
+	}
+	return CONNECTED;
+} /* Send_Message_Mask */
 
 /* -eof- */