X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=eb32afdd134a9988fc17a0fe7282c4d4b82236ef;hb=ff2c1efae8b8b1bf30013123bb17243dc682f7d3;hp=98ee042e4845cb8917fae58d3dd793b5c92d709b;hpb=2152e377226509a6b3c5f6cd9c8c4a88a9487091;p=ngircd-alex.git

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 98ee042e..eb32afdd 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2003 by 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.118 2003/01/15 13:49:20 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>
@@ -38,6 +38,9 @@ static char UNUSED id[] = "$Id: irc.c,v 1.118 2003/01/15 13:49:20 alex Exp $";
 #include "irc.h"
 
 
+LOCAL CHAR *Option_String PARAMS(( CONN_ID Idx ));
+
+
 GLOBAL BOOLEAN
 IRC_ERROR( CLIENT *Client, REQUEST *Req )
 {
@@ -92,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! */
@@ -183,9 +208,8 @@ IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
 GLOBAL BOOLEAN
 IRC_TRACE( CLIENT *Client, REQUEST *Req )
 {
-	CLIENT *from, *target;
+	CLIENT *from, *target, *c;
 	CONN_ID idx, idx2;
-	CHAR ver[64], *ptr;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
@@ -202,10 +226,6 @@ IRC_TRACE( CLIENT *Client, REQUEST *Req )
 	if( Req->argc == 1 ) target = Client_Search( Req->argv[0] );
 	else target = Client_ThisServer( );
 	
-	strlcpy( ver, NGIRCd_VersionAddition( ), sizeof( ver ));
-	ptr = strchr( ver, '-' );
-	if( ptr ) *ptr = '\0';
-
 	/* Forward command to other server? */
 	if( target != Client_ThisServer( ))
 	{
@@ -214,15 +234,39 @@ 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 )), ver, time( NULL ) - Conn_StartTime( idx ), 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] );
 		return CONNECTED;
 	}
 
-	if( ! IRC_WriteStrClient( from, RPL_TRACESERVER_MSG, Client_ID( from ), Conf_ServerName, Client_Mask( Client_ThisServer( )), ver )) return DISCONNECTED;
-	return IRC_WriteStrClient( from, RPL_TRACEEND_MSG, Client_ID( from ), Conf_ServerName, PACKAGE, VERSION, NGIRCd_DebugLevel );
+	/* Infos about all connected servers */
+	c = Client_First( );
+	while( c )
+	{
+		if( Client_Conn( c ) > NONE )
+		{
+			/* Local client */
+			if( Client_Type( c ) == CLIENT_SERVER )
+			{
+				/* Server link */
+				if( ! IRC_WriteStrClient( from, RPL_TRACESERVER_MSG, Client_ID( from ), Client_ID( c ), Client_Mask( c ), Option_String( Client_Conn( c )))) return DISCONNECTED;
+			}
+			if(( Client_Type( c ) == CLIENT_USER ) && ( strchr( Client_Modes( c ), 'o' )))
+			{
+				/* IRC Operator */
+				if( ! IRC_WriteStrClient( from, RPL_TRACEOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED;
+			}
+		}
+		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;
+
+	IRC_SetPenalty( Client, 3 );
+	return IRC_WriteStrClient( from, RPL_TRACEEND_MSG, Client_ID( from ), Conf_ServerName, PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_DebugLevel );
 } /* IRC_TRACE */
 
 
@@ -243,8 +287,27 @@ 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 *
+Option_String( CONN_ID Idx )
+{
+	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
+	if( options & CONN_ZIP ) strcat( option_txt, "z" );
+#endif
+
+	return option_txt;
+} /* Option_String */
+
+
 /* -eof- */