X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-info.c;h=48d447ca4fb1f1124bb38b0d47e02f975775be03;hp=cf283b51d90e8a50280dc547099b6873d37884c9;hb=87f4b1c6f64f85556533f01d95da1cf83a91d4c6;hpb=8adff5922376676c2eeb49de1cbab86cc345b887 diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index cf283b51..48d447ca 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2005 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,12 +14,13 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-info.c,v 1.28 2005/03/19 18:43:48 fw Exp $"; +static char UNUSED id[] = "$Id: irc-info.c,v 1.32 2006/04/23 10:37:27 fw Exp $"; #include "imp.h" #include #include #include +#include #include #include @@ -97,7 +98,7 @@ IRC_ISON( CLIENT *Client, REQUEST *Req ) /* Falsche Anzahl Parameter? */ if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - strcpy( rpl, RPL_ISON_MSG ); + strlcpy( rpl, RPL_ISON_MSG, sizeof rpl ); for( i = 0; i < Req->argc; i++ ) { ptr = strtok( Req->argv[i], " " ); @@ -376,7 +377,7 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) con = Conn_First( ); while( con != NONE ) { - cl = Client_GetFromConn( con ); + cl = Conn_GetClient( con ); if( cl && (( Client_Type( cl ) == CLIENT_SERVER ) || ( cl == Client ))) { /* Server link or our own connection */ @@ -466,7 +467,7 @@ IRC_USERHOST( CLIENT *Client, REQUEST *Req ) if( Req->argc > 5 ) max = 5; else max = Req->argc; - strcpy( rpl, RPL_USERHOST_MSG ); + strlcpy( rpl, RPL_USERHOST_MSG, sizeof rpl ); for( i = 0; i < max; i++ ) { c = Client_Search( Req->argv[i] ); @@ -722,18 +723,109 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) } /* IRC_WHOIS */ +/** + * IRC "WHOWAS" function. + * This function implements the IRC command "WHOWHAS". It handles local + * requests and request that should be forwarded to other servers. + */ GLOBAL bool IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) { + CLIENT *target, *prefix; + WHOWAS *whowas; + int max, last, count, i; + char t_str[60]; + assert( Client != NULL ); assert( Req != NULL ); - /* Falsche Anzahl Parameter? */ - if(( Req->argc < 1 ) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* Wrong number of parameters? */ + if(( Req->argc < 1 ) || ( Req->argc > 3 )) + return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID( Client ), Req->command ); - /* ... */ + /* Search taget */ + if( Req->argc == 3 ) + target = Client_Search( Req->argv[2] ); + else + target = Client_ThisServer( ); - return CONNECTED; + /* Get prefix */ + if( Client_Type( Client ) == CLIENT_SERVER ) + prefix = Client_Search( Req->prefix ); + else + prefix = Client; + + if( ! prefix ) + return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, + Client_ID( Client ), Req->prefix ); + + /* Forward to other server? */ + if( target != Client_ThisServer( )) + { + if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) + return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG, + Client_ID( prefix ), + Req->argv[2] ); + + /* Forward */ + IRC_WriteStrClientPrefix( target, prefix, "WHOWAS %s %s %s", + Req->argv[0], Req->argv[1], + Req->argv[2] ); + return CONNECTED; + } + + whowas = Client_GetWhowas( ); + last = Client_GetLastWhowasIndex( ); + if( last < 0 ) last = 0; + + if( Req->argc > 1 ) + { + max = atoi( Req->argv[1] ); + if( max < 1 ) max = MAX_WHOWAS; + } + else + max = DEFAULT_WHOWAS; + + i = last; + count = 0; + do + { + /* Used entry? */ + if( whowas[i].time > 0 && + strcasecmp( Req->argv[0], whowas[i].id ) == 0 ) + { + (void)strftime( t_str, sizeof(t_str), + "%a %b %d %H:%M:%S %Y", + localtime( &whowas[i].time )); + + if( ! IRC_WriteStrClient( prefix, RPL_WHOWASUSER_MSG, + Client_ID( prefix ), + whowas[i].id, + whowas[i].user, + whowas[i].host, + whowas[i].info )) + return DISCONNECTED; + + if( ! IRC_WriteStrClient( prefix, RPL_WHOISSERVER_MSG, + Client_ID( prefix ), + whowas[i].id, + whowas[i].server, t_str )) + return DISCONNECTED; + + count++; + if( count >= max ) break; + } + + /* previos entry */ + i--; + + /* "underflow", wrap around */ + if( i < 0 ) i = MAX_WHOWAS - 1; + } while( i != last ); + + return IRC_WriteStrClient( prefix, RPL_ENDOFWHOWAS_MSG, + Client_ID( prefix ), Req->argv[0] ); } /* IRC_WHOWAS */ @@ -778,47 +870,59 @@ IRC_Send_LUSERS( CLIENT *Client ) } /* IRC_Send_LUSERS */ +static bool Show_MOTD_Start(CLIENT *Client) +{ + return IRC_WriteStrClient(Client, RPL_MOTDSTART_MSG, + Client_ID( Client ), Client_ID( Client_ThisServer( ))); +} + +static bool Show_MOTD_Sendline(CLIENT *Client, const char *msg) +{ + return IRC_WriteStrClient(Client, RPL_MOTD_MSG, Client_ID( Client ), msg); +} + +static bool Show_MOTD_End(CLIENT *Client) +{ + return IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client )); +} + + GLOBAL bool IRC_Show_MOTD( CLIENT *Client ) { - bool ok; char line[127]; FILE *fd; assert( Client != NULL ); - if( Conf_MotdPhrase[0] ) - { - if( ! IRC_WriteStrClient( Client, RPL_MOTDSTART_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return DISCONNECTED; - if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), Conf_MotdPhrase )) return DISCONNECTED; - return IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client )); + if (Conf_MotdPhrase[0]) { + if (!Show_MOTD_Start(Client)) + return DISCONNECTED; + if (!Show_MOTD_Sendline(Client, Conf_MotdPhrase)) + return DISCONNECTED; + + return Show_MOTD_End(Client); } fd = fopen( Conf_MotdFile, "r" ); - if( ! fd ) - { + if( ! fd ) { Log( LOG_WARNING, "Can't read MOTD file \"%s\": %s", Conf_MotdFile, strerror( errno )); return IRC_WriteStrClient( Client, ERR_NOMOTD_MSG, Client_ID( Client ) ); } - if( ! IRC_WriteStrClient( Client, RPL_MOTDSTART_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return DISCONNECTED; - while( true ) - { - if( ! fgets( line, sizeof( line ), fd )) break; + if (!Show_MOTD_Start( Client )) + return DISCONNECTED; + while (fgets( line, sizeof( line ), fd )) { ngt_TrimLastChr( line, '\n'); - if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), line )) - { + if( ! Show_MOTD_Sendline( Client, line)) { fclose( fd ); return false; } } - ok = IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ) ); - - fclose( fd ); - - return ok; + fclose(fd); + return Show_MOTD_End(Client); } /* IRC_Show_MOTD */