/*
* 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
#include "portab.h"
-static char UNUSED id[] = "$Id: irc-mode.c,v 1.33 2004/02/29 16:28:44 alex Exp $";
+static char UNUSED id[] = "$Id: irc-mode.c,v 1.38 2005/03/05 11:44:01 alex Exp $";
#include "imp.h"
#include <assert.h>
CHAR the_modes[COMMAND_LEN], x[2], *mode_ptr;
BOOLEAN ok, set;
INT mode_arg;
+ size_t len;
/* Is the client allowed to request or change the modes? */
if( Client_Type( Client ) == CLIENT_USER )
if((( *mode_ptr == '+' ) && ( ! set )) || (( *mode_ptr == '-' ) && ( set )))
{
/* Action modifier ("+"/"-") must be changed ... */
- if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' ))
+ len = strlen( the_modes ) - 1;
+ if(( the_modes[len] == '+' ) || ( the_modes[len] == '-' ))
{
/* Adjust last action modifier in result */
- the_modes[strlen( the_modes ) - 1] = *mode_ptr;
+ the_modes[len] = *mode_ptr;
}
else
{
x[0] = '\0';
switch( *mode_ptr )
{
- case 'a':
- /* Away */
+ case 'i': /* Invisible */
+ case 's': /* Server messages */
+ x[0] = *mode_ptr;
+ break;
+
+ case 'a': /* Away */
if( Client_Type( Client ) == CLIENT_SERVER )
{
x[0] = 'a';
}
else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
break;
- case 'i':
- /* Invisible */
- x[0] = 'i';
- break;
- case 'o':
- /* IRC operator (only unsetable!) */
+
+ case 'o': /* IRC operator (only unsettable!) */
if(( ! set ) || ( Client_Type( Client ) == CLIENT_SERVER ))
{
Client_SetOperByMe( Target, FALSE );
}
else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
break;
- case 'r':
- /* Restricted (only setable) */
+
+ case 'r': /* Restricted (only settable) */
if(( set ) || ( Client_Type( Client ) == CLIENT_SERVER )) x[0] = 'r';
else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin ));
break;
- case 's':
- /* Server messages */
- x[0] = 's';
- break;
+
default:
Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ));
if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );
if( the_modes[1] )
{
/* Remoce needless action modifier characters */
- if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' )) the_modes[strlen( the_modes ) - 1] = '\0';
+ len = strlen( the_modes ) - 1;
+ if(( the_modes[len] == '+' ) || ( the_modes[len] == '-' )) the_modes[len] = '\0';
if( Client_Type( Client ) == CLIENT_SERVER )
{
INT mode_arg, arg_arg;
CLIENT *client;
LONG l;
+ size_t len;
/* Mode request: let's answer it :-) */
if( Req->argc == 1 )
if((( *mode_ptr == '+' ) && ( ! set )) || (( *mode_ptr == '-' ) && ( set )))
{
/* Action modifier ("+"/"-") must be changed ... */
- if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' ))
+ len = strlen( the_modes ) - 1;
+ if(( the_modes[len] == '+' ) || ( the_modes[len] == '-' ))
{
/* Adjust last action modifier in result */
- the_modes[strlen( the_modes ) - 1] = *mode_ptr;
+ the_modes[len] = *mode_ptr;
}
else
{
client = NULL;
switch( *mode_ptr )
{
- /* Channel modes */
- case 'i':
- /* Invite-Only */
- if( modeok ) x[0] = 'i';
- else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
- break;
- case 'm':
- /* Moderated */
- if( modeok ) x[0] = 'm';
- else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
- break;
- case 'n':
- /* kein Schreiben in den Channel von aussen */
- if( modeok ) x[0] = 'n';
- else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
- break;
- case 't':
- /* Topic Lock */
- if( modeok ) x[0] = 't';
- else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
- break;
- case 'P':
- /* Persistent channel */
- if( modeok )
- {
- if( set && ( ! Client_OperByMe( Client )))
- {
- /* Only IRC operators are allowed to set P mode */
- ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
- }
- else x[0] = 'P';
- }
+ /* --- Channel modes --- */
+
+ case 'i': /* Invite only */
+ case 'm': /* Moderated */
+ case 'n': /* Only members can write */
+ case 's': /* Secret channel */
+ case 't': /* Topic locked */
+ if( modeok ) x[0] = *mode_ptr;
else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
break;
- /* Channel user modes */
- case 'o':
- /* Channel operator */
- case 'v':
- /* Voice */
- if( arg_arg > mode_arg )
- {
- if( modeok )
- {
- client = Client_Search( Req->argv[arg_arg] );
- if( client ) x[0] = *mode_ptr;
- else ok = IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[arg_arg] );
- }
- else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
- Req->argv[arg_arg][0] = '\0';
- arg_arg++;
- }
- else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
- break;
- case 'k':
- /* Channel key */
+ case 'k': /* Channel key */
if( ! set )
{
if( modeok ) x[0] = *mode_ptr;
}
else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
break;
- case 'l':
- /* Member limit */
+
+ case 'l': /* Member limit */
if( ! set )
{
if( modeok ) x[0] = *mode_ptr;
else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
break;
- /* Channel lists */
- case 'I':
- /* Invite lists */
+ case 'P': /* Persistent channel */
+ if( modeok )
+ {
+ if( set && ( ! Client_OperByMe( Client )))
+ {
+ /* Only IRC operators are allowed to set P mode */
+ ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
+ }
+ else x[0] = 'P';
+ }
+ else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+ break;
+
+ /* --- Channel user modes --- */
+
+ case 'o': /* Channel operator */
+ case 'v': /* Voice */
+ if( arg_arg > mode_arg )
+ {
+ if( modeok )
+ {
+ client = Client_Search( Req->argv[arg_arg] );
+ if( client ) x[0] = *mode_ptr;
+ else ok = IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[arg_arg] );
+ }
+ else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel ));
+ Req->argv[arg_arg][0] = '\0';
+ arg_arg++;
+ }
+ else ok = IRC_WriteStrClient( Origin, ERR_NEEDMOREPARAMS_MSG, Client_ID( Origin ), Req->command );
+ break;
+
+ /* --- Channel lists --- */
+
+ case 'I': /* Invite lists */
if( arg_arg > mode_arg )
{
/* modify list */
}
else Lists_ShowInvites( Origin, Channel );
break;
- case 'b':
- /* Ban lists */
+
+ case 'b': /* Ban lists */
if( arg_arg > mode_arg )
{
/* modify list */
/* Are there additional arguments to add? */
if( argadd[0] )
{
- if( the_args[strlen( the_args ) - 1] != ' ' ) strlcat( the_args, " ", sizeof( the_args ));
+ len = strlen( the_args ) - 1;
+ if( the_args[len] != ' ' ) strlcat( the_args, " ", sizeof( the_args ));
strlcat( the_args, argadd, sizeof( the_args ));
}
}
if( the_modes[1] )
{
/* Clean up mode string */
- if(( the_modes[strlen( the_modes ) - 1] == '+' ) || ( the_modes[strlen( the_modes ) - 1] == '-' )) the_modes[strlen( the_modes ) - 1] = '\0';
+ len = strlen( the_modes ) - 1;
+ if(( the_modes[len] == '+' ) || ( the_modes[len] == '-' )) the_modes[len] = '\0';
/* Clean up argument string if there are none */
if( ! the_args[1] ) the_args[0] = '\0';
Add_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
{
CHAR *mask;
+ BOOLEAN already;
assert( Client != NULL );
assert( Channel != NULL );
mask = Lists_MakeMask( Pattern );
- if( ! Lists_AddInvited( Prefix, mask, Channel, FALSE )) return CONNECTED;
+ already = Lists_IsInviteEntry( mask, Channel );
+
+ if( ! Lists_AddInvited( mask, Channel, FALSE )) return CONNECTED;
+
+ if(( Client_Type( Prefix ) == CLIENT_SERVER ) && ( already == TRUE )) return CONNECTED;
+
return Send_ListChange( "+I", Prefix, Client, Channel, mask );
} /* Add_Invite */
Add_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
{
CHAR *mask;
+ BOOLEAN already;
assert( Client != NULL );
assert( Channel != NULL );
mask = Lists_MakeMask( Pattern );
- if( ! Lists_AddBanned( Prefix, mask, Channel )) return CONNECTED;
+ already = Lists_IsBanEntry( mask, Channel );
+
+ if( ! Lists_AddBanned( mask, Channel )) return CONNECTED;
+
+ if(( Client_Type( Prefix ) == CLIENT_SERVER ) && ( already == TRUE )) return CONNECTED;
+
return Send_ListChange( "+b", Prefix, Client, Channel, mask );
} /* Add_Ban */
projects / ngircd-alex.git / blobdiff