X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=33ee22684be0dd9165a5626f2cd9d0e0f32909e2;hp=5480efbde4647b7d8ad6bcf11fffc88205adb52a;hb=87f4b1c6f64f85556533f01d95da1cf83a91d4c6;hpb=490f28ffd1b42ee2076ce89c62d0e672ee7e541e diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 5480efbd..33ee2268 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-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,14 +14,18 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc.c,v 1.107 2002/12/12 12:24:18 alex Exp $"; +static char UNUSED id[] = "$Id: irc.c,v 1.129 2006/04/23 10:37:27 fw Exp $"; #include "imp.h" #include #include #include +#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,7 +38,10 @@ static char UNUSED id[] = "$Id: irc.c,v 1.107 2002/12/12 12:24:18 alex Exp $"; #include "irc.h" -GLOBAL BOOLEAN +static char *Option_String PARAMS(( CONN_ID Idx )); + + +GLOBAL bool IRC_ERROR( CLIENT *Client, REQUEST *Req ) { assert( Client != NULL ); @@ -47,53 +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 )); + } - /* Falsche Anzahl Parameter? */ - 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( ); } - 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 ) + { + /* 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 )); - /* 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] ); + /* Inform other servers */ + IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", + Req->argv[0], reason ); - /* andere Server benachrichtigen */ - IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], reason ); + /* Save ID of this connection */ + my_conn = Client_Conn( Client ); - /* haben wir selber einen solchen 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 ); - } - else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] ); + if(( Client_Type( c ) != CLIENT_USER ) && + ( Client_Type( c ) != CLIENT_GOTNICK )) + { + /* 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] ); + } - return CONNECTED; + /* 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] ); + + /* Are we still connected or were we killed, too? */ + 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; @@ -120,7 +194,7 @@ IRC_NOTICE( CLIENT *Client, REQUEST *Req ) } /* IRC_NOTICE */ -GLOBAL BOOLEAN +GLOBAL bool IRC_PRIVMSG( CLIENT *Client, REQUEST *Req ) { CLIENT *cl, *from; @@ -163,4 +237,109 @@ IRC_PRIVMSG( CLIENT *Client, REQUEST *Req ) } /* IRC_PRIVMSG */ +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 ); + + /* 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 */ + 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' ))) + { + /* IRC Operator */ + if( ! IRC_WriteStrClient( from, RPL_TRACEOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED; + } + } + c = Client_Next( c ); + } + + 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 bool +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 */ + + +static 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 ZLIB + if( options & CONN_ZIP ) strcat( option_txt, "z" ); +#endif + + return option_txt; +} /* Option_String */ + + /* -eof- */