X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-mode.c;h=c26984d8208ec5eb0e4201bd2bebe694dd0b6097;hb=8f162f4e1770940889cb1504b285e7ca9a61a485;hp=bbecca98c3901e56aa224647936dc9b80be0e62d;hpb=8579b2a1e514b2c25d81f439f277c9fb39fc1e9f;p=ngircd-alex.git diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index bbecca98..c26984d8 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-mode.c,v 1.36 2005/02/27 20:09:44 alex Exp $"; +static char UNUSED id[] = "$Id: irc-mode.c,v 1.50 2007/10/14 12:08:57 alex Exp $"; #include "imp.h" #include @@ -22,10 +22,10 @@ static char UNUSED id[] = "$Id: irc-mode.c,v 1.36 2005/02/27 20:09:44 alex Exp $ #include #include +#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" @@ -38,19 +38,19 @@ static char UNUSED id[] = "$Id: irc-mode.c,v 1.36 2005/02/27 20:09:44 alex Exp $ #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; @@ -69,28 +69,34 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) 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? */ if( Client_Type( Client ) == CLIENT_USER ) @@ -106,8 +112,8 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) 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 */ @@ -134,10 +140,11 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) 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 { @@ -145,8 +152,8 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) 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; } @@ -157,6 +164,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) { case 'i': /* Invisible */ case 's': /* Server messages */ + case 'w': /* Wallops messages */ x[0] = *mode_ptr; break; @@ -164,7 +172,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) 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; @@ -172,7 +180,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) 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 )); @@ -212,7 +220,8 @@ client_exit: 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 ) { @@ -233,16 +242,17 @@ client_exit: } /* 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, skiponce; - 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 :-) */ if( Req->argc == 1 ) @@ -253,13 +263,13 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) /* 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': @@ -281,15 +291,17 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) 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; - else modeok = FALSE; - if( Conf_OperCanMode ) + if( strchr( Channel_UserModes( Channel, Origin ), 'o' )) modeok = true; + else if( Conf_OperCanMode ) { - /* auch IRC-Operatoren duerfen MODE verwenden */ - if( Client_OperByMe( Origin )) modeok = TRUE; + /* IRC-Operators can use MODE as well */ + if( Client_OperByMe( Origin )) { + 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]; @@ -297,10 +309,10 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) 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, "+" ); @@ -322,7 +334,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) if( Req->argc > mode_arg + 1 ) arg_arg = mode_arg + 1; else arg_arg = -1; } - skiponce = FALSE; + skiponce = false; switch( *mode_ptr ) { @@ -331,10 +343,11 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) 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 { @@ -342,8 +355,8 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) 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; } @@ -362,6 +375,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) 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 )); @@ -418,16 +432,21 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *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'; - } - else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); + if (modeok) { + /* Only IRC operators are allowed to + * set the 'P' channel mode! */ + if (set && ! (Client_OperByMe(Client) + || Client_Type(Client) == CLIENT_SERVER)) { + 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 --- */ @@ -464,7 +483,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) Req->argv[arg_arg][0] = '\0'; arg_arg++; } - else Lists_ShowInvites( Origin, Channel ); + else Channel_ShowInvites( Origin, Channel ); break; case 'b': /* Ban lists */ @@ -480,7 +499,7 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) Req->argv[arg_arg][0] = '\0'; arg_arg++; } - else Lists_ShowBans( Origin, Channel ); + else Channel_ShowBans( Origin, Channel ); break; default: @@ -553,7 +572,8 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) /* 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 )); } } @@ -563,7 +583,8 @@ chan_exit: 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'; @@ -572,14 +593,16 @@ chan_exit: { /* 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 { + if ( use_servermode ) Origin = Client_ThisServer(); + /* 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 ); } } @@ -588,7 +611,7 @@ chan_exit: } /* Channel_Mode */ -GLOBAL BOOLEAN +GLOBAL bool IRC_AWAY( CLIENT *Client, REQUEST *Req ) { assert( Client != NULL ); @@ -615,11 +638,11 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req ) } /* 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 ); @@ -627,21 +650,23 @@ Add_Invite( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ) 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 ); @@ -649,65 +674,67 @@ Add_Ban( CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, CHAR *Pattern ) 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 */