/*
* 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
#include "portab.h"
-static char UNUSED id[] = "$Id: irc.c,v 1.120 2003/03/31 15:54:21 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.129 2006/04/23 10:37:27 fw Exp $";
#include "imp.h"
#include <assert.h>
#include "irc.h"
-LOCAL CHAR *Option_String PARAMS(( CONN_ID Idx ));
+static char *Option_String PARAMS(( CONN_ID Idx ));
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_ERROR( CLIENT *Client, REQUEST *Req )
{
assert( Client != NULL );
} /* IRC_ERROR */
-GLOBAL BOOLEAN
+/**
+ * Kill client on request.
+ * This function implements the IRC command "KILL" wich is used to selectively
+ * disconnect clients. It can be used by IRC operators and servers, for example
+ * to "solve" nick collisions after netsplits.
+ * Please note that this function is also called internally, without a real
+ * KILL command beeing received over the network! Client is Client_ThisServer()
+ * in this case. */
+GLOBAL bool
IRC_KILL( CLIENT *Client, REQUEST *Req )
{
CLIENT *prefix, *c;
- CHAR reason[COMMAND_LEN];
+ char reason[COMMAND_LEN], *msg;
CONN_ID my_conn, conn;
assert( Client != NULL );
assert( Req != NULL );
- /* 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 ));
+ if(( Client_Type( Client ) != CLIENT_SERVER ) &&
+ ( ! Client_OperByMe( Client )))
+ {
+ /* The originator of the KILL is neither an IRC operator of
+ * this server nor a server. */
+ return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG,
+ Client_ID( Client ));
+ }
- /* Bad number of parameters? */
- if(( Req->argc != 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ if( Req->argc != 2 )
+ {
+ /* This command requires exactly 2 parameters! */
+ return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID( Client ), Req->command );
+ }
if( Req->prefix ) prefix = Client_Search( Req->prefix );
else prefix = Client;
if( ! prefix )
{
- Log( LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!", Req->prefix );
+ Log( LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!",
+ Req->prefix );
prefix = Client_ThisServer( );
}
- 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] );
+ if( Client != Client_ThisServer( ))
+ {
+ /* This is a "real" KILL received from the network. */
+ 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 ) snprintf( reason, sizeof( reason ), "KILLed by %s: %s", Client_ID( Client ), Req->argv[1] );
- else strlcpy( reason, Req->argv[1], sizeof( reason ));
+ if( Client_Type( Client ) == CLIENT_USER )
+ {
+ /* Prefix the "reason" if the originator is a regular user,
+ * so users can't spoof KILLs of servers. */
+ snprintf( reason, sizeof( reason ), "KILLed by %s: %s",
+ Client_ID( Client ), Req->argv[1] );
+ }
+ else
+ strlcpy( reason, Req->argv[1], sizeof( reason ));
/* Inform other servers */
- IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], reason );
+ IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s",
+ Req->argv[0], reason );
/* Save ID of this connection */
my_conn = Client_Conn( Client );
-
+
/* Do we host such a client? */
c = Client_Search( Req->argv[0] );
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 ));
- else
+ if(( Client_Type( c ) != CLIENT_USER ) &&
+ ( Client_Type( c ) != CLIENT_GOTNICK ))
{
- /* Kill user NOW! */
- conn = Client_Conn( c );
- Client_Destroy( c, NULL, reason, FALSE );
- if( conn != NONE ) Conn_Close( conn, NULL, reason, TRUE );
+ /* Target of this KILL is not a regular user, this is
+ * invalid! So we ignore this case if we received a
+ * regular KILL from the network and try to kill the
+ * client/connection anyway (but log an error!) if the
+ * origin is the local server. */
+
+ if( Client != Client_ThisServer( ))
+ {
+ /* Invalid KILL received from remote */
+ if( Client_Type( c ) == CLIENT_SERVER )
+ msg = ERR_CANTKILLSERVER_MSG;
+ else
+ msg = ERR_NOPRIVILEGES_MSG;
+ return IRC_WriteStrClient( Client, msg,
+ Client_ID( Client ));
+ }
+
+ Log( LOG_ERR, "Got KILL for invalid client type: %d, \"%s\"!",
+ Client_Type( c ), Req->argv[0] );
}
+
+ /* Kill client 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] );
+ else
+ Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );
/* Are we still connected or were we killed, too? */
- if(( my_conn > NONE ) && ( Client_GetFromConn( my_conn ))) return CONNECTED;
- else return DISCONNECTED;
+ if(( my_conn > NONE ) && ( Conn_GetClient( my_conn )))
+ return CONNECTED;
+ else
+ return DISCONNECTED;
} /* IRC_KILL */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_NOTICE( CLIENT *Client, REQUEST *Req )
{
CLIENT *to, *from;
} /* IRC_NOTICE */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
{
CLIENT *cl, *from;
} /* 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 );
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' )))
{
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
+GLOBAL bool
IRC_HELP( CLIENT *Client, REQUEST *Req )
{
COMMAND *cmd;
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 *
+static 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
projects / ngircd-alex.git / blobdiff