Fixed and enhanced penalty handling; changed internal time resoluiton of

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

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index caf23dc021fc39697bb09800da0f4f04c8ac6fed..eb32afdd134a9988fc17a0fe7282c4d4b82236ef 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -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.122 2003/11/05 23:24:48 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -95,8 +95,30 @@ 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! */
@@ -212,7 +234,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] );
@@ -243,7 +265,8 @@ IRC_TRACE( CLIENT *Client, REQUEST *Req )
        /* 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 */
 
 
@@ -264,6 +287,8 @@ 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 */