X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=6d977be496475d8df936ebbfcec4ce80b3bad7bf;hp=0f24ae6e2bfa8cdf6aff8337f4e7064dd9f15014;hb=7deacbaa11e237c987ba7d379a3162846cda8f2d;hpb=01bec0daa2c010f6b4c8bac230edd4565ee03894 diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 0f24ae6e..6d977be4 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,14 +14,18 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc.c,v 1.111 2002/12/27 13:17:04 alex Exp $"; +static char UNUSED id[] = "$Id: irc.c,v 1.120 2003/03/31 15:54:21 alex 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,6 +38,9 @@ static char UNUSED id[] = "$Id: irc.c,v 1.111 2002/12/27 13:17:04 alex Exp $"; #include "irc.h" +LOCAL CHAR *Option_String PARAMS(( CONN_ID Idx )); + + GLOBAL BOOLEAN IRC_ERROR( CLIENT *Client, REQUEST *Req ) { @@ -52,7 +59,7 @@ IRC_KILL( CLIENT *Client, REQUEST *Req ) { CLIENT *prefix, *c; CHAR reason[COMMAND_LEN]; - CONN_ID conn; + CONN_ID my_conn, conn; assert( Client != NULL ); assert( Req != NULL ); @@ -71,7 +78,7 @@ 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 ) snprintf( reason, sizeof( reason ), "KILLed by %s: %s", Client_ID( Client ), Req->argv[1] ); @@ -80,25 +87,28 @@ IRC_KILL( CLIENT *Client, REQUEST *Req ) /* Inform other servers */ 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( prefix, ERR_CANTKILLSERVER_MSG, Client_ID( prefix )); - else if( Client_Type( c ) != CLIENT_USER )IRC_WriteStrClient( prefix, ERR_NOPRIVILEGES_MSG, Client_ID( prefix )); + 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 { /* Kill user NOW! */ conn = Client_Conn( c ); Client_Destroy( c, NULL, reason, FALSE ); - if( conn != NONE ) Conn_Close( Client_Conn( c ), NULL, reason, TRUE ); + 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( Client_Search( Req->argv[0] )) return CONNECTED; + if(( my_conn > NONE ) && ( Client_GetFromConn( my_conn ))) return CONNECTED; else return DISCONNECTED; } /* IRC_KILL */ @@ -173,4 +183,106 @@ 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; + + 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++; + } + 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- */