X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=98dda7af2ad6dc198ff61ad368c1e471b4b95d5d;hb=b15d906dff84b35ebd05df44aa13e67c9c938fd2;hp=eb32afdd134a9988fc17a0fe7282c4d4b82236ef;hpb=7b6e26628a884a768863c753a3fdff00116c0eed;p=ngircd-alex.git diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index eb32afdd..98dda7af 100644 --- 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 * * 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.122 2003/11/05 23:24:48 alex Exp $"; +static char UNUSED id[] = "$Id: irc.c,v 1.128 2005/08/02 23:19:22 alex Exp $"; #include "imp.h" #include @@ -38,10 +38,10 @@ static char UNUSED id[] = "$Id: irc.c,v 1.122 2003/11/05 23:24:48 alex Exp $"; #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 ); @@ -54,88 +54,120 @@ IRC_ERROR( CLIENT *Client, REQUEST *Req ) } /* 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 ) + if(( Client_Type( c ) != CLIENT_USER ) && + ( Client_Type( c ) != CLIENT_GOTNICK )) { - 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 + /* 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( )) { - /* 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 ); + /* 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] ); } - else - { - /* Kill user NOW! */ - conn = Client_Conn( c ); - Client_Destroy( c, NULL, reason, FALSE ); - if( conn != NONE ) Conn_Close( conn, NULL, reason, TRUE ); - } + + /* 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 ) && ( Client_GetFromConn( my_conn ))) + return CONNECTED; + else + return DISCONNECTED; } /* IRC_KILL */ -GLOBAL BOOLEAN +GLOBAL bool IRC_NOTICE( CLIENT *Client, REQUEST *Req ) { CLIENT *to, *from; @@ -162,7 +194,7 @@ IRC_NOTICE( CLIENT *Client, REQUEST *Req ) } /* IRC_NOTICE */ -GLOBAL BOOLEAN +GLOBAL bool IRC_PRIVMSG( CLIENT *Client, REQUEST *Req ) { CLIENT *cl, *from; @@ -205,11 +237,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 ); @@ -251,7 +284,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' ))) { @@ -262,15 +297,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; - 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; @@ -293,16 +325,16 @@ IRC_HELP( CLIENT *Client, REQUEST *Req ) } /* 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