#include "portab.h"
-static char UNUSED id[] = "$Id: irc-mode.c,v 1.39 2005/03/15 16:56:18 alex Exp $";
+static char UNUSED id[] = "$Id: irc-mode.c,v 1.48 2006/12/07 17:57:20 fw Exp $";
#include "imp.h"
#include <assert.h>
#include <stdlib.h>
#include <string.h>
+#include "defines.h"
#include "conn.h"
#include "client.h"
#include "channel.h"
-#include "defines.h"
#include "irc-write.h"
#include "lists.h"
#include "log.h"
#include "irc-mode.h"
-LOCAL BOOLEAN Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ));
-LOCAL BOOLEAN Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ));
+static bool Client_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ));
+static bool Channel_Mode PARAMS(( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ));
-LOCAL BOOLEAN Add_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
-LOCAL BOOLEAN Add_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
+static bool Add_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern ));
+static bool Add_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern ));
-LOCAL BOOLEAN Del_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
-LOCAL BOOLEAN Del_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ));
+static bool Del_Invite PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern ));
+static bool Del_Ban PARAMS(( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern ));
-LOCAL BOOLEAN Send_ListChange PARAMS(( CHAR *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Mask ));
+static bool Send_ListChange PARAMS(( char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Mask ));
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_MODE( CLIENT *Client, REQUEST *Req )
{
CLIENT *cl, *origin;
if( ! origin ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
}
else origin = Client;
-
+
/* Channel or user mode? */
- cl = chan = NULL;
- if( Client_IsValidNick( Req->argv[0] )) cl = Client_Search( Req->argv[0] );
- if( Channel_IsValidName( Req->argv[0] )) chan = Channel_Search( Req->argv[0] );
+ cl = NULL; chan = NULL;
+ if (Client_IsValidNick(Req->argv[0]))
+ cl = Client_Search(Req->argv[0]);
+ if (Channel_IsValidName(Req->argv[0]))
+ chan = Channel_Search(Req->argv[0]);
- if( cl ) return Client_Mode( Client, Req, origin, cl );
- if( chan ) return Channel_Mode( Client, Req, origin, chan );
+ if (cl)
+ return Client_Mode(Client, Req, origin, cl);
+ if (chan)
+ return Channel_Mode(Client, Req, origin, chan);
/* No target found! */
- return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] );
+ return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+ Client_ID(Client), Req->argv[0]);
} /* IRC_MODE */
-LOCAL BOOLEAN
+static bool
Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
{
/* Handle client mode requests */
- CHAR the_modes[COMMAND_LEN], x[2], *mode_ptr;
- BOOLEAN ok, set;
- INT mode_arg;
+ char the_modes[COMMAND_LEN], x[2], *mode_ptr;
+ bool ok, set;
+ int mode_arg;
size_t len;
/* Is the client allowed to request or change the modes? */
mode_ptr = Req->argv[mode_arg];
/* Initial state: set or unset modes? */
- if( *mode_ptr == '+' ) set = TRUE;
- else if( *mode_ptr == '-' ) set = FALSE;
+ if( *mode_ptr == '+' ) set = true;
+ else if( *mode_ptr == '-' ) set = false;
else return IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Origin ));
/* Prepare reply string */
x[0] = *mode_ptr;
strlcat( the_modes, x, sizeof( the_modes ));
}
- if( *mode_ptr == '+' ) set = TRUE;
- else set = FALSE;
+ if( *mode_ptr == '+' ) set = true;
+ else set = false;
}
continue;
}
if( Client_Type( Client ) == CLIENT_SERVER )
{
x[0] = 'a';
- Client_SetAway( Client, DEFAULT_AWAY_MSG );
+ Client_SetAway( Origin, DEFAULT_AWAY_MSG );
}
else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
break;
case 'o': /* IRC operator (only unsettable!) */
if(( ! set ) || ( Client_Type( Client ) == CLIENT_SERVER ))
{
- Client_SetOperByMe( Target, FALSE );
+ Client_SetOperByMe( Target, false );
x[0] = 'o';
}
else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin ));
} /* Client_Mode */
-LOCAL BOOLEAN
+static bool
Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
{
/* Handle channel and channel-user modes */
- CHAR the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], argadd[CLIENT_PASS_LEN], *mode_ptr;
- BOOLEAN ok, set, modeok = FALSE, skiponce, use_servermode = FALSE;
- INT mode_arg, arg_arg;
+ char the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], argadd[CLIENT_PASS_LEN], *mode_ptr;
+ bool ok, set, modeok = false, skiponce, use_servermode = false;
+ int mode_arg, arg_arg;
CLIENT *client;
- LONG l;
+ long l;
size_t len;
/* Mode request: let's answer it :-) */
/* The sender is a member: generate extended reply */
strlcpy( the_modes, Channel_Modes( Channel ), sizeof( the_modes ));
mode_ptr = the_modes;
- strcpy( the_args, "" );
+ the_args[0] = '\0';
while( *mode_ptr )
{
switch( *mode_ptr )
{
case 'l':
- snprintf( argadd, sizeof( argadd ), " %ld", Channel_MaxUsers( Channel ));
+ snprintf( argadd, sizeof( argadd ), " %lu", Channel_MaxUsers( Channel ));
strlcat( the_args, argadd, sizeof( the_args ));
break;
case 'k':
if( ! Channel_IsMemberOf( Channel, Origin )) return IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Channel_Name( Channel ));
/* Is he channel operator? */
- if( strchr( Channel_UserModes( Channel, Origin ), 'o' )) modeok = TRUE;
+ if( strchr( Channel_UserModes( Channel, Origin ), 'o' )) modeok = true;
else if( Conf_OperCanMode )
{
/* IRC-Operators can use MODE as well */
if( Client_OperByMe( Origin )) {
- modeok = TRUE;
- if ( Conf_OperServerMode ) use_servermode = TRUE; /* Change Origin to Server */
+ modeok = true;
+ if ( Conf_OperServerMode ) use_servermode = true; /* Change Origin to Server */
}
}
}
- else modeok = TRUE;
+ else modeok = true;
mode_arg = 1;
mode_ptr = Req->argv[mode_arg];
else arg_arg = -1;
/* Initial state: set or unset modes? */
- skiponce = FALSE;
- if( *mode_ptr == '-' ) set = FALSE;
- else if( *mode_ptr == '+' ) set = TRUE;
- else set = skiponce = TRUE;
+ skiponce = false;
+ if( *mode_ptr == '-' ) set = false;
+ else if( *mode_ptr == '+' ) set = true;
+ else set = skiponce = true;
/* Prepare reply string */
if( set ) strcpy( the_modes, "+" );
if( Req->argc > mode_arg + 1 ) arg_arg = mode_arg + 1;
else arg_arg = -1;
}
- skiponce = FALSE;
+ skiponce = false;
switch( *mode_ptr )
{
x[0] = *mode_ptr;
strlcat( the_modes, x, sizeof( the_modes ));
}
- if( *mode_ptr == '+' ) set = TRUE;
- else set = FALSE;
+ if( *mode_ptr == '+' ) set = true;
+ else set = false;
}
continue;
}
Req->argv[arg_arg][0] = '\0';
arg_arg++;
}
- else Lists_ShowInvites( Origin, Channel );
+ else Channel_ShowInvites( Origin, Channel );
break;
case 'b': /* Ban lists */
Req->argv[arg_arg][0] = '\0';
arg_arg++;
}
- else Lists_ShowBans( Origin, Channel );
+ else Channel_ShowBans( Origin, Channel );
break;
default:
{
/* Forward mode changes to channel users and other servers */
IRC_WriteStrServersPrefix( Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
- IRC_WriteStrChannelPrefix( Client, Channel, Origin, FALSE, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
+ IRC_WriteStrChannelPrefix( Client, Channel, Origin, false, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
}
else
{
/* Send reply to client and inform other servers and channel users */
ok = IRC_WriteStrClientPrefix( Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
IRC_WriteStrServersPrefix( Client, Origin, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
- IRC_WriteStrChannelPrefix( Client, Channel, Origin, FALSE, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
+ IRC_WriteStrChannelPrefix( Client, Channel, Origin, false, "MODE %s %s%s", Channel_Name( Channel ), the_modes, the_args );
}
}
} /* Channel_Mode */
-GLOBAL BOOLEAN
+GLOBAL bool
IRC_AWAY( CLIENT *Client, REQUEST *Req )
{
assert( Client != NULL );
} /* IRC_AWAY */
-LOCAL BOOLEAN
-Add_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
+static bool
+Add_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern )
{
- CHAR *mask;
- BOOLEAN already;
+ char *mask;
+ bool already;
assert( Client != NULL );
assert( Channel != NULL );
mask = Lists_MakeMask( Pattern );
- already = Lists_IsInviteEntry( mask, Channel );
-
- if( ! Lists_AddInvited( mask, Channel, FALSE )) return CONNECTED;
-
- if(( Client_Type( Prefix ) == CLIENT_SERVER ) && ( already == TRUE )) return CONNECTED;
+ already = Lists_CheckDupeMask(Channel_GetListInvites(Channel), mask );
+ if (!already) {
+ if( ! Channel_AddInvite(Channel, mask, false ))
+ return CONNECTED;
+ }
+ if ( already && ( Client_Type( Prefix ) == CLIENT_SERVER ))
+ return CONNECTED;
return Send_ListChange( "+I", Prefix, Client, Channel, mask );
} /* Add_Invite */
-LOCAL BOOLEAN
-Add_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
+static bool
+Add_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern )
{
- CHAR *mask;
- BOOLEAN already;
+ char *mask;
+ bool already;
assert( Client != NULL );
assert( Channel != NULL );
mask = Lists_MakeMask( Pattern );
- already = Lists_IsBanEntry( mask, Channel );
-
- if( ! Lists_AddBanned( mask, Channel )) return CONNECTED;
-
- if(( Client_Type( Prefix ) == CLIENT_SERVER ) && ( already == TRUE )) return CONNECTED;
+ already = Lists_CheckDupeMask(Channel_GetListBans(Channel), mask );
+ if (!already) {
+ if( ! Channel_AddBan(Channel, mask))
+ return CONNECTED;
+ }
+ if ( already && ( Client_Type( Prefix ) == CLIENT_SERVER ))
+ return CONNECTED;
return Send_ListChange( "+b", Prefix, Client, Channel, mask );
} /* Add_Ban */
-LOCAL BOOLEAN
-Del_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
+static bool
+Del_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern )
{
- CHAR *mask;
+ char *mask;
assert( Client != NULL );
assert( Channel != NULL );
assert( Pattern != NULL );
mask = Lists_MakeMask( Pattern );
- Lists_DelInvited( mask, Channel );
+ Lists_Del(Channel_GetListInvites(Channel), mask);
return Send_ListChange( "-I", Prefix, Client, Channel, mask );
} /* Del_Invite */
-LOCAL BOOLEAN
-Del_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern )
+static bool
+Del_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Pattern )
{
- CHAR *mask;
+ char *mask;
assert( Client != NULL );
assert( Channel != NULL );
assert( Pattern != NULL );
mask = Lists_MakeMask( Pattern );
- Lists_DelBanned( mask, Channel );
+ Lists_Del(Channel_GetListBans(Channel), mask);
return Send_ListChange( "-b", Prefix, Client, Channel, mask );
} /* Del_Ban */
-LOCAL BOOLEAN
-Send_ListChange( CHAR *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Mask )
+static bool
+Send_ListChange( char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, char *Mask )
{
/* Bestaetigung an Client schicken & andere Server sowie Channel-User informieren */
- BOOLEAN ok;
+ bool ok;
if( Client_Type( Client ) == CLIENT_USER )
{
/* Bestaetigung an Client */
ok = IRC_WriteStrClientPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
}
- else ok = TRUE;
+ else ok = true;
/* an andere Server */
IRC_WriteStrServersPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
/* und lokale User im Channel */
- IRC_WriteStrChannelPrefix( Client, Channel, Prefix, FALSE, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
+ IRC_WriteStrChannelPrefix( Client, Channel, Prefix, false, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
return ok;
} /* Send_ListChange */
projects / ngircd-alex.git / blobdiff