]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/irc-info.c
Introduce option to configure the maximum nick name lenth in ngircd.conf
[ngircd-alex.git] / src / ngircd / irc-info.c
index 922e2761c36600c760deab753e5c60e18f4d4b8c..683f7d1b04b8a79f0f3ff04f2d94771c14270ee4 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 Alexander Barton (alex@barton.de)
  *
  * 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
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-info.c,v 1.6 2002/12/16 17:14:57 alex Exp $";
+static char UNUSED id[] = "$Id: irc-info.c,v 1.40 2007/11/21 12:16:36 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 #include "ngircd.h"
-#include "conn.h"
+#include "cvs-version.h"
+#include "conn-func.h"
+#include "conn-zip.h"
 #include "client.h"
 #include "channel.h"
 #include "resolve.h"
@@ -39,7 +43,7 @@ static char UNUSED id[] = "$Id: irc-info.c,v 1.6 2002/12/16 17:14:57 alex Exp $"
 #include "irc-info.h"
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_ADMIN(CLIENT *Client, REQUEST *Req )
 {
        CLIENT *target, *prefix;
@@ -62,7 +66,7 @@ IRC_ADMIN(CLIENT *Client, REQUEST *Req )
        /* An anderen Server weiterleiten? */
        if( target != Client_ThisServer( ))
        {
-               if( ! target ) return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG, Client_ID( prefix ), Req->argv[0] );
+               if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG, Client_ID( prefix ), Req->argv[0] );
 
                /* forwarden */
                IRC_WriteStrClientPrefix( target, prefix, "ADMIN %s", Req->argv[0] );
@@ -75,17 +79,18 @@ IRC_ADMIN(CLIENT *Client, REQUEST *Req )
        if( ! IRC_WriteStrClient( Client, RPL_ADMINLOC2_MSG, Client_ID( prefix ), Conf_ServerAdmin2 )) return DISCONNECTED;
        if( ! IRC_WriteStrClient( Client, RPL_ADMINEMAIL_MSG, Client_ID( prefix ), Conf_ServerAdminMail )) return DISCONNECTED;
 
+       IRC_SetPenalty( Client, 1 );
        return CONNECTED;
 } /* IRC_ADMIN */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_ISON( CLIENT *Client, REQUEST *Req )
 {
-       CHAR rpl[COMMAND_LEN];
+       char rpl[COMMAND_LEN];
        CLIENT *c;
-       CHAR *ptr;
-       INT i;
+       char *ptr;
+       int i;
 
        assert( Client != NULL );
        assert( Req != NULL );
@@ -93,7 +98,7 @@ IRC_ISON( CLIENT *Client, REQUEST *Req )
        /* Falsche Anzahl Parameter? */
        if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-       strcpy( rpl, RPL_ISON_MSG );
+       strlcpy( rpl, RPL_ISON_MSG, sizeof rpl );
        for( i = 0; i < Req->argc; i++ )
        {
                ptr = strtok( Req->argv[i], " " );
@@ -104,23 +109,23 @@ IRC_ISON( CLIENT *Client, REQUEST *Req )
                        if( c && ( Client_Type( c ) == CLIENT_USER ))
                        {
                                /* Dieser Nick ist "online" */
-                               strcat( rpl, ptr );
-                               strcat( rpl, " " );
+                               strlcat( rpl, ptr, sizeof( rpl ));
+                               strlcat( rpl, " ", sizeof( rpl ));
                        }
                        ptr = strtok( NULL, " " );
                }
        }
-       if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
+       ngt_TrimLastChr(rpl, ' ');
 
        return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
 } /* IRC_ISON */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_LINKS( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *target, *from, *c;
-       CHAR *mask;
+       char *mask;
 
        assert( Client != NULL );
        assert( Req != NULL );
@@ -141,7 +146,7 @@ IRC_LINKS( CLIENT *Client, REQUEST *Req )
        if( Req->argc == 2 )
        {
                target = Client_Search( Req->argv[0] );
-               if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] );
+               if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] );
                else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LINKS %s %s", Req->argv[0], Req->argv[1] );
        }
 
@@ -159,12 +164,13 @@ IRC_LINKS( CLIENT *Client, REQUEST *Req )
                }
                c = Client_Next( c );
        }
