X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=eb32afdd134a9988fc17a0fe7282c4d4b82236ef;hp=dfa0e94d35822b89fe830ec5a07cafb868f2b81a;hb=7b6e26628a884a768863c753a3fdff00116c0eed;hpb=b99af4fa47ed531c4410018db54734604fd286ab

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index dfa0e94d..eb32afdd 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -1,27 +1,31 @@
 /*
  * 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)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: irc.c,v 1.105 2002/12/06 17:02:39 alex Exp $
- *
- * irc.c: IRC-Befehle
+ * IRC commands
  */
 
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: irc.c,v 1.122 2003/11/05 23:24:48 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
+#include <stdio.h>
 #include <string.h>
 
+#include "ngircd.h"
 #include "conn.h"
+#include "resolve.h"
+#include "conf.h"
+#include "conn-func.h"
 #include "client.h"
 #include "channel.h"
 #include "defines.h"
@@ -34,6 +38,9 @@
 #include "irc.h"
 
 
+LOCAL CHAR *Option_String PARAMS(( CONN_ID Idx ));
+
+
 GLOBAL BOOLEAN
 IRC_ERROR( CLIENT *Client, REQUEST *Req )
 {
@@ -52,14 +59,15 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *prefix, *c;
 	CHAR reason[COMMAND_LEN];
+	CONN_ID my_conn, conn;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* is the user an IRC operator? */
+	/* Is the user an IRC operator? */
 	if(( Client_Type( Client ) != CLIENT_SERVER ) && ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client ));
 
-	/* Falsche Anzahl Parameter? */
+	/* Bad number of parameters? */
 	if(( Req->argc != 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
 	if( Req->prefix ) prefix = Client_Search( Req->prefix );
@@ -70,26 +78,60 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 		prefix = Client_ThisServer( );
 	}
 
-	Log( LOG_NOTICE|LOG_snotice, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] );
+	if( Client != Client_ThisServer( )) Log( LOG_NOTICE|LOG_snotice, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] );
 
-	/* build reason string */
-	if( Client_Type( Client ) == CLIENT_USER ) sprintf( reason, "KILLed by %s: %s", Client_ID( Client ), Req->argv[1] );
-	else strcpy( reason, Req->argv[1] );
+	/* Build reason string */
+	if( Client_Type( Client ) == CLIENT_USER ) snprintf( reason, sizeof( reason ), "KILLed by %s: %s", Client_ID( Client ), Req->argv[1] );
+	else strlcpy( reason, Req->argv[1], sizeof( reason ));
 
-	/* andere Server benachrichtigen */
+	/* Inform other servers */
 	IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], reason );
 
-	/* haben wir selber einen solchen Client? */
+	/* Save ID of this connection */
+	my_conn = Client_Conn( Client );
+	
+	/* Do we host such a client? */
 	c = Client_Search( Req->argv[0] );
 	if( c )
 	{
-		/* Ja, wir haben einen solchen Client */
-		if( Client_Conn( c ) != NONE ) Conn_Close( Client_Conn( c ), NULL, reason, TRUE );
-		else Client_Destroy( c, NULL, reason, TRUE );
+		/* Yes, there is such a client -- but is it a valid user? */
+		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 );
+		}
 	}
 	else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );
 
-	return CONNECTED;
+	/* Are we still connected or were we killed, too? */
+	if(( my_conn > NONE ) && ( Client_GetFromConn( my_conn ))) return CONNECTED;
+	else return DISCONNECTED;
 } /* IRC_KILL */
 
 
@@ -163,4 +205,109 @@ IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
 } /* IRC_PRIVMSG */
 
 
+GLOBAL BOOLEAN
+IRC_TRACE( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *from, *target, *c;
+	CONN_ID idx, idx2;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Bad number of arguments? */
+	if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NORECIPIENT_MSG, Client_ID( Client ), Req->command );
+
+	/* Search sender */
+	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 );
+
+	/* Search target */
+	if( Req->argc == 1 ) target = Client_Search( Req->argv[0] );
+	else target = Client_ThisServer( );
+	
+	/* Forward command to other server? */
+	if( target != Client_ThisServer( ))
+	{
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] );
+
+		/* 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_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;
+	}
+
+	/* 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 */
+
+
+GLOBAL BOOLEAN
+IRC_HELP( CLIENT *Client, REQUEST *Req )
+{
+	COMMAND *cmd;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	/* Bad number of arguments? */
+	if( Req->argc > 0 ) return IRC_WriteStrClient( Client, ERR_NORECIPIENT_MSG, Client_ID( Client ), Req->command );
+
+	cmd = Parse_GetCommandStruct( );
+	while( cmd->name )
+	{
+		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- */