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=683f7d1b04b8a79f0f3ff04f2d94771c14270ee4;hp=2f1112e87be2ec86dd2e0fe35477fd0db61fab85;hb=47ca178a219d682c589b27e64ee1a4e936cc7bdc;hpb=e17976a17287a9266740ebcdd22a4e2ececd72e1 diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 2f1112e8..683f7d1b 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,15 +14,18 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-info.c,v 1.14 2003/01/01 13:30:35 alex Exp $"; +static char UNUSED id[] = "$Id: irc-info.c,v 1.40 2007/11/21 12:16:36 alex Exp $"; #include "imp.h" #include #include #include +#include #include +#include #include "ngircd.h" +#include "cvs-version.h" #include "conn-func.h" #include "conn-zip.h" #include "client.h" @@ -40,7 +43,7 @@ static char UNUSED id[] = "$Id: irc-info.c,v 1.14 2003/01/01 13:30:35 alex Exp $ #include "irc-info.h" -GLOBAL BOOLEAN +GLOBAL bool IRC_ADMIN(CLIENT *Client, REQUEST *Req ) { CLIENT *target, *prefix; @@ -76,17 +79,18 @@ IRC_ADMIN(CLIENT *Client, REQUEST *Req ) if( ! IRC_WriteStrClient( Client, RPL_ADMINLOC2_MSG, Client_ID( prefix ), Conf_ServerAdmin2 )) return DISCONNECTED; if( ! IRC_WriteStrClient( Client, RPL_ADMINEMAIL_MSG, Client_ID( prefix ), Conf_ServerAdminMail )) return DISCONNECTED; + IRC_SetPenalty( Client, 1 ); return CONNECTED; } /* IRC_ADMIN */ -GLOBAL BOOLEAN +GLOBAL bool IRC_ISON( CLIENT *Client, REQUEST *Req ) { - CHAR rpl[COMMAND_LEN]; + char rpl[COMMAND_LEN]; CLIENT *c; - CHAR *ptr; - INT i; + char *ptr; + int i; assert( Client != NULL ); assert( Req != NULL ); @@ -94,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], " " ); @@ -111,17 +115,17 @@ IRC_ISON( CLIENT *Client, REQUEST *Req ) ptr = strtok( NULL, " " ); } } - if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0'; + ngt_TrimLastChr(rpl, ' '); return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) ); } /* IRC_ISON */ -GLOBAL BOOLEAN +GLOBAL bool IRC_LINKS( CLIENT *Client, REQUEST *Req ) { CLIENT *target, *from, *c; - CHAR *mask; + char *mask; assert( Client != NULL ); assert( Req != NULL ); @@ -160,12 +164,13 @@ IRC_LINKS( CLIENT *Client, REQUEST *Req ) } c = Client_Next( c ); } - + + IRC_SetPenalty( target, 1 ); return IRC_WriteStrClient( target, RPL_ENDOFLINKS_MSG, Client_ID( target ), mask ); } /* IRC_LINKS */ -GLOBAL BOOLEAN +GLOBAL bool IRC_LUSERS( CLIENT *Client, REQUEST *Req ) { CLIENT *target, *from; @@ -196,11 +201,12 @@ IRC_LUSERS( CLIENT *Client, REQUEST *Req ) IRC_Send_LUSERS( target ); + IRC_SetPenalty( target, 1 ); return CONNECTED; } /* IRC_LUSERS */ -GLOBAL BOOLEAN +GLOBAL bool IRC_MOTD( CLIENT *Client, REQUEST *Req ) { CLIENT *from, *target; @@ -229,14 +235,15 @@ IRC_MOTD( CLIENT *Client, REQUEST *Req ) } } + IRC_SetPenalty( from, 3 ); return IRC_Show_MOTD( from ); } /* IRC_MOTD */ -GLOBAL BOOLEAN +GLOBAL bool IRC_NAMES( CLIENT *Client, REQUEST *Req ) { - CHAR rpl[COMMAND_LEN], *ptr; + char rpl[COMMAND_LEN], *ptr; CLIENT *target, *from, *c; CHANNEL *chan; @@ -323,16 +330,17 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req ) if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED; } + IRC_SetPenalty( from, 1 ); return IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), "*" ); } /* IRC_NAMES */ -GLOBAL BOOLEAN +GLOBAL bool IRC_STATS( CLIENT *Client, REQUEST *Req ) { CLIENT *from, *target, *cl; CONN_ID con; - CHAR query; + char query; COMMAND *cmd; assert( Client != NULL ); @@ -369,19 +377,19 @@ 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 */ -#ifdef USE_ZLIB +#ifdef ZLIB if( Conn_Options( con ) & CONN_ZIP ) { - if( ! IRC_WriteStrClient( from, RPL_STATSLINKINFOZIP_MSG, Client_ID( from ), Client_Mask( cl ), Conn_SendQ( con ), Conn_SendMsg( con ), Zip_SendBytes( con ), Conn_SendBytes( con ), Conn_RecvMsg( con ), Zip_RecvBytes( con ), Conn_RecvBytes( con ), (LONG)( time( NULL ) - Conn_StartTime( con )))) return DISCONNECTED; + if( ! IRC_WriteStrClient( from, RPL_STATSLINKINFOZIP_MSG, Client_ID( from ), Client_Mask( cl ), Conn_SendQ( con ), Conn_SendMsg( con ), Zip_SendBytes( con ), Conn_SendBytes( con ), Conn_RecvMsg( con ), Zip_RecvBytes( con ), Conn_RecvBytes( con ), (long)( time( NULL ) - Conn_StartTime( con )))) return DISCONNECTED; } else #endif { - if( ! IRC_WriteStrClient( from, RPL_STATSLINKINFO_MSG, Client_ID( from ), Client_Mask( cl ), Conn_SendQ( con ), Conn_SendMsg( con ), Conn_SendBytes( con ), Conn_RecvMsg( con ), Conn_RecvBytes( con ), (LONG)( time( NULL ) - Conn_StartTime( con )))) return DISCONNECTED; + if( ! IRC_WriteStrClient( from, RPL_STATSLINKINFO_MSG, Client_ID( from ), Client_Mask( cl ), Conn_SendQ( con ), Conn_SendMsg( con ), Conn_SendBytes( con ), Conn_RecvMsg( con ), Conn_RecvBytes( con ), (long)( time( NULL ) - Conn_StartTime( con )))) return DISCONNECTED; } } con = Conn_Next( con ); @@ -401,15 +409,16 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) break; } + IRC_SetPenalty( from, 2 ); return IRC_WriteStrClient( from, RPL_ENDOFSTATS_MSG, Client_ID( from ), query ); } /* IRC_STATS */ -GLOBAL BOOLEAN +GLOBAL bool IRC_TIME( CLIENT *Client, REQUEST *Req ) { CLIENT *from, *target; - CHAR t_str[64]; + char t_str[64]; time_t t; assert( Client != NULL ); @@ -437,17 +446,17 @@ IRC_TIME( CLIENT *Client, REQUEST *Req ) } t = time( NULL ); - (VOID)strftime( t_str, 60, "%A %B %d %Y -- %H:%M %z", localtime( &t )); + (void)strftime( t_str, 60, "%A %B %d %Y -- %H:%M %Z", localtime( &t )); return IRC_WriteStrClient( from, RPL_TIME_MSG, Client_ID( from ), Client_ID( Client_ThisServer( )), t_str ); } /* IRC_TIME */ -GLOBAL BOOLEAN +GLOBAL bool IRC_USERHOST( CLIENT *Client, REQUEST *Req ) { - CHAR rpl[COMMAND_LEN]; + char rpl[COMMAND_LEN]; CLIENT *c; - INT max, i; + int max, i; assert( Client != NULL ); assert( Req != NULL ); @@ -458,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] ); @@ -476,16 +485,19 @@ IRC_USERHOST( CLIENT *Client, REQUEST *Req ) strlcat( rpl, " ", sizeof( rpl )); } } - if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0'; + ngt_TrimLastChr( rpl, ' '); return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) ); } /* IRC_USERHOST */ -GLOBAL BOOLEAN +GLOBAL bool IRC_VERSION( CLIENT *Client, REQUEST *Req ) { CLIENT *target, *prefix; +#ifdef CVSDATE + char ver[12], vertxt[30]; +#endif assert( Client != NULL ); assert( Req != NULL ); @@ -513,17 +525,27 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req ) } /* mit Versionsinfo antworten */ - return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE, VERSION, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( )); + IRC_SetPenalty( Client, 1 ); +#ifdef CVSDATE + strlcpy( ver, CVSDATE, sizeof( ver )); + strncpy( ver + 4, ver + 5, 2 ); + strncpy( ver + 6, ver + 8, 3 ); + snprintf( vertxt, sizeof( vertxt ), "%s(%s)", PACKAGE_VERSION, ver ); + return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE_NAME, vertxt, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition ); +#else + return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition ); +#endif } /* IRC_VERSION */ -GLOBAL BOOLEAN +GLOBAL bool IRC_WHO( CLIENT *Client, REQUEST *Req ) { - BOOLEAN ok, only_ops; - CHAR flags[8], *ptr; + bool ok, only_ops; + char flags[8]; + const char *ptr; CL2CHAN *cl2chan; - CHANNEL *chan; + CHANNEL *chan, *cn; CLIENT *c; assert( Client != NULL ); @@ -532,13 +554,13 @@ IRC_WHO( CLIENT *Client, REQUEST *Req ) /* Falsche Anzahl Parameter? */ if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - only_ops = FALSE; + only_ops = false; chan = NULL; if( Req->argc == 2 ) { /* Nur OPs anzeigen? */ - if( strcmp( Req->argv[1], "o" ) == 0 ) only_ops = TRUE; + if( strcmp( Req->argv[1], "o" ) == 0 ) only_ops = true; #ifdef STRICT_RFC else return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); #endif @@ -561,24 +583,35 @@ IRC_WHO( CLIENT *Client, REQUEST *Req ) { if(( Client_Type( c ) == CLIENT_USER ) && ( ! strchr( Client_Modes( c ), 'i' ))) { - ok = FALSE; - if( Req->argc == 0 ) ok = TRUE; + ok = false; + if( Req->argc == 0 ) ok = true; else { - if( strcasecmp( Req->argv[0], Client_ID( c )) == 0 ) ok = TRUE; - else if( strcmp( Req->argv[0], "0" ) == 0 ) ok = TRUE; + if( strcasecmp( Req->argv[0], Client_ID( c )) == 0 ) ok = true; + else if( strcmp( Req->argv[0], "0" ) == 0 ) ok = true; } if( ok && (( ! only_ops ) || ( strchr( Client_Modes( c ), 'o' )))) { - /* Flags zusammenbasteln */ + /* Get flags */ strcpy( flags, "H" ); if( strchr( Client_Modes( c ), 'o' )) strlcat( flags, "*", sizeof( flags )); - /* ausgeben */ + /* Search suitable channel */ cl2chan = Channel_FirstChannelOf( c ); - if( cl2chan ) ptr = Channel_Name( Channel_GetChannel( cl2chan )); - else ptr = "*"; + while( cl2chan ) + { + cn = Channel_GetChannel( cl2chan ); + if( Channel_IsMemberOf( cn, Client ) || + ! strchr( Channel_Modes( cn ), 's' )) + { + ptr = Channel_Name( cn ); + break; + } + cl2chan = Channel_NextChannelOf( c, cl2chan ); + } + if( ! cl2chan ) ptr = "*"; + if( ! IRC_WriteStrClient( Client, RPL_WHOREPLY_MSG, Client_ID( Client ), ptr, Client_User( c ), Client_Hostname( c ), Client_ID( Client_Introducer( c )), Client_ID( c ), flags, Client_Hops( c ), Client_Info( c ))) return DISCONNECTED; } } @@ -593,11 +626,11 @@ IRC_WHO( CLIENT *Client, REQUEST *Req ) } /* IRC_WHO */ -GLOBAL BOOLEAN +GLOBAL bool IRC_WHOIS( CLIENT *Client, REQUEST *Req ) { CLIENT *from, *target, *c; - CHAR str[LINE_LEN + 1]; + char str[LINE_LEN + 1]; CL2CHAN *cl2chan; CHANNEL *chan; @@ -643,6 +676,12 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) chan = Channel_GetChannel( cl2chan ); assert( chan != NULL ); + /* next */ + cl2chan = Channel_NextChannelOf( c, cl2chan ); + + /* Secret channel? */ + if( strchr( Channel_Modes( chan ), 's' ) && ! Channel_IsMemberOf( chan, Client )) continue; + /* Concatenate channel names */ if( str[strlen( str ) - 1] != ':' ) strlcat( str, " ", sizeof( str )); if( strchr( Channel_UserModes( chan, c ), 'o' )) strlcat( str, "@", sizeof( str )); @@ -655,9 +694,6 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED; snprintf( str, sizeof( str ), RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c )); } - - /* next */ - cl2chan = Channel_NextChannelOf( c, cl2chan ); } if( str[strlen( str ) - 1] != ':') { @@ -671,10 +707,13 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) if( ! IRC_WriteStrClient( from, RPL_WHOISOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED; } - /* Idle (only local clients) */ - if( Client_Conn( c ) > NONE ) - { - if( ! IRC_WriteStrClient( from, RPL_WHOISIDLE_MSG, Client_ID( from ), Client_ID( c ), Conn_GetIdle( Client_Conn ( c )))) return DISCONNECTED; + /* Idle and signon time (local clients only!) */ + if (Client_Conn(c) > NONE ) { + if (! IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, + Client_ID(from), Client_ID(c), + (unsigned long)Conn_GetIdle(Client_Conn(c)), + (unsigned long)Conn_GetSignon(Client_Conn(c)))) + return DISCONNECTED; } /* Away? */ @@ -688,25 +727,119 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) } /* IRC_WHOIS */ -GLOBAL BOOLEAN +/** + * 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 */ -GLOBAL BOOLEAN +GLOBAL bool IRC_Send_LUSERS( CLIENT *Client ) { - LONG cnt; + unsigned long cnt; +#ifndef STRICT_RFC + unsigned long max; +#endif assert( Client != NULL ); @@ -735,63 +868,100 @@ IRC_Send_LUSERS( CLIENT *Client ) #ifndef STRICT_RFC /* Maximum number of local users */ - if( ! IRC_WriteStrClient( Client, RPL_LOCALUSERS_MSG, Client_ID( Client ), Client_MyUserCount( ), Client_MyMaxUserCount( ))) return DISCONNECTED; + cnt = Client_MyUserCount(); + max = Client_MyMaxUserCount(); + if (! IRC_WriteStrClient(Client, RPL_LOCALUSERS_MSG, Client_ID(Client), + cnt, max, cnt, max)) + return DISCONNECTED; /* Maximum number of users in the network */ - if( ! IRC_WriteStrClient( Client, RPL_NETUSERS_MSG, Client_ID( Client ), Client_UserCount( ), Client_MaxUserCount( ))) return DISCONNECTED; + cnt = Client_UserCount(); + max = Client_MaxUserCount(); + if(! IRC_WriteStrClient(Client, RPL_NETUSERS_MSG, Client_ID(Client), + cnt, max, cnt, max)) + return DISCONNECTED; #endif return CONNECTED; } /* IRC_Send_LUSERS */ -GLOBAL BOOLEAN +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 ) { - BOOLEAN ok; - CHAR line[127]; + char line[127]; FILE *fd; assert( Client != NULL ); + 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 ) ); } - IRC_WriteStrClient( Client, RPL_MOTDSTART_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( ))); - while( TRUE ) - { - if( ! fgets( line, 126, fd )) break; - if( line[strlen( line ) - 1] == '\n' ) line[strlen( line ) - 1] = '\0'; - if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), line )) - { - fclose( fd ); - return FALSE; - } + if (!Show_MOTD_Start( Client )) { + fclose(fd); + return false; } - ok = IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ) ); - fclose( fd ); + while (fgets( line, (int)sizeof line, fd )) { + ngt_TrimLastChr( line, '\n'); - return ok; + if( ! Show_MOTD_Sendline( Client, line)) { + fclose( fd ); + return false; + } + } + fclose(fd); + return Show_MOTD_End(Client); } /* IRC_Show_MOTD */ -GLOBAL BOOLEAN +GLOBAL bool IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan ) { - BOOLEAN is_visible, is_member; - CHAR str[LINE_LEN + 1]; + bool is_visible, is_member; + char str[LINE_LEN + 1]; CL2CHAN *cl2chan; CLIENT *cl; assert( Client != NULL ); assert( Chan != NULL ); - if( Channel_IsMemberOf( Chan, Client )) is_member = TRUE; - else is_member = FALSE; + if( Channel_IsMemberOf( Chan, Client )) is_member = true; + else is_member = false; + + /* Secret channel? */ + if( ! is_member && strchr( Channel_Modes( Chan ), 's' )) return CONNECTED; /* Alle Mitglieder suchen */ snprintf( str, sizeof( str ), RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan )); @@ -800,8 +970,8 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan ) { cl = Channel_GetClient( cl2chan ); - if( strchr( Client_Modes( cl ), 'i' )) is_visible = FALSE; - else is_visible = TRUE; + if( strchr( Client_Modes( cl ), 'i' )) is_visible = false; + else is_visible = true; if( is_member || is_visible ) { @@ -832,19 +1002,22 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan ) } /* IRC_Send_NAMES */ -GLOBAL BOOLEAN -IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps ) +GLOBAL bool +IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, bool OnlyOps ) { - BOOLEAN is_visible, is_member; + bool is_visible, is_member; CL2CHAN *cl2chan; - CHAR flags[8]; + char flags[8]; CLIENT *c; assert( Client != NULL ); assert( Chan != NULL ); - if( Channel_IsMemberOf( Chan, Client )) is_member = TRUE; - else is_member = FALSE; + if( Channel_IsMemberOf( Chan, Client )) is_member = true; + else is_member = false; + + /* Secret channel? */ + if( ! is_member && strchr( Channel_Modes( Chan ), 's' )) return CONNECTED; /* Alle Mitglieder suchen */ cl2chan = Channel_FirstMember( Chan ); @@ -852,8 +1025,8 @@ IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps ) { c = Channel_GetClient( cl2chan ); - if( strchr( Client_Modes( c ), 'i' )) is_visible = FALSE; - else is_visible = TRUE; + if( strchr( Client_Modes( c ), 'i' )) is_visible = false; + else is_visible = true; if( is_member || is_visible ) { @@ -877,4 +1050,22 @@ IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps ) } /* IRC_Send_WHO */ +/** + * Send the ISUPPORT numeric (005). + * This numeric indicates the features that are supported by this server. + * See for details. + */ +GLOBAL bool +IRC_Send_ISUPPORT PARAMS((CLIENT * Client)) +{ + if (!IRC_WriteStrClient(Client, RPL_ISUPPORT1_MSG, Client_ID(Client), + Conf_MaxJoins)) + return DISCONNECTED; + return IRC_WriteStrClient(Client, RPL_ISUPPORT2_MSG, Client_ID(Client), + CHANNEL_NAME_LEN - 1, Conf_MaxNickLength - 1, + COMMAND_LEN - 23, CLIENT_AWAY_LEN - 1, + COMMAND_LEN - 113); +} /* IRC_Send_ISUPPORT */ + + /* -eof- */