Remove INT, LONG, BOOLEAN, STATIC, CONST, CHAR datatypes.

[ngircd-alex.git] / src / ngircd / irc.c

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index caf23dc021fc39697bb09800da0f4f04c8ac6fed..447747e1017d8b065c65abb6077b037dbd0cdb20 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2003 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2004 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
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc.c,v 1.119 2003/03/19 21:16:53 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.125 2005/03/19 18:43:49 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -38,10 +38,10 @@ static char UNUSED id[] = "$Id: irc.c,v 1.119 2003/03/19 21:16:53 alex Exp $";
 #include "irc.h"
 
 
-LOCAL CHAR *Option_String PARAMS(( CONN_ID Idx ));
+LOCAL char *Option_String PARAMS(( CONN_ID Idx ));
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_ERROR( CLIENT *Client, REQUEST *Req )
 {
        assert( Client != NULL );
@@ -54,11 +54,11 @@ IRC_ERROR( CLIENT *Client, REQUEST *Req )
 } /* IRC_ERROR */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_KILL( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *prefix, *c;
-       CHAR reason[COMMAND_LEN];
+       char reason[COMMAND_LEN];
        CONN_ID my_conn, conn;
 
        assert( Client != NULL );
@@ -95,14 +95,36 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
        if( c )
        {
                /* Yes, there is such a client -- but is it a valid user? */
-               if( Client_Type( c ) == CLIENT_SERVER ) IRC_WriteStrClient( Client, ERR_CANTKILLSERVER_MSG, Client_ID( Client ));
-               else if( Client_Type( c ) != CLIENT_USER  )IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+               if( Client_Type( c ) == CLIENT_SERVER )
+               {
+                       if( Client != Client_ThisServer( )) IRC_WriteStrClient( Client, ERR_CANTKILLSERVER_MSG, Client_ID( Client ));
+                       else
+                       {
+                               /* Oops, I should kill another server!? */
+                               Log( LOG_ERR, "Can't KILL server \"%s\"!", Req->argv[0] );
+                               conn = Client_Conn( Client_NextHop( c ));
+                               assert( conn > NONE );
+                               Conn_Close( conn, NULL, "Nick collision for server!?", true);
+                       }
+               }
+               else if( Client_Type( c ) != CLIENT_USER  )
+               {
+                       if( Client != Client_ThisServer( )) IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
+                       else
+                       {
+                               /* Oops, what sould I close?? */
+                               Log( LOG_ERR, "Can't KILL \"%s\": invalid client type!", Req->argv[0] );
+                               conn = Client_Conn( Client_NextHop( c ));
+                               assert( conn > NONE );
+                               Conn_Close( conn, NULL, "Collision for invalid client type!?", true);
+                       }
+               }
                else
                {
                        /* Kill user NOW! */
                        conn = Client_Conn( c );
-                       Client_Destroy( c, NULL, reason, FALSE );
-                       if( conn != NONE ) Conn_Close( conn, NULL, reason, TRUE );
+                       Client_Destroy( c, NULL, reason, false );
+                       if( conn != NONE ) Conn_Close( conn, NULL, reason, true);
                }
        }
        else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );
@@ -113,7 +135,7 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 } /* IRC_KILL */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_NOTICE( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *to, *from;
@@ -140,7 +162,7 @@ IRC_NOTICE( CLIENT *Client, REQUEST *Req )
 } /* IRC_NOTICE */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *cl, *from;
