X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=0f1bca0ebff79ab15355c6b46be41b80f3efea72;hp=fa60f7591aa84a195a34f59fb32654b0b712651f;hb=b3a64f5e08102846bbad17b10fffad19eabb087e;hpb=32b29d6956cbfb8d76df2d0aa0196e80fa3e6331

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index fa60f759..0f1bca0e 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -9,73 +9,63 @@
  * 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.19 2002/01/02 02:51:39 alex Exp $
+ * $Id: irc.c,v 1.86 2002/03/04 01:43:20 alex Exp $
  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $
- * Revision 1.19  2002/01/02 02:51:39  alex
- * - Copyright-Texte angepasst.
- * - neuer Befehl "ERROR".
+ * Revision 1.86  2002/03/04 01:43:20  alex
+ * - der WHO-Befehl (ohne Argumente) gat teilweise Channel-Names vergessen.
  *
- * 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.85  2002/03/03 19:44:30  alex
+ * - WHO implementiert (bisher ohne Unterstuetzung von Masks)
  *
- * 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.84  2002/03/03 17:15:11  alex
+ * - Source in weitere Module fuer IRC-Befehle aufgesplitted.
  *
- * Revision 1.15  2001/12/30 19:26:11  alex
- * - Unterstuetzung fuer die Konfigurationsdatei eingebaut.
+ * Revision 1.83  2002/02/28 00:48:26  alex
+ * - Forwarding von TOPIC an andere Server gefixed. Hoffentlich ;-)
  *
- * Revision 1.14  2001/12/30 11:42:00  alex
- * - der Server meldet nun eine ordentliche "Start-Zeit".
+ * Revision 1.82  2002/02/27 23:26:36  alex
+ * - einige Funktionen in irc-xxx-Module ausgegliedert.
  *
- * 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.81  2002/02/27 20:55:44  alex
+ * - Channel-Topics werden nun auch korrekt von anderen Server angenommen.
  *
- * Revision 1.12  2001/12/27 19:17:26  alex
- * - neue Befehle PRIVMSG, NOTICE, PING.
+ * Revision 1.80  2002/02/27 20:33:13  alex
+ * - Channel-Topics implementiert.
  *
- * Revision 1.11  2001/12/27 16:55:41  alex
- * - neu: IRC_WriteStrRelated(), Aenderungen auch in IRC_WriteStrClient().
+ * Revision 1.79  2002/02/27 18:57:21  alex
+ * - PRIVMSG zeugt nun bei Texten an User an, wenn diese "away" sind.
  *
- * Revision 1.10  2001/12/26 22:48:53  alex
- * - MOTD-Datei ist nun konfigurierbar und wird gelesen.
+ * Revision 1.78  2002/02/27 18:23:45  alex
+ * - IRC-Befehl "AWAY" implementert.
  *
- * Revision 1.9  2001/12/26 14:45:37  alex
- * - "Code Cleanups".
+ * Revision 1.77  2002/02/27 17:05:41  alex
+ * - PRIVMSG beachtet nun die Channel-Modes "n" und "m".
  *
- * Revision 1.8  2001/12/26 03:21:46  alex
- * - PING/PONG-Befehle implementiert,
- * - Meldungen ueberarbeitet: enthalten nun (fast) immer den Nick.
+ * Revision 1.76  2002/02/27 16:04:14  alex
+ * - Bug bei belegtem Nickname bei User-Registrierung (NICK-Befehl) behoben.
  *
- * Revision 1.7  2001/12/25 23:25:18  alex
- * - und nochmal Aenderungen am Logging ;-)
+ * Revision 1.75  2002/02/27 15:23:27  alex
+ * - NAMES beachtet nun das "invisible" Flag ("i") von Usern.
  *
- * Revision 1.6  2001/12/25 23:13:33  alex
- * - Debug-Meldungen angepasst.
+ * Revision 1.74  2002/02/27 03:44:53  alex
+ * - gerade eben in SQUIT eingefuehrten Bug behoben: entfernte Server werden nun
+ *   nur noch geloescht, die Verbindung, von der SQUIT kam, bleibt wieder offen.
  *
- * Revision 1.5  2001/12/25 22:02:42  alex
- * - neuer IRC-Befehl "/QUIT". Verbessertes Logging & Debug-Ausgaben.
+ * Revision 1.73  2002/02/27 03:08:05  alex
+ * - Log-Meldungen bei SQUIT erneut ueberarbeitet ...
  *
- * 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.72  2002/02/27 02:26:58  alex
+ * - SQUIT wird auf jeden Fall geforwarded, zudem besseres Logging.
  *
- * 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.71  2002/02/27 00:50:05  alex
+ * - einige unnoetige Client_NextHop()-Aufrufe entfernt.
+ * - NAMES korrigiert und komplett implementiert.
  *
- * 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 :-)
+ * Revision 1.70  2002/02/26 22:06:40  alex
+ * - Nick-Aenderungen werden nun wieder korrekt ins Logfile geschrieben.
  */
 
 
@@ -85,517 +75,219 @@
 #include <imp.h>
 #include <assert.h>
 #include <errno.h>
-#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "ngircd.h"
+#include "channel.h"
 #include "client.h"
 #include "conf.h"
 #include "conn.h"
+#include "irc-write.h"
 #include "log.h"
 #include "messages.h"
-#include "parse.h"
 #include "tool.h"
 
 #include <exp.h>
 #include "irc.h"
 
 
-#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, ... )
+GLOBAL BOOLEAN IRC_MOTD( CLIENT *Client, REQUEST *Req )
 {
-	CHAR buffer[1000];
-	BOOLEAN ok = CONNECTED;
-	va_list ap;
-
 	assert( Client != NULL );
-	assert( Format != NULL );
+	assert( Req != NULL );
 
-	va_start( ap, Format );
-	vsnprintf( buffer, 1000, Format, ap );
-	va_end( ap );
+	if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
 
-	/* an den Client selber */
-	ok = IRC_WriteStrClient( Client, Client, buffer );
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-	return ok;
-} /* IRC_WriteStrRelated */
+	return IRC_Show_MOTD( Client );
+} /* IRC_MOTD */
 
 
-GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
 {
+	BOOLEAN is_member, has_voice, is_op, ok;
+	CLIENT *cl, *from;
+	CHANNEL *chan;
+	
 	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 */
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
 
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc == 0 ) return IRC_WriteStrClient( Client, ERR_NORECIPIENT_MSG, Client_ID( Client ), Req->command );
+	if( Req->argc == 1 ) return IRC_WriteStrClient( Client, ERR_NOTEXTTOSEND_MSG, Client_ID( Client ));
+	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
-{
-	assert( Client != NULL );
-	assert( Req != NULL );
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
-	/* 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
+	cl = Client_Search( Req->argv[0] );
+	if( cl )
 	{
-		/* 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 )
+		/* Okay, Ziel ist ein User */
+		if(( Client_Type( Client ) != CLIENT_SERVER ) && ( strchr( Client_Modes( cl ), 'a' )))
 		{
-			/* 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;
+			/* Ziel-User ist AWAY: Meldung verschicken */
+			if( ! IRC_WriteStrClient( from, RPL_AWAY_MSG, Client_ID( from ), Client_ID( cl ), Client_Away( cl ))) return DISCONNECTED;
 		}
-		return CONNECTED;
-	}
-	else return IRC_WriteStrClient( Client, This_Server, ERR_ALREADYREGISTRED_MSG, Client_Nick( Client ));
-} /* IRC_NICK */
-
-
-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 ));
+		/* Text senden */
+		if( Client_Conn( from ) > NONE ) Conn_UpdateIdle( Client_Conn( from ));
+		return IRC_WriteStrClientPrefix( cl, from, "PRIVMSG %s :%s", Client_ID( cl ), Req->argv[1] );
 	}
-	else return IRC_WriteStrClient( Client, This_Server, ERR_NOTREGISTERED_MSG, Client_Nick( Client ));
-} /* IRC_USER */
-
 
-GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req )
-{
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( Client->type != CLIENT_SERVER && Client->type != CLIENT_SERVICE )
+	chan = Channel_Search( Req->argv[0] );
+	if( chan )
 	{
-		/* 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;
-	}
-	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 */
-
-
-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_DEBUG, "Connection %d: received PONG.", Client->conn_id );
-	return CONNECTED;
-} /* IRC_PONG */
-
-
-GLOBAL BOOLEAN IRC_MOTD( 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 */
-
-
-GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
-{
-	CLIENT *to;
-	
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( ! Check_Valid_User( Client )) return CONNECTED;
+		/* Okay, Ziel ist ein Channel */
+		is_member = has_voice = is_op = FALSE;
+		if( Channel_IsMemberOf( chan, from ))
+		{
+			is_member = TRUE;
+			if( strchr( Channel_UserModes( chan, from ), 'v' )) has_voice = TRUE;
+			if( strchr( Channel_UserModes( chan, from ), 'o' )) is_op = TRUE;
+		}
+		
+		/* pruefen, ob Client in Channel schreiben darf */
+		ok = TRUE;
+		if( strchr( Channel_Modes( chan ), 'n' ) && ( ! is_member )) ok = FALSE;
+		if( strchr( Channel_Modes( chan ), 'm' ) && ( ! is_op ) && ( ! has_voice )) ok = FALSE;
 
-	/* 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 );
+		if( ! ok ) return IRC_WriteStrClient( from, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( from ), Req->argv[0] );
 
-	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] );
+		/* Text senden */
+		if( Client_Conn( from ) > NONE ) Conn_UpdateIdle( Client_Conn( from ));
+		return IRC_WriteStrChannelPrefix( Client, chan, from, TRUE, "PRIVMSG %s :%s", Req->argv[0], Req->argv[1] );
 	}
 
-	return IRC_WriteStrClient( Client, This_Server, ERR_NOSUCHNICK_MSG, Client_Nick( Client ), Req->argv[0] );
+	return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[0] );
 } /* IRC_PRIVMSG */
 
 
 GLOBAL BOOLEAN IRC_NOTICE( CLIENT *Client, REQUEST *Req )
 {
-	CLIENT *to;
+	CLIENT *to, *from;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if( ! Check_Valid_User( Client )) return CONNECTED;
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
 
 	/* Falsche Anzahl Parameter? */
 	if( Req->argc != 2 ) return CONNECTED;
 
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
 	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 IRC_WriteStrClientPrefix( to, from, "NOTICE %s :%s", Client_ID( to ), Req->argv[1] );
 	}
-
-	return CONNECTED;
+	else return CONNECTED;
 } /* IRC_NOTICE */
 
 
-GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
+GLOBAL BOOLEAN IRC_NAMES( CLIENT *Client, REQUEST *Req )
 {
-	CHAR x[2], new_modes[CLIENT_MODE_LEN], *ptr, *p;
-	BOOLEAN set, ok;
+	CHAR rpl[COMMAND_LEN], *ptr;
+	CLIENT *target, *from, *c;
+	CHANNEL *chan;
 	
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if( ! Check_Valid_User( Client )) return CONNECTED;
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
 
 	/* 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 ));
+	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-	/* 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, "-" );
-
-	ptr++;
-	ok = TRUE;
-	x[1] = '\0';
-	while( *ptr )
+	/* From aus Prefix ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+	
+	if( Req->argc == 2 )
 	{
-		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;
+		/* an anderen Server forwarden */
+		target = Client_GetFromID( Req->argv[1] );
+		if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
 
-		/* Okay, gueltigen Mode gefunden */
-		if( set )
+		if( target != Client_ThisServer( ))
 		{
-			/* 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 );
-			}
+			/* Ok, anderer Server ist das Ziel: forwarden */
+			return IRC_WriteStrClientPrefix( target, from, "NAMES %s :%s", Req->argv[0], Req->argv[1] );
 		}
-		else
+	}
+
+	if( Req->argc > 0 )
+	{
+		/* bestimmte Channels durchgehen */
+		ptr = strtok( Req->argv[0], "," );
+		while( ptr )
 		{
-			/* Modes sollen geloescht werden */
-			p = strchr( Client->modes, x[0] );
-			if( p )
+			chan = Channel_Search( ptr );
+			if( chan )
 			{
-				/* Client hat den Mode -> loeschen */
-				while( *p )
-				{
-					*p = *(p + 1);
-					p++;
-				}
-				strcat( new_modes, x );
+				/* Namen ausgeben */
+				if( ! IRC_Send_NAMES( from, chan )) return DISCONNECTED;
 			}
+			if( ! IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), ptr )) return DISCONNECTED;
+			
+			/* naechsten Namen ermitteln */
+			ptr = strtok( NULL, "," );
 		}
+		return CONNECTED;
 	}
 	
-	/* 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 */
-
-
-GLOBAL BOOLEAN IRC_OPER( CLIENT *Client, REQUEST *Req )
-{
-	INT i;
-	
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	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 );
-
-	/* Operator suchen */
-	for( i = 0; i < Conf_Oper_Count; i++)
+	/* alle Channels durchgehen */
+	chan = Channel_First( );
+	while( chan )
 	{
-		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 ));
+		/* Namen ausgeben */
+		if( ! IRC_Send_NAMES( from, chan )) return DISCONNECTED;
 
-	/* 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;
+		/* naechster Channel */
+		chan = Channel_Next( chan );
 	}
 
-	if( ! Client->oper_by_me ) Log( LOG_NOTICE, "User \"%s!%s@%s\" is now an IRC Operator.", Client->nick, Client->user, Client->host );
-
-	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 ));
-
-	Log( LOG_NOTICE, "Got DIE command from \"%s!%s@%s\", going down!", Client->nick, Client->user, Client->host );
-	NGIRCd_Quit = TRUE;
-	return CONNECTED;
-} /* IRC_DIE */
-
-
-GLOBAL BOOLEAN IRC_RESTART( 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 ));
-
-	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 )
-{
-	CHAR rpl[COMMAND_LEN];
-	CLIENT *c;
-	
-	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 );
-
-	/* Noch alle User ausgeben, die in keinem Channel sind */
-	rpl[0] = '\0';
+	/* Nun noch alle Clients ausgeben, die in keinem Channel sind */
 	c = Client_First( );
+	sprintf( rpl, RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
 	while( c )
 	{
-		if( c->type == CLIENT_USER )
+		if(( Client_Type( c ) == CLIENT_USER ) && ( Channel_FirstChannelOf( c ) == NULL ) && ( ! strchr( Client_Modes( c ), 'i' )))
 		{
-			/* Okay, das ist ein User */
-			strcat( rpl, Client_Nick( c ));
-			strcat( rpl, " " );
-		}
+			/* Okay, das ist ein User: anhaengen */
+			if( rpl[strlen( rpl ) - 1] != ':' ) strcat( rpl, " " );
+			strcat( rpl, Client_ID( c ));
 
-		/* 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';
+			if( strlen( rpl ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
+			{
+				/* Zeile wird zu lang: senden! */
+				if( ! IRC_WriteStrClient( from, rpl )) return DISCONNECTED;
+				sprintf( rpl, RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
+			}
 		}
-		
+
+		/* naechster Client */
 		c = Client_Next( c );
 	}
-	if( rpl[0] )
+	if( rpl[strlen( rpl ) - 1] != ':')
 	{
 		/* 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;
+		if( ! IRC_WriteStrClient( from, rpl )) return DISCONNECTED;
 	}
-	return IRC_WriteStrClient( Client, This_Server, RPL_ENDOFNAMES_MSG, Client_Nick( Client ), "*" );
+	
+	return IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), "*" );
 } /* IRC_NAMES */
 
 
@@ -609,10 +301,10 @@ GLOBAL BOOLEAN IRC_ISON( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if( ! Check_Valid_User( Client )) return CONNECTED;
+	if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
 
 	/* Falsche Anzahl Parameter? */
-	if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
+	if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
 	strcpy( rpl, RPL_ISON_MSG );
 	for( i = 0; i < Req->argc; i++ )
@@ -621,8 +313,8 @@ GLOBAL BOOLEAN IRC_ISON( CLIENT *Client, REQUEST *Req )
 		while( ptr )
 		{
 			ngt_TrimStr( ptr );
-			c = Client_GetFromNick( ptr );
-			if( c && ( c->type == CLIENT_USER ))
+			c = Client_GetFromID( ptr );
+			if( c && ( Client_Type( c ) == CLIENT_USER ))
 			{
 				/* Dieser Nick ist "online" */
 				strcat( rpl, ptr );
@@ -633,49 +325,184 @@ GLOBAL BOOLEAN IRC_ISON( CLIENT *Client, REQUEST *Req )
 	}
 	if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
 
-	return IRC_WriteStrClient( Client, This_Server, rpl, Client->nick );
+	return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
 } /* IRC_ISON */
 
 
 GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 {
-	CLIENT *c;
+	CLIENT *from, *target, *c;
+	CHAR str[LINE_LEN + 1], *ptr = NULL;
+	CL2CHAN *cl2chan;
+	CHANNEL *chan;
 	
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if( ! Check_Valid_User( Client )) return CONNECTED;
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
 
 	/* Falsche Anzahl Parameter? */
-	if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
+	if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( 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] );
+	c = Client_GetFromID( Req->argv[Req->argc - 1] );
+	if(( ! c ) || ( Client_Type( c ) != CLIENT_USER )) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[Req->argc - 1] );
+
+	/* Empfaenger des WHOIS suchen */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+	
+	/* Forwarden an anderen Server? */
+	if( Req->argc > 1 )
+	{
+		/* angegebenen Ziel-Server suchen */
+		target = Client_GetFromID( Req->argv[1] );
+		if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
+		ptr = Req->argv[1];
+	}
+	else target = Client_ThisServer( );
+
+	assert( target != NULL );
+	
+	if(( Client_NextHop( target ) != Client_ThisServer( )) && ( Client_Type( Client_NextHop( target )) == CLIENT_SERVER )) return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], ptr );
 	
 	/* 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;
+	if( ! IRC_WriteStrClient( from, RPL_WHOISUSER_MSG, Client_ID( from ), Client_ID( c ), Client_User( c ), Client_Hostname( c ), Client_Info( c ))) 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;
+	if( ! IRC_WriteStrClient( from, RPL_WHOISSERVER_MSG, Client_ID( from ), Client_ID( c ), Client_ID( Client_Introducer( c )), Client_Info( Client_Introducer( c )))) return DISCONNECTED;
+
+	/* Channels */
+	sprintf( str, RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c ));
+	cl2chan = Channel_FirstChannelOf( c );
+	while( cl2chan )
+	{
+		chan = Channel_GetChannel( cl2chan );
+		assert( chan != NULL );
+		
+		/* Channel-Name anhaengen */
+		if( str[strlen( str ) - 1] != ':' ) strcat( str, " " );
+		if( strchr( Channel_UserModes( chan, c ), 'v' )) strcat( str, "+" );
+		if( strchr( Channel_UserModes( chan, c ), 'o' )) strcat( str, "@" );
+		strcat( str, Channel_Name( chan ));
+
+		if( strlen( str ) > ( LINE_LEN - CHANNEL_NAME_LEN - 4 ))
+		{
+			/* Zeile wird zu lang: senden! */
+			if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+			sprintf( str, RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c ));
+		}
 
+		/* naechstes Mitglied suchen */
+		cl2chan = Channel_NextChannelOf( c, cl2chan );
+	}
+	if( str[strlen( str ) - 1] != ':')
+	{
+		/* Es sind noch Daten da, die gesendet werden muessen */
+		if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+	}
+	
 	/* IRC-Operator? */
-	if( strchr( c->modes, 'o' ))
+	if( Client_HasMode( c, 'o' ))
 	{
-		if( ! IRC_WriteStrClient( Client, This_Server, RPL_WHOISOPERATOR_MSG, Client_Nick( Client ), c->nick )) return DISCONNECTED;
+		if( ! IRC_WriteStrClient( from, RPL_WHOISOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED;
 	}
 
 	/* Idle (nur lokale Clients) */
-	if( c->conn_id >= 0 )
+	if( Client_Conn( c ) > NONE )
+	{
+		if( ! IRC_WriteStrClient( from, RPL_WHOISIDLE_MSG, Client_ID( from ), Client_ID( c ), Conn_GetIdle( Client_Conn ( c )))) return DISCONNECTED;
+	}
+
+	/* Away? */
+	if( Client_HasMode( c, 'a' ))
 	{
-		if( ! IRC_WriteStrClient( Client, This_Server, RPL_WHOISIDLE_MSG, Client_Nick( Client ), c->nick, Conn_GetIdle( c->conn_id ))) return DISCONNECTED;
+		if( ! IRC_WriteStrClient( from, RPL_AWAY_MSG, Client_ID( from ), Client_ID( c ), Client_Away( c ))) return DISCONNECTED;
 	}
 
 	/* End of Whois */
-	return IRC_WriteStrClient( Client, This_Server, RPL_ENDOFWHOIS_MSG, Client_Nick( Client ), c->nick );
+	return IRC_WriteStrClient( from, RPL_ENDOFWHOIS_MSG, Client_ID( from ), Client_ID( c ));
 } /* IRC_WHOIS */
 
 
+GLOBAL BOOLEAN IRC_WHO( CLIENT *Client, REQUEST *Req )
+{
+	BOOLEAN ok, only_ops;
+	CHAR flags[8], *ptr;
+	CL2CHAN *cl2chan;
+	CHANNEL *chan;
+	CLIENT *c;
+	
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	if( Client_Type( Client ) != CLIENT_USER ) 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 );
+
+	only_ops = FALSE;
+	chan = NULL;
+
+	if( Req->argc == 2 )
+	{
+		/* Nur OPs anzeigen? */
+		if( strcmp( Req->argv[1], "o" ) == 0 ) only_ops = TRUE;
+#ifdef STRICT_RFC
+		else return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+#endif
+	}
+	
+	if( Req->argc >= 1 )
+	{
+		/* wurde ein Channel oder Nick-Mask angegeben? */
+		chan = Channel_Search( Req->argv[0] );
+	}
+
+	if( chan )
+	{
+		/* User eines Channels ausgeben */
+		if( ! IRC_Send_WHO( Client, chan, only_ops )) return DISCONNECTED;
+	}
+
+	c = Client_First( );
+	while( c )
+	{
+		if(( Client_Type( c ) == CLIENT_USER ) && ( ! strchr( Client_Modes( c ), 'i' )))
+		{
+			ok = FALSE;
+			if( Req->argc == 0 ) ok = TRUE;
+			else
+			{
+				if( strcasecmp( Req->argv[0], Client_ID( c )) == 0 ) ok = TRUE;
+				else if( strcmp( Req->argv[0], "0" ) == 0 ) ok = TRUE;
+			}
+				
+			if( ok && (( ! only_ops ) || ( strchr( Client_Modes( c ), 'o' ))))
+			{
+				/* Flags zusammenbasteln */
+				strcpy( flags, "H" );
+				if( strchr( Client_Modes( c ), 'o' )) strcat( flags, "*" );
+
+				/* ausgeben */
+				cl2chan = Channel_FirstChannelOf( c );
+				if( cl2chan ) ptr = Channel_Name( Channel_GetChannel( cl2chan ));
+				else ptr = "*";
+				if( ! IRC_WriteStrClient( Client, RPL_WHOREPLY_MSG, Client_ID( Client ), ptr, Client_User( c ), Client_Hostname( c ), Client_ID( Client_Introducer( c )), Client_ID( c ), flags, Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
+			}
+		}
+
+		/* naechster Client */
+		c = Client_Next( c );
+	}
+
+	if( chan ) return IRC_WriteStrClient( Client, RPL_ENDOFWHO_MSG, Client_ID( Client ), Channel_Name( chan ));
+	else if( Req->argc == 0 ) return IRC_WriteStrClient( Client, RPL_ENDOFWHO_MSG, Client_ID( Client ), "*" );
+	else return IRC_WriteStrClient( Client, RPL_ENDOFWHO_MSG, Client_ID( Client ), Req->argv[0] );
+} /* IRC_WHO */
+
+
 GLOBAL BOOLEAN IRC_USERHOST( CLIENT *Client, REQUEST *Req )
 {
 	CHAR rpl[COMMAND_LEN];
@@ -685,10 +512,10 @@ GLOBAL BOOLEAN IRC_USERHOST( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if( ! Check_Valid_User( Client )) return CONNECTED;
+	if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
 
 	/* Falsche Anzahl Parameter? */
-	if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
+	if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
 	if( Req->argc > 5 ) max = 5;
 	else max = Req->argc;
@@ -696,24 +523,24 @@ GLOBAL BOOLEAN IRC_USERHOST( CLIENT *Client, REQUEST *Req )
 	strcpy( rpl, RPL_USERHOST_MSG );
 	for( i = 0; i < max; i++ )
 	{
-		c = Client_GetFromNick( Req->argv[i] );
-		if( c && ( c->type == CLIENT_USER ))
+		c = Client_GetFromID( Req->argv[i] );
+		if( c && ( Client_Type( c ) == CLIENT_USER ))
 		{
 			/* Dieser Nick ist "online" */
-			strcat( rpl, c->nick );
-			if( strchr( c->modes, 'o' )) strcat( rpl, "*" );
+			strcat( rpl, Client_ID( c ));
+			if( Client_HasMode( c, 'o' )) strcat( rpl, "*" );
 			strcat( rpl, "=" );
-			if( strchr( c->modes, 'a' )) strcat( rpl, "-" );
+			if( Client_HasMode( c, 'a' )) strcat( rpl, "-" );
 			else strcat( rpl, "+" );
-			strcat( rpl, c->user );
+			strcat( rpl, Client_User( c ));
 			strcat( rpl, "@" );
-			strcat( rpl, c->host );
+			strcat( rpl, Client_Hostname( c ));
 			strcat( rpl, " " );
 		}
 	}
 	if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
 
-	return IRC_WriteStrClient( Client, This_Server, rpl, Client->nick );
+	return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
 } /* IRC_USERHOST */
 
 
@@ -722,73 +549,325 @@ 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] );
+	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] );
 
 	return CONNECTED;
 } /* IRC_ERROR */
 
 
-LOCAL BOOLEAN Check_Valid_User( CLIENT *Client )
+GLOBAL BOOLEAN IRC_LUSERS( CLIENT *Client, REQUEST *Req )
 {
+	CLIENT *target, *from;
+	
 	assert( Client != NULL );
+	assert( Req != NULL );
+
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( 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 );
+
+	/* Absender ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
-	if( Client->type != CLIENT_USER )
+	/* An anderen Server forwarden? */
+	if( Req->argc == 2 )
 	{
-		IRC_WriteStrClient( Client, This_Server, ERR_NOTREGISTERED_MSG, Client_Nick( Client ));
-		return FALSE;
+		target = Client_GetFromID( Req->argv[1] );
+		if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] );
+		else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LUSERS %s %s", Req->argv[0], Req->argv[1] );
 	}
-	else return TRUE;
-} /* Check_Valid_User */
 
+	/* Wer ist der Absender? */
+	if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_GetFromID( Req->prefix );
+	else target = Client;
+	if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+	
+	IRC_Send_LUSERS( target );
+
+	return CONNECTED;
+} /* IRC_LUSERS */
 
-LOCAL BOOLEAN Hello_User( CLIENT *Client )
+
+GLOBAL BOOLEAN IRC_LINKS( CLIENT *Client, REQUEST *Req )
 {
+	CLIENT *target, *from, *c;
+	CHAR *mask;
+	
 	assert( Client != NULL );
-	assert( Client->nick[0] );
+	assert( Req != NULL );
+
+	if(( Client_Type( Client ) != CLIENT_USER ) && ( 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 );
+
+	/* Server-Mask ermitteln */
+	if( Req->argc > 0 ) mask = Req->argv[Req->argc - 1];
+	else mask = "*";
+
+	/* Absender ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+	else from = Client;
+	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 	
-	Log( LOG_NOTICE, "User \"%s!%s@%s\" (%s) registered (connection %d).", Client->nick, Client->user, Client->host, Client->name, Client->conn_id );
+	/* An anderen Server forwarden? */
+	if( Req->argc == 2 )
+	{
+		target = Client_GetFromID( Req->argv[0] );
+		if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+		else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LINKS %s %s", Req->argv[0], Req->argv[1] );
+	}
 
-	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 );
+	/* Wer ist der Absender? */
+	if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_GetFromID( Req->prefix );
+	else target = Client;
+	if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+	
+	c = Client_First( );
+	while( c )
+	{
+		if( Client_Type( c ) == CLIENT_SERVER )
+		{
+			if( ! IRC_WriteStrClient( target, RPL_LINKS_MSG, Client_ID( target ), Client_ID( c ), Client_ID( Client_TopServer( c ) ? Client_TopServer( c ) : Client_ThisServer( )), Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
+		}
+		c = Client_Next( c );
+	}
+	
+	return IRC_WriteStrClient( target, RPL_ENDOFLINKS_MSG, Client_ID( target ), mask );
+} /* IRC_LINKS */
+
+
+GLOBAL BOOLEAN IRC_VERSION( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *target, *prefix;
+	
+	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 );
+
+	/* Ziel suchen */
+	if( Req->argc == 1 ) target = Client_GetFromID( Req->argv[0] );
+	else target = Client_ThisServer( );
+
+	/* Prefix ermitteln */
+	if( Client_Type( Client ) == CLIENT_SERVER ) prefix = Client_GetFromID( Req->prefix );
+	else prefix = Client;
+	if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+	
+	/* An anderen Server weiterleiten? */
+	if( target != Client_ThisServer( ))
+	{
+		if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+
+		/* forwarden */
+		IRC_WriteStrClientPrefix( target, prefix, "VERSION %s", Req->argv[0] );
+		return CONNECTED;
+	}
+
+	/* mit Versionsinfo antworten */
+	return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( ));
+} /* IRC_VERSION */
+
+
+GLOBAL BOOLEAN IRC_KILL( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *prefix, *c;
+	
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	if( Client_Type( Client ) != CLIENT_SERVER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
 
-	Client->type = CLIENT_USER;
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc != 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-	return Show_MOTD( Client );
-} /* Hello_User */
+	prefix = Client_GetFromID( Req->prefix );
+	if( ! prefix )
+	{
+		Log( LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!", Req->prefix );
+		prefix = Client_ThisServer( );
+	}
+	
+	Log( LOG_NOTICE, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] );
+	
+	/* andere Server benachrichtigen */
+	IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], Req->argv[1] );
 
+	/* haben wir selber einen solchen Client? */
+	c = Client_GetFromID( Req->argv[0] );
+	if( c && ( Client_Conn( c ) != NONE )) Conn_Close( Client_Conn( c ), NULL, Req->argv[1], TRUE );
+	
+	return CONNECTED;
+} /* IRC_KILL */
 
-LOCAL BOOLEAN Show_MOTD( CLIENT *Client )
+
+GLOBAL BOOLEAN IRC_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 )
 	{
 		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 );
+		return IRC_WriteStrClient( Client, ERR_NOMOTD_MSG, Client_ID( Client ) );
 	}
 	
-	IRC_WriteStrClient( Client, This_Server, RPL_MOTDSTART_MSG, Client->nick, This_Server->nick );
+	IRC_WriteStrClient( Client, RPL_MOTDSTART_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )));
 	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 );
+		if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), line ))
+		{
+			fclose( fd );
+			return FALSE;
+		}
 	}
-	ok = IRC_WriteStrClient( Client, This_Server, RPL_ENDOFMOTD_MSG, Client->nick );
+	ok = IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ) );
 
 	fclose( fd );
 	
 	return ok;
-} /* Show_MOTD */
+} /* IRC_Show_MOTD */
+
+
+GLOBAL BOOLEAN IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
+{
+	BOOLEAN is_visible, is_member;
+	CHAR str[LINE_LEN + 1];
+	CL2CHAN *cl2chan;
+	CLIENT *cl;
+	
+	assert( Client != NULL );
+	assert( Chan != NULL );
+
+	if( Channel_IsMemberOf( Chan, Client )) is_member = TRUE;
+	else is_member = FALSE;
+			 
+	/* Alle Mitglieder suchen */
+	sprintf( str, RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
+	cl2chan = Channel_FirstMember( Chan );
+	while( cl2chan )
+	{
+		cl = Channel_GetClient( cl2chan );
+
+		if( strchr( Client_Modes( cl ), 'i' )) is_visible = FALSE;
+		else is_visible = TRUE;
+
+		if( is_member || is_visible )
+		{
+			/* Nick 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 wird zu lang: senden! */
+				if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+				sprintf( str, RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
+			}
+		}
+
+		/* naechstes Mitglied suchen */
+		cl2chan = Channel_NextMember( Chan, cl2chan );
+	}
+	if( str[strlen( str ) - 1] != ':')
+	{
+		/* Es sind noch Daten da, die gesendet werden muessen */
+		if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+	}
+
+	return CONNECTED;
+} /* IRC_Send_NAMES */
+
+
+GLOBAL BOOLEAN IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps )
+{
+	BOOLEAN is_visible, is_member;
+	CL2CHAN *cl2chan;
+	CHAR flags[8];
+	CLIENT *c;
+
+	assert( Client != NULL );
+	assert( Chan != NULL );
+
+	if( Channel_IsMemberOf( Chan, Client )) is_member = TRUE;
+	else is_member = FALSE;
+
+	/* Alle Mitglieder suchen */
+	cl2chan = Channel_FirstMember( Chan );
+	while( cl2chan )
+	{
+		c = Channel_GetClient( cl2chan );
+
+		if( strchr( Client_Modes( c ), 'i' )) is_visible = FALSE;
+		else is_visible = TRUE;
+
+		if( is_member || is_visible )
+		{
+			/* Flags zusammenbasteln */
+			strcpy( flags, "H" );
+			if( strchr( Client_Modes( c ), 'o' )) strcat( flags, "*" );
+			if( strchr( Channel_UserModes( Chan, c ), 'v' )) strcat( flags, "+" );
+			if( strchr( Channel_UserModes( Chan, c ), 'o' )) strcat( flags, "@" );
+			
+			/* ausgeben */
+			if(( ! OnlyOps ) || ( strchr( Client_Modes( c ), 'o' )))
+			{
+				if( ! IRC_WriteStrClient( Client, RPL_WHOREPLY_MSG, Client_ID( Client ), Channel_Name( Chan ), Client_User( c ), Client_Hostname( c ), Client_ID( Client_Introducer( c )), Client_ID( c ), flags, Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
+			}
+		}
+
+		/* naechstes Mitglied suchen */
+		cl2chan = Channel_NextMember( Chan, cl2chan );
+	}
+	return CONNECTED;
+} /* IRC_Send_WHO */
+
+
+GLOBAL BOOLEAN IRC_Send_LUSERS( CLIENT *Client )
+{
+	INT cnt;
+
+	assert( Client != NULL );
+
+	/* Users, Services und Serevr im Netz */
+	if( ! IRC_WriteStrClient( Client, RPL_LUSERCLIENT_MSG, Client_ID( Client ), Client_UserCount( ), Client_ServiceCount( ), Client_ServerCount( ))) return DISCONNECTED;
+
+	/* IRC-Operatoren im Netz */
+	cnt = Client_OperCount( );
+	if( cnt > 0 )
+	{
+		if( ! IRC_WriteStrClient( Client, RPL_LUSEROP_MSG, Client_ID( Client ), cnt )) return DISCONNECTED;
+	}
+
+	/* Unbekannt Verbindungen */
+	cnt = Client_UnknownCount( );
+	if( cnt > 0 )
+	{
+		if( ! IRC_WriteStrClient( Client, RPL_LUSERUNKNOWN_MSG, Client_ID( Client ), cnt )) return DISCONNECTED;
+	}
+
+	/* Channels im Netz */
+	if( ! IRC_WriteStrClient( Client, RPL_LUSERCHANNELS_MSG, Client_ID( Client ), Channel_Count( ))) return DISCONNECTED;
+
+	/* Channels im Netz */
+	if( ! IRC_WriteStrClient( Client, RPL_LUSERME_MSG, Client_ID( Client ), Client_MyUserCount( ), Client_MyServiceCount( ), Client_MyServerCount( ))) return DISCONNECTED;
+	
+	return CONNECTED;
+} /* IRC_Send_LUSERS */
 
 
 /* -eof- */