-
+       
+       IRC_SetPenalty( target, 1 );
        return IRC_WriteStrClient( target, RPL_ENDOFLINKS_MSG, Client_ID( target ), mask );
 } /* IRC_LINKS */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_LUSERS( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *target, *from;
@@ -184,7 +190,7 @@ IRC_LUSERS( CLIENT *Client, REQUEST *Req )
        if( Req->argc == 2 )
        {
                target = Client_Search( Req->argv[1] );
-               if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
+               if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
                else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LUSERS %s %s", Req->argv[0], Req->argv[1] );
        }
 
@@ -195,11 +201,12 @@ IRC_LUSERS( CLIENT *Client, REQUEST *Req )
 
        IRC_Send_LUSERS( target );
 
+       IRC_SetPenalty( target, 1 );
        return CONNECTED;
 } /* IRC_LUSERS */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_MOTD( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *from, *target;
@@ -219,7 +226,7 @@ IRC_MOTD( CLIENT *Client, REQUEST *Req )
        {
                /* an anderen Server forwarden */
                target = Client_Search( Req->argv[0] );
-               if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] );
+               if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] );
 
                if( target != Client_ThisServer( ))
                {
@@ -228,14 +235,15 @@ IRC_MOTD( CLIENT *Client, REQUEST *Req )
                }
        }
 
+       IRC_SetPenalty( from, 3 );
        return IRC_Show_MOTD( from );
 } /* IRC_MOTD */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_NAMES( CLIENT *Client, REQUEST *Req )
 {
-       CHAR rpl[COMMAND_LEN], *ptr;
+       char rpl[COMMAND_LEN], *ptr;
        CLIENT *target, *from, *c;
        CHANNEL *chan;
 
@@ -254,7 +262,7 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
        {
                /* an anderen Server forwarden */
                target = Client_Search( Req->argv[1] );
-               if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
+               if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
 
                if( target != Client_ThisServer( ))
                {
@@ -296,20 +304,20 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
 
        /* Nun noch alle Clients ausgeben, die in keinem Channel sind */
        c = Client_First( );
-       sprintf( rpl, RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
+       snprintf( rpl, sizeof( rpl ), RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
        while( c )
        {
                if(( Client_Type( c ) == CLIENT_USER ) && ( Channel_FirstChannelOf( c ) == NULL ) && ( ! strchr( Client_Modes( c ), 'i' )))
                {
                        /* Okay, das ist ein User: anhaengen */
-                       if( rpl[strlen( rpl ) - 1] != ':' ) strcat( rpl, " " );
-                       strcat( rpl, Client_ID( c ));
+                       if( rpl[strlen( rpl ) - 1] != ':' ) strlcat( rpl, " ", sizeof( rpl ));
+                       strlcat( rpl, Client_ID( c ), sizeof( rpl ));
 
                        if( strlen( rpl ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
                        {
                                /* Zeile wird zu lang: senden! */
                                if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
-                               sprintf( rpl, RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
+                               snprintf( rpl, sizeof( rpl ), RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
                        }
                }
 
@@ -322,16 +330,18 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
                if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
        }
 
+       IRC_SetPenalty( from, 1 );
        return IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), "*" );
 } /* IRC_NAMES */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_STATS( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *from, *target, *cl;
        CONN_ID con;
-       CHAR query;
+       char query;
+       COMMAND *cmd;
 
        assert( Client != NULL );
        assert( Req != NULL );
@@ -348,7 +358,7 @@ IRC_STATS( CLIENT *Client, REQUEST *Req )
        {
                /* an anderen Server forwarden */
                target = Client_Search( Req->argv[1] );
-               if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
+               if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
 
                if( target != Client_ThisServer( ))
                {
@@ -367,18 +377,19 @@ IRC_STATS( CLIENT *Client, REQUEST *Req )
                        con = Conn_First( );
                        while( con != NONE )
                        {
-                               cl = Client_GetFromConn( con );
-                               if( cl )
+                               cl = Conn_GetClient( con );
+                               if( cl && (( Client_Type( cl ) == CLIENT_SERVER ) || ( cl == Client )))
                                {
-#ifdef USE_ZLIB
+                                       /* Server link or our own connection */
+#ifdef ZLIB
                                        if( Conn_Options( con ) & CONN_ZIP )
                                        {
-                                               if( ! IRC_WriteStrClient( from, RPL_STATSLINKINFOZIP_MSG, Client_ID( from ), Client_Mask( cl ), Conn_SendQ( con ), Conn_SendMsg( con ), Conn_SendBytesZip( con ), Conn_SendBytes( con ), Conn_RecvMsg( con ), Conn_RecvBytesZip( con ), Conn_RecvBytes( con ), (LONG)( time( NULL ) - Conn_StartTime( con )))) return DISCONNECTED;
+                                               if( ! IRC_WriteStrClient( from, RPL_STATSLINKINFOZIP_MSG, Client_ID( from ), Client_Mask( cl ), Conn_SendQ( con ), Conn_SendMsg( con ), Zip_SendBytes( con ), Conn_SendBytes( con ), Conn_RecvMsg( con ), Zip_RecvBytes( con ), Conn_RecvBytes( con ), (long)( time( NULL ) - Conn_StartTime( con )))) return DISCONNECTED;
                                        }
                                        else
 #endif
                                        {
-                                               if( ! IRC_WriteStrClient( from, RPL_STATSLINKINFO_MSG, Client_ID( from ), Client_Mask( cl ), Conn_SendQ( con ), Conn_SendMsg( con ), Conn_SendBytes( con ), Conn_RecvMsg( con ), Conn_RecvBytes( con ), (LONG)( time( NULL ) - Conn_StartTime( con )))) return DISCONNECTED;
+                                               if( ! IRC_WriteStrClient( from, RPL_STATSLINKINFO_MSG, Client_ID( from ), Client_Mask( cl ), Conn_SendQ( con ), Conn_SendMsg( con ), Conn_SendBytes( con ), Conn_RecvMsg( con ), Conn_RecvBytes( con ), (long)( time( NULL ) - Conn_StartTime( con )))) return DISCONNECTED;
                                        }
                                }
                                con = Conn_Next( con );
@@ -386,18 +397,28 @@ IRC_STATS( CLIENT *Client, REQUEST *Req )
                        break;
                case 'm':       /* IRC-Befehle */
                case 'M':
+                       cmd = Parse_GetCommandStruct( );
+                       while( cmd->name )
+                       {
+                               if( cmd->lcount > 0 || cmd->rcount > 0 )
+                               {
+                                       if( ! IRC_WriteStrClient( from, RPL_STATSCOMMANDS_MSG, Client_ID( from ), cmd->name, cmd->lcount, cmd->bytes, cmd->rcount )) return DISCONNECTED;
+                               }
+                               cmd++;
+                       }
                        break;
        }
 
+       IRC_SetPenalty( from, 2 );
        return IRC_WriteStrClient( from, RPL_ENDOFSTATS_MSG, Client_ID( from ), query );
 } /* IRC_STATS */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_TIME( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *from, *target;
-       CHAR t_str[64];
+       char t_str[64];
        time_t t;
 
        assert( Client != NULL );
@@ -415,7 +436,7 @@ IRC_TIME( CLIENT *Client, REQUEST *Req )
        {
                /* an anderen Server forwarden */
                target = Client_Search( Req->argv[0] );
-               if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+               if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
 
                if( target != Client_ThisServer( ))
                {
@@ -425,17 +446,17 @@ IRC_TIME( CLIENT *Client, REQUEST *Req )
        }
 
        t = time( NULL );
-       (VOID)strftime( t_str, 60, "%A %B %d %Y -- %H:%M %z", localtime( &t ));
+       (void)strftime( t_str, 60, "%A %B %d %Y -- %H:%M %Z", localtime( &t ));
        return IRC_WriteStrClient( from, RPL_TIME_MSG, Client_ID( from ), Client_ID( Client_ThisServer( )), t_str );
 } /* IRC_TIME */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_USERHOST( CLIENT *Client, REQUEST *Req )
 {
-       CHAR rpl[COMMAND_LEN];
+       char rpl[COMMAND_LEN];
        CLIENT *c;
-       INT max, i;
+       int max, i;
 
        assert( Client != NULL );
        assert( Req != NULL );
@@ -446,34 +467,37 @@ IRC_USERHOST( CLIENT *Client, REQUEST *Req )
        if( Req->argc > 5 ) max = 5;
        else max = Req->argc;
 
-       strcpy( rpl, RPL_USERHOST_MSG );
+       strlcpy( rpl, RPL_USERHOST_MSG, sizeof rpl );
        for( i = 0; i < max; i++ )
        {
                c = Client_Search( Req->argv[i] );
                if( c && ( Client_Type( c ) == CLIENT_USER ))
                {
                        /* Dieser Nick ist "online" */
-                       strcat( rpl, Client_ID( c ));
-                       if( Client_HasMode( c, 'o' )) strcat( rpl, "*" );
-                       strcat( rpl, "=" );
-                       if( Client_HasMode( c, 'a' )) strcat( rpl, "-" );
-                       else strcat( rpl, "+" );
-                       strcat( rpl, Client_User( c ));
-                       strcat( rpl, "@" );
-                       strcat( rpl, Client_Hostname( c ));
-                       strcat( rpl, " " );
+                       strlcat( rpl, Client_ID( c ), sizeof( rpl ));
+                       if( Client_HasMode( c, 'o' )) strlcat( rpl, "*", sizeof( rpl ));
+                       strlcat( rpl, "=", sizeof( rpl ));
+                       if( Client_HasMode( c, 'a' )) strlcat( rpl, "-", sizeof( rpl ));
+                       else strlcat( rpl, "+", sizeof( rpl ));
+                       strlcat( rpl, Client_User( c ), sizeof( rpl ));
+                       strlcat( rpl, "@", sizeof( rpl ));
+                       strlcat( rpl, Client_Hostname( c ), sizeof( rpl ));
+                       strlcat( rpl, " ", sizeof( rpl ));
                }
        }
-       if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
+       ngt_TrimLastChr( rpl, ' ');
 
        return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
 } /* IRC_USERHOST */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_VERSION( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *target, *prefix;
+#ifdef CVSDATE
+       char ver[12], vertxt[30];
+#endif
 
        assert( Client != NULL );
        assert( Req != NULL );
@@ -493,7 +517,7 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req )
        /* An anderen Server weiterleiten? */
        if( target != Client_ThisServer( ))
        {
-               if( ! target ) return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG, Client_ID( prefix ), Req->argv[0] );
+               if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG, Client_ID( prefix ), Req->argv[0] );
 
                /* forwarden */
                IRC_WriteStrClientPrefix( target, prefix, "VERSION %s", Req->argv[0] );
@@ -501,17 +525,27 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req )
        }
 
        /* mit Versionsinfo antworten */
-       return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE, VERSION, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( ));
+       IRC_SetPenalty( Client, 1 );
+#ifdef CVSDATE
+       strlcpy( ver, CVSDATE, sizeof( ver ));
+       strncpy( ver + 4, ver + 5, 2 );
+       strncpy( ver + 6, ver + 8, 3 );
+       snprintf( vertxt, sizeof( vertxt ), "%s(%s)", PACKAGE_VERSION, ver );
+       return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE_NAME, vertxt, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition );
+#else
+       return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition );
+#endif
 } /* IRC_VERSION */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_WHO( CLIENT *Client, REQUEST *Req )
 {
-       BOOLEAN ok, only_ops;
-       CHAR flags[8], *ptr;
+       bool ok, only_ops;
+       char flags[8];
+       const char *ptr;
        CL2CHAN *cl2chan;
-       CHANNEL *chan;
+       CHANNEL *chan, *cn;
        CLIENT *c;
 
        assert( Client != NULL );
@@ -520,13 +554,13 @@ IRC_WHO( CLIENT *Client, REQUEST *Req )
        /* Falsche Anzahl Parameter? */
        if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-       only_ops = FALSE;
+       only_ops = false;
        chan = NULL;
 
        if( Req->argc == 2 )
        {
                /* Nur OPs anzeigen? */
-               if( strcmp( Req->argv[1], "o" ) == 0 ) only_ops = TRUE;
+               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
@@ -549,24 +583,35 @@ IRC_WHO( CLIENT *Client, REQUEST *Req )
        {
                if(( Client_Type( c ) == CLIENT_USER ) && ( ! strchr( Client_Modes( c ), 'i' )))
                {
-                       ok = FALSE;
-                       if( Req->argc == 0 ) ok = TRUE;
+                       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( 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 */
+                               /* Get flags */
                                strcpy( flags, "H" );
-                               if( strchr( Client_Modes( c ), 'o' )) strcat( flags, "*" );
+                               if( strchr( Client_Modes( c ), 'o' )) strlcat( flags, "*", sizeof( flags ));
 
-                               /* ausgeben */
+                               /* Search suitable channel */
                                cl2chan = Channel_FirstChannelOf( c );
-                               if( cl2chan ) ptr = Channel_Name( Channel_GetChannel( cl2chan ));
-                               else ptr = "*";
+                               while( cl2chan )
+                               {
+                                       cn = Channel_GetChannel( cl2chan );
+                                       if( Channel_IsMemberOf( cn, Client ) ||
+                                           ! strchr( Channel_Modes( cn ), 's' ))
+                                       {
+                                               ptr = Channel_Name( cn );
+                                               break;
+                                       }
+                                       cl2chan = Channel_NextChannelOf( c, cl2chan );
+                               }
+                               if( ! cl2chan ) 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;
                        }
                }
@@ -581,76 +626,78 @@ IRC_WHO( CLIENT *Client, REQUEST *Req )
 } /* IRC_WHO */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *from, *target, *c;
-       CHAR str[LINE_LEN + 1], *ptr = NULL;
+       char str[LINE_LEN + 1];
        CL2CHAN *cl2chan;
        CHANNEL *chan;
 
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* Falsche Anzahl Parameter? */
+       /* Bad number of parameters? */
        if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-       /* Client suchen */
+       /* Search client */
        c = Client_Search( 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 */
+       /* Search sender of the 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 );
 
-       /* Forwarden an anderen Server? */
+       /* Forward to other server? */
        if( Req->argc > 1 )
        {
-               /* angegebenen Ziel-Server suchen */
-               target = Client_Search( Req->argv[1] );
-               if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
-               ptr = Req->argv[1];
+               /* Search target server (can be specified as nick of that server!) */
+               target = Client_Search( Req->argv[0] );
+               if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] );
        }
        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 );
+       if(( Client_NextHop( target ) != Client_ThisServer( )) && ( Client_Type( Client_NextHop( target )) == CLIENT_SERVER )) return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], Req->argv[1] );
 
-       /* Nick, User und Name */
+       /* Nick, user and name */
        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( 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 ));
+       snprintf( str, sizeof( 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 ), 'o' )) strcat( str, "@" );
-               else if( strchr( Channel_UserModes( chan, c ), 'v' )) strcat( str, "+" );
-               strcat( str, Channel_Name( chan ));
+               /* next */
+               cl2chan = Channel_NextChannelOf( c, cl2chan );
+
+               /* Secret channel? */
+               if( strchr( Channel_Modes( chan ), 's' ) && ! Channel_IsMemberOf( chan, Client )) continue;
+
+               /* Concatenate channel names */
+               if( str[strlen( str ) - 1] != ':' ) strlcat( str, " ", sizeof( str ));
+               if( strchr( Channel_UserModes( chan, c ), 'o' )) strlcat( str, "@", sizeof( str ));
+               else if( strchr( Channel_UserModes( chan, c ), 'v' )) strlcat( str, "+", sizeof( str ));
+               strlcat( str, Channel_Name( chan ), sizeof( str ));
 
                if( strlen( str ) > ( LINE_LEN - CHANNEL_NAME_LEN - 4 ))
                {
-                       /* Zeile wird zu lang: senden! */
+                       /* Line becomes too long: send it! */
                        if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
-                       sprintf( str, RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c ));
+                       snprintf( str, sizeof( 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 */
+               /* There is data left to send: */
                if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
        }
 
@@ -660,10 +707,13 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                if( ! IRC_WriteStrClient( from, RPL_WHOISOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED;
        }
 
-       /* Idle (nur lokale Clients) */
-       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;
+       /* Idle and signon time (local clients only!) */
+       if (Client_Conn(c) > NONE ) {
+               if (! IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG,
+                       Client_ID(from), Client_ID(c),
+                       (unsigned long)Conn_GetIdle(Client_Conn(c)),
+                       (unsigned long)Conn_GetSignon(Client_Conn(c))))
+                               return DISCONNECTED;
        }
 
        /* Away? */
@@ -677,127 +727,265 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 } /* IRC_WHOIS */
 
 
-GLOBAL BOOLEAN
+/**
+ * IRC "WHOWAS" function.
+ * This function implements the IRC command "WHOWHAS". It handles local
+ * requests and request that should be forwarded to other servers.
+ */
+GLOBAL bool
 IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
 {
+       CLIENT *target, *prefix;
+       WHOWAS *whowas;
+       int max, last, count, i;
+       char t_str[60];
+       
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* Falsche Anzahl Parameter? */
-       if(( Req->argc < 1 ) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+       /* Wrong number of parameters? */
+       if(( Req->argc < 1 ) || ( Req->argc > 3 ))
+               return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG,
+                                          Client_ID( Client ), Req->command );
 
-       /* ... */
+       /* Search taget */
+       if( Req->argc == 3 )
+               target = Client_Search( Req->argv[2] );
+       else
+               target = Client_ThisServer( );
 
-       return CONNECTED;
+       /* Get prefix */
+       if( Client_Type( Client ) == CLIENT_SERVER )
+               prefix = Client_Search( Req->prefix );
+       else
+               prefix = Client;
+
+       if( ! prefix )
+               return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG,
+                                          Client_ID( Client ), Req->prefix );
+
+       /* Forward to other server? */
+       if( target != Client_ThisServer( ))
+       {
+               if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER ))
+                       return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG,
+                                                  Client_ID( prefix ),
+                                                  Req->argv[2] );
+
+               /* Forward */
+               IRC_WriteStrClientPrefix( target, prefix, "WHOWAS %s %s %s",
+                                         Req->argv[0], Req->argv[1],
+                                         Req->argv[2] );
+               return CONNECTED;
+       }
+       
+       whowas = Client_GetWhowas( );
+       last = Client_GetLastWhowasIndex( );
+       if( last < 0 ) last = 0;
+       
+       if( Req->argc > 1 )
+       {
+               max = atoi( Req->argv[1] );
+               if( max < 1 ) max = MAX_WHOWAS;
+       }
+       else
+               max = DEFAULT_WHOWAS;
+       
+       i = last;
+       count = 0;
+       do
+       {
+               /* Used entry? */
+               if( whowas[i].time > 0 &&
+                   strcasecmp( Req->argv[0], whowas[i].id ) == 0 )
+               {
+                       (void)strftime( t_str, sizeof(t_str),
+                                       "%a %b %d %H:%M:%S %Y",
+                                       localtime( &whowas[i].time ));
+               
+                       if( ! IRC_WriteStrClient( prefix, RPL_WHOWASUSER_MSG,
+                                                 Client_ID( prefix ),
+                                                 whowas[i].id,
+                                                 whowas[i].user,
+                                                 whowas[i].host, 
+                                                 whowas[i].info ))
+                               return DISCONNECTED;
+               
+                       if( ! IRC_WriteStrClient( prefix, RPL_WHOISSERVER_MSG,
+                                                 Client_ID( prefix ),
+                                                 whowas[i].id,
+                                                 whowas[i].server, t_str ))
+                               return DISCONNECTED;
+               
+                       count++;
+                       if( count >= max ) break;
+               }
+               
+               /* previos entry */
+               i--;
+
+               /* "underflow", wrap around */
+               if( i < 0 ) i = MAX_WHOWAS - 1;
+       } while( i != last );
+       
+       return IRC_WriteStrClient( prefix, RPL_ENDOFWHOWAS_MSG,
+                                  Client_ID( prefix ), Req->argv[0] );
 } /* IRC_WHOWAS */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_Send_LUSERS( CLIENT *Client )
 {
-       LONG cnt;
+       unsigned long cnt;
+#ifndef STRICT_RFC
+       unsigned long max;
+#endif
 
        assert( Client != NULL );
 
-       /* Users, Services und Serevr im Netz */
+       /* Users, services and serevers in the network */
        if( ! IRC_WriteStrClient( Client, RPL_LUSERCLIENT_MSG, Client_ID( Client ), Client_UserCount( ), Client_ServiceCount( ), Client_ServerCount( ))) return DISCONNECTED;
 
-       /* IRC-Operatoren im Netz */
+       /* Number of IRC operators */
        cnt = Client_OperCount( );
        if( cnt > 0 )
        {
                if( ! IRC_WriteStrClient( Client, RPL_LUSEROP_MSG, Client_ID( Client ), cnt )) return DISCONNECTED;
        }
 
-       /* Unbekannt Verbindungen */
+       /* Unknown connections */
        cnt = Client_UnknownCount( );
        if( cnt > 0 )
        {
                if( ! IRC_WriteStrClient( Client, RPL_LUSERUNKNOWN_MSG, Client_ID( Client ), cnt )) return DISCONNECTED;
        }
 
-       /* Channels im Netz */
+       /* Number of created channels */
        if( ! IRC_WriteStrClient( Client, RPL_LUSERCHANNELS_MSG, Client_ID( Client ), Channel_Count( ))) return DISCONNECTED;
 
-       /* Channels im Netz */
+       /* Number of local users, services and servers */
        if( ! IRC_WriteStrClient( Client, RPL_LUSERME_MSG, Client_ID( Client ), Client_MyUserCount( ), Client_MyServiceCount( ), Client_MyServerCount( ))) return DISCONNECTED;
 
+#ifndef STRICT_RFC
+       /* Maximum number of local users */
+       cnt = Client_MyUserCount();
+       max = Client_MyMaxUserCount();
+       if (! IRC_WriteStrClient(Client, RPL_LOCALUSERS_MSG, Client_ID(Client),
+                       cnt, max, cnt, max))
+               return DISCONNECTED;
+       /* Maximum number of users in the network */
+       cnt = Client_UserCount();
+       max = Client_MaxUserCount();
+       if(! IRC_WriteStrClient(Client, RPL_NETUSERS_MSG, Client_ID(Client),
+                       cnt, max, cnt, max))
+               return DISCONNECTED;
+#endif
+       
        return CONNECTED;
 } /* IRC_Send_LUSERS */
 
 
-GLOBAL BOOLEAN
+static bool
+Show_MOTD_Start(CLIENT *Client)
+{
+       return IRC_WriteStrClient(Client, RPL_MOTDSTART_MSG,
+               Client_ID( Client ), Client_ID( Client_ThisServer( )));
+}
+
+static bool
+Show_MOTD_Sendline(CLIENT *Client, const char *msg)
+{
+       return IRC_WriteStrClient(Client, RPL_MOTD_MSG, Client_ID( Client ), msg);
+}
+
+static bool
+Show_MOTD_End(CLIENT *Client)
+{
+       return IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ));
+}
+
+
+GLOBAL bool
 IRC_Show_MOTD( CLIENT *Client )
 {
-       BOOLEAN ok;
-       CHAR line[127];
+       char line[127];
        FILE *fd;
 
        assert( Client != NULL );
 
+       if (Conf_MotdPhrase[0]) {
+               if (!Show_MOTD_Start(Client))
+                       return DISCONNECTED;
+               if (!Show_MOTD_Sendline(Client, Conf_MotdPhrase))
+                       return DISCONNECTED;
+
+               return Show_MOTD_End(Client);
+       }
+
        fd = fopen( Conf_MotdFile, "r" );
-       if( ! fd )
-       {
+       if( ! fd ) {
                Log( LOG_WARNING, "Can't read MOTD file \"%s\": %s", Conf_MotdFile, strerror( errno ));
                return IRC_WriteStrClient( Client, ERR_NOMOTD_MSG, Client_ID( Client ) );
        }
 
-       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';
-               if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), line ))
-               {
-                       fclose( fd );
-                       return FALSE;
-               }
+       if (!Show_MOTD_Start( Client )) {
+               fclose(fd);
+               return false;
        }
-       ok = IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ) );
 
-       fclose( fd );
+       while (fgets( line, (int)sizeof line, fd )) {
+               ngt_TrimLastChr( line, '\n');
 
-       return ok;
+               if( ! Show_MOTD_Sendline( Client, line)) {
+                       fclose( fd );
+                       return false;
+               }
+       }
+       fclose(fd);
+       return Show_MOTD_End(Client);
 } /* IRC_Show_MOTD */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
 {
-       BOOLEAN is_visible, is_member;
-       CHAR str[LINE_LEN + 1];
+       bool 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;
+       if( Channel_IsMemberOf( Chan, Client )) is_member = true;
+       else is_member = false;
+
+       /* Secret channel? */
+       if( ! is_member && strchr( Channel_Modes( Chan ), 's' )) return CONNECTED;
 
        /* Alle Mitglieder suchen */
-       sprintf( str, RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
+       snprintf( str, sizeof( 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( 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 ), 'o' )) strcat( str, "@" );
-                       else if( strchr( Channel_UserModes( Chan, cl ), 'v' )) strcat( str, "+" );
-                       strcat( str, Client_ID( cl ));
+                       if( str[strlen( str ) - 1] != ':' ) strlcat( str, " ", sizeof( str ));
+                       if( strchr( Channel_UserModes( Chan, cl ), 'o' )) strlcat( str, "@", sizeof( str ));
+                       else if( strchr( Channel_UserModes( Chan, cl ), 'v' )) strlcat( str, "+", sizeof( str ));
+                       strlcat( str, Client_ID( cl ), sizeof( str ));
 
                        if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
                        {
                                /* Zeile wird zu lang: senden! */
                                if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
-                               sprintf( str, RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
+                               snprintf( str, sizeof( str ), RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
                        }
                }
 
@@ -814,19 +1002,22 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
 } /* IRC_Send_NAMES */
 
 
-GLOBAL BOOLEAN
-IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps )
+GLOBAL bool
+IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, bool OnlyOps )
 {
-       BOOLEAN is_visible, is_member;
+       bool is_visible, is_member;
        CL2CHAN *cl2chan;
-       CHAR flags[8];
+       char flags[8];
        CLIENT *c;
 
        assert( Client != NULL );
        assert( Chan != NULL );
 
-       if( Channel_IsMemberOf( Chan, Client )) is_member = TRUE;
-       else is_member = FALSE;
+       if( Channel_IsMemberOf( Chan, Client )) is_member = true;
+       else is_member = false;
+
+       /* Secret channel? */
+       if( ! is_member && strchr( Channel_Modes( Chan ), 's' )) return CONNECTED;
 
        /* Alle Mitglieder suchen */
        cl2chan = Channel_FirstMember( Chan );
@@ -834,16 +1025,16 @@ IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps )
        {
                c = Channel_GetClient( cl2chan );
 
-               if( strchr( Client_Modes( c ), 'i' )) is_visible = FALSE;
-               else is_visible = TRUE;
+               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 ), 'o' )) strcat( flags, "@" );
-                       else if( strchr( Channel_UserModes( Chan, c ), 'v' )) strcat( flags, "+" );
+                       if( strchr( Client_Modes( c ), 'o' )) strlcat( flags, "*", sizeof( flags ));
+                       if( strchr( Channel_UserModes( Chan, c ), 'o' )) strlcat( flags, "@", sizeof( flags ));
+                       else if( strchr( Channel_UserModes( Chan, c ), 'v' )) strlcat( flags, "+", sizeof( flags ));
 
                        /* ausgeben */
                        if(( ! OnlyOps ) || ( strchr( Client_Modes( c ), 'o' )))
@@ -859,4 +1050,22 @@ IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps )
 } /* IRC_Send_WHO */
 
 
+/**
+ * Send the ISUPPORT numeric (005).
+ * This numeric indicates the features that are supported by this server.
+ * See <http://www.irc.org/tech_docs/005.html> for details.
+ */
+GLOBAL bool
+IRC_Send_ISUPPORT PARAMS((CLIENT * Client))
+{
+       if (!IRC_WriteStrClient(Client, RPL_ISUPPORT1_MSG, Client_ID(Client),
+                               Conf_MaxJoins))
+               return DISCONNECTED;
+       return IRC_WriteStrClient(Client, RPL_ISUPPORT2_MSG, Client_ID(Client),
+                                 CHANNEL_NAME_LEN - 1, Conf_MaxNickLength - 1,
+                                 COMMAND_LEN - 23, CLIENT_AWAY_LEN - 1,
+                                 COMMAND_LEN - 113);
+} /* IRC_Send_ISUPPORT */
+
+
 /* -eof- */