@@ -183,11 +205,12 @@ IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
 } /* IRC_PRIVMSG */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_TRACE( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *from, *target, *c;
        CONN_ID idx, idx2;
+       char user[CLIENT_USER_LEN];
 
        assert( Client != NULL );
        assert( Req != NULL );
@@ -212,7 +235,7 @@ IRC_TRACE( CLIENT *Client, REQUEST *Req )
                /* Send RPL_TRACELINK back to initiator */
                idx = Client_Conn( Client ); assert( idx > NONE );
                idx2 = Client_Conn( Client_NextHop( target )); assert( idx2 > NONE );
-               if( ! IRC_WriteStrClient( from, RPL_TRACELINK_MSG, Client_ID( from ), PACKAGE, VERSION, Client_ID( target ), Client_ID( Client_NextHop( target )), Option_String( idx2 ), time( NULL ) - Conn_StartTime( idx2 ), Conn_SendQ( idx ), Conn_SendQ( idx2 ))) return DISCONNECTED;
+               if( ! IRC_WriteStrClient( from, RPL_TRACELINK_MSG, Client_ID( from ), PACKAGE_NAME, PACKAGE_VERSION, Client_ID( target ), Client_ID( Client_NextHop( target )), Option_String( idx2 ), time( NULL ) - Conn_StartTime( idx2 ), Conn_SendQ( idx ), Conn_SendQ( idx2 ))) return DISCONNECTED;
 
                /* Forward command */
                IRC_WriteStrClientPrefix( target, from, "TRACE %s", Req->argv[0] );
@@ -229,7 +252,9 @@ IRC_TRACE( CLIENT *Client, REQUEST *Req )
                        if( Client_Type( c ) == CLIENT_SERVER )
                        {
                                /* Server link */
-                               if( ! IRC_WriteStrClient( from, RPL_TRACESERVER_MSG, Client_ID( from ), Client_ID( c ), Client_Mask( c ), Option_String( Client_Conn( c )))) return DISCONNECTED;
+                               strlcpy( user, Client_User( c ), sizeof( user ));
+                               if( user[0] == '~' ) strlcpy( user, "unknown", sizeof( user ));
+                               if( ! IRC_WriteStrClient( from, RPL_TRACESERVER_MSG, Client_ID( from ), Client_ID( c ), user, Client_Hostname( c ), Client_Mask( Client_ThisServer( )), Option_String( Client_Conn( c )))) return DISCONNECTED;
                        }
                        if(( Client_Type( c ) == CLIENT_USER ) && ( strchr( Client_Modes( c ), 'o' )))
                        {
@@ -240,14 +265,12 @@ IRC_TRACE( CLIENT *Client, REQUEST *Req )
                c = Client_Next( c );
        }
 
-       /* Some information about us */
-       if( ! IRC_WriteStrClient( from, RPL_TRACESERVER_MSG, Client_ID( from ), Conf_ServerName, Client_Mask( Client_ThisServer( )), Option_String( Client_Conn( Client )))) return DISCONNECTED;
-
-       return IRC_WriteStrClient( from, RPL_TRACEEND_MSG, Client_ID( from ), Conf_ServerName, PACKAGE, VERSION, NGIRCd_DebugLevel );
+       IRC_SetPenalty( Client, 3 );
+       return IRC_WriteStrClient( from, RPL_TRACEEND_MSG, Client_ID( from ), Conf_ServerName, PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_DebugLevel );
 } /* IRC_TRACE */
 
 
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_HELP( CLIENT *Client, REQUEST *Req )
 {
        COMMAND *cmd;
@@ -264,20 +287,22 @@ IRC_HELP( CLIENT *Client, REQUEST *Req )
                if( ! IRC_WriteStrClient( Client, "NOTICE %s :%s", Client_ID( Client ), cmd->name )) return DISCONNECTED;
                cmd++;
        }
+       
+       IRC_SetPenalty( Client, 2 );
        return CONNECTED;
 } /* IRC_HELP */
 
 
-LOCAL CHAR *
+LOCAL char *
 Option_String( CONN_ID Idx )
 {
-       STATIC CHAR option_txt[8];
-       INT options;
+       static char option_txt[8];
+       int options;
 
        options = Conn_Options( Idx );
 
        strcpy( option_txt, "F" );      /* No idea what this means but the original ircd sends it ... */
-#ifdef USE_ZLIB
+#ifdef ZLIB
        if( options & CONN_ZIP ) strcat( option_txt, "z" );
 #endif