#include "portab.h"
-static char UNUSED id[] = "$Id: irc-info.c,v 1.19 2003/12/04 14:05:16 alex Exp $";
+static char UNUSED id[] = "$Id: irc-info.c,v 1.28 2005/03/19 18:43:48 fw Exp $";
#include "imp.h"
#include <assert.h>
#include <errno.h>
#include <stdio.h>
#include <string.h>
+#include <strings.h>
#include "ngircd.h"
#include "cvs-version.h"
#include "irc-info.h"
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_ADMIN(CLIENT *Client, REQUEST *Req )
{
CLIENT *target, *prefix;
} /* 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 );
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 );
} /* IRC_LINKS */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_LUSERS( CLIENT *Client, REQUEST *Req )
{
CLIENT *target, *from;
} /* IRC_LUSERS */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_MOTD( CLIENT *Client, REQUEST *Req )
{
CLIENT *from, *target;
} /* 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;
} /* 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 );
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 );
} /* 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 );
}
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 );
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];
+ char ver[12], vertxt[30];
#endif
assert( Client != NULL );
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( ));
+ 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( ));
+ 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], *ptr;
CL2CHAN *cl2chan;
- CHANNEL *chan;
+ CHANNEL *chan, *cn;
CLIENT *c;
assert( Client != NULL );
/* 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
{
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;
}
}
} /* 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;
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 ));
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] != ':')
{
} /* IRC_WHOIS */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
{
assert( Client != NULL );
} /* IRC_WHOWAS */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_Send_LUSERS( CLIENT *Client )
{
- LONG cnt;
+ long cnt;
assert( Client != NULL );
} /* IRC_Send_LUSERS */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_Show_MOTD( CLIENT *Client )
{
- BOOLEAN ok;
- CHAR line[127];
+ 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 ));
+ }
+
fd = fopen( Conf_MotdFile, "r" );
if( ! fd )
{
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( ! IRC_WriteStrClient( Client, RPL_MOTDSTART_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return DISCONNECTED;
+ while( true )
{
- if( ! fgets( line, 126, fd )) break;
- if( line[strlen( line ) - 1] == '\n' ) line[strlen( line ) - 1] = '\0';
+ if( ! fgets( line, sizeof( line ), fd )) break;
+
+ ngt_TrimLastChr( line, '\n');
+
if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), line ))
{
fclose( fd );
- return FALSE;
+ return false;
}
}
ok = IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( 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 ));
{
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 )
{
} /* 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 );
{
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 )
{
projects / ngircd-alex.git / blobdiff