X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-mode.c;h=df464a7dba7efca0058cdede4d18ec8090a7eeea;hb=04e38f17ae671f84b93e06c6eefa9235dd71d6ce;hp=2ebbc91d5d9b81cba64cada755240353e8f9b5e0;hpb=796dcf6a6203226d2a06635e94b4231b2c85f5b3;p=ngircd-alex.git diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 2ebbc91d..df464a7d 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2005 Alexander Barton (alex@barton.de) + * Copyright (c)2001-2010 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 @@ -22,27 +22,30 @@ #include "defines.h" #include "conn.h" -#include "client.h" #include "channel.h" #include "irc-write.h" #include "lists.h" #include "log.h" #include "parse.h" #include "messages.h" -#include "resolve.h" #include "conf.h" #include "exp.h" #include "irc-mode.h" -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 )); +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 )); -static bool Add_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern)); -static bool Del_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Pattern)); +static bool Add_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Pattern)); +static bool Del_Ban_Invite PARAMS((int what, CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Pattern)); -static bool Send_ListChange PARAMS(( char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Mask )); +static bool Send_ListChange PARAMS((const char *Mode, CLIENT *Prefix, + CLIENT *Client, CHANNEL *Channel, const char *Mask)); GLOBAL bool @@ -172,6 +175,17 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin )); break; + case 'c': /* Receive connect notices + * (only settable by IRC operators!) */ + if(!set || Client_OperByMe(Origin) + || Client_Type(Client) == CLIENT_SERVER) + x[0] = 'c'; + 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 )) { @@ -186,6 +200,15 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin )); break; + case 'x': /* Cloak hostname */ + if (Client_HasMode(Client, 'r')) + IRC_WriteStrClient(Origin, + ERR_RESTRICTED_MSG, + Client_ID(Origin)); + else + x[0] = 'x'; + 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 ); @@ -229,7 +252,9 @@ client_exit: ok = IRC_WriteStrClientPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes ); IRC_WriteStrServersPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes ); } - Log( LOG_DEBUG, "User \"%s\": Mode change, now \"%s\".", Client_Mask( Target ), Client_Modes( Target )); + LogDebug("%s \"%s\": Mode change, now \"%s\".", + Client_TypeText(Target), Client_Mask(Target), + Client_Modes(Target)); } IRC_SetPenalty( Client, 1 ); @@ -274,18 +299,25 @@ Channel_Mode_Answer_Request(CLIENT *Origin, CHANNEL *Channel) } +/** + * Handle channel mode and channel-user mode changes + */ static bool -Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) +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; - bool ok, set, modeok = true, skiponce, use_servermode = false; + char the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], + argadd[CLIENT_PASS_LEN], *mode_ptr; + bool connected, set, skiponce, retval, onchannel; + bool modeok = true, use_servermode = false; int mode_arg, arg_arg; CLIENT *client; long l; size_t len; + if (Channel_IsModeless(Channel)) + return IRC_WriteStrClient(Client, ERR_NOCHANMODES_MSG, + Client_ID(Client), Channel_Name(Channel)); + /* Mode request: let's answer it :-) */ if (Req->argc <= 1) return Channel_Mode_Answer_Request(Origin, Channel); @@ -293,14 +325,13 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) /* Is the user allowed to change modes? */ if (Client_Type(Client) == CLIENT_USER) { /* Is the originating user on that channel? */ - if (!Channel_IsMemberOf(Channel, Origin)) - return IRC_WriteStrClient(Origin, ERR_NOTONCHANNEL_MSG, - Client_ID(Origin), Channel_Name(Channel)); + onchannel = Channel_IsMemberOf(Channel, Origin); modeok = false; /* channel operator? */ - if (strchr(Channel_UserModes(Channel, Origin), 'o')) + if (onchannel && + strchr(Channel_UserModes(Channel, Origin), 'o')) { modeok = true; - else if(Conf_OperCanMode) { + } else if (Conf_OperCanMode) { /* IRC-Operators can use MODE as well */ if (Client_OperByMe(Origin)) { modeok = true; @@ -308,6 +339,10 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) use_servermode = true; /* Change Origin to Server */ } } + + if (!onchannel && !modeok) + return IRC_WriteStrClient(Origin, ERR_NOTONCHANNEL_MSG, + Client_ID(Origin), Channel_Name(Channel)); } mode_arg = 1; @@ -320,8 +355,12 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) /* Initial state: set or unset modes? */ skiponce = false; switch (*mode_ptr) { - case '-': set = false; break; - case '+': set = true; break; + case '-': + set = false; + break; + case '+': + set = true; + break; default: set = true; skiponce = true; @@ -332,9 +371,9 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) the_args[0] = '\0'; x[1] = '\0'; - ok = CONNECTED; + connected = CONNECTED; while (mode_ptr) { - if (! skiponce) + if (!skiponce) mode_ptr++; if (!*mode_ptr) { /* Try next argument if there's any */ @@ -357,10 +396,11 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) switch (*mode_ptr) { case '+': case '-': - if (((*mode_ptr == '+') && !set) || ((*mode_ptr == '-') && set)) { + if (((*mode_ptr == '+') && !set) + || ((*mode_ptr == '-') && set)) { /* Action modifier ("+"/"-") must be changed ... */ - len = strlen( the_modes ) - 1; - if ((the_modes[len] == '+') || (the_modes[len] == '-')) { + len = strlen(the_modes) - 1; + if (the_modes[len] == '+' || the_modes[len] == '-') { /* Adjust last action modifier in result */ the_modes[len] = *mode_ptr; } else { @@ -374,211 +414,239 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel ) } /* Are there arguments left? */ - if( arg_arg >= Req->argc ) arg_arg = -1; + if (arg_arg >= Req->argc) + arg_arg = -1; /* Validate modes */ x[0] = '\0'; argadd[0] = '\0'; client = NULL; - switch( *mode_ptr ) - { - /* --- 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; - - case 'k': /* Channel key */ - if( ! set ) - { - if( modeok ) x[0] = *mode_ptr; - else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); - break; - } - if( arg_arg > mode_arg ) - { - if( modeok ) - { - Channel_ModeDel( Channel, 'k' ); - Channel_SetKey( Channel, Req->argv[arg_arg] ); - strlcpy( argadd, Channel_Key( Channel ), sizeof( argadd )); - x[0] = *mode_ptr; - } - 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 'l': /* Member limit */ - if( ! set ) - { - if( modeok ) x[0] = *mode_ptr; - else ok = IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Channel_Name( Channel )); - break; - } - if( arg_arg > mode_arg ) - { - if( modeok ) - { - l = atol( Req->argv[arg_arg] ); - if( l > 0 && l < 0xFFFF ) - { - Channel_ModeDel( Channel, 'l' ); - Channel_SetMaxUsers( Channel, l ); - snprintf( argadd, sizeof( argadd ), "%ld", l ); - x[0] = *mode_ptr; - } - } - 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 ); + switch (*mode_ptr) { + /* --- Channel modes --- */ + case 'i': /* Invite only */ + case 'm': /* Moderated */ + case 'n': /* Only members can write */ + case 's': /* Secret channel */ + case 't': /* Topic locked */ + case 'z': /* Secure connections only */ + if (modeok) + x[0] = *mode_ptr; + else + connected = IRC_WriteStrClient(Origin, + ERR_CHANOPRIVSNEEDED_MSG, + Client_ID(Origin), Channel_Name(Channel)); + break; + case 'k': /* Channel key */ + if (!set) { + if (modeok) + x[0] = *mode_ptr; + else + connected = IRC_WriteStrClient(Origin, + ERR_CHANOPRIVSNEEDED_MSG, + Client_ID(Origin), + Channel_Name(Channel)); break; - - case 'P': /* Persistent channel */ + } + if (arg_arg > mode_arg) { 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, + Channel_ModeDel(Channel, 'k'); + Channel_SetKey(Channel, + Req->argv[arg_arg]); + strlcpy(argadd, Channel_Key(Channel), + sizeof(argadd)); + x[0] = *mode_ptr; + } else { + connected = 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 ); + Req->argv[arg_arg][0] = '\0'; + arg_arg++; + } else { + connected = IRC_WriteStrClient(Origin, + ERR_NEEDMOREPARAMS_MSG, + Client_ID(Origin), Req->command); + goto chan_exit; + } + break; + case 'l': /* Member limit */ + if (!set) { + if (modeok) + x[0] = *mode_ptr; + else + connected = IRC_WriteStrClient(Origin, + ERR_CHANOPRIVSNEEDED_MSG, + Client_ID(Origin), + Channel_Name(Channel)); break; - - /* --- Channel lists --- */ - case 'I': /* Invite lists */ - case 'b': /* Ban lists */ - if (arg_arg > mode_arg) { - /* modify list */ - if (modeok) { - if (set) - Add_Ban_Invite(*mode_ptr, Origin, Client, Channel, Req->argv[arg_arg]); - else - Del_Ban_Invite(*mode_ptr, Origin, Client, Channel, Req->argv[arg_arg]); - } else { - ok = IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG, - Client_ID(Origin), Channel_Name(Channel)); + } + if (arg_arg > mode_arg) { + if (modeok) { + l = atol(Req->argv[arg_arg]); + if (l > 0 && l < 0xFFFF) { + Channel_ModeDel(Channel, 'l'); + Channel_SetMaxUsers(Channel, l); + snprintf(argadd, sizeof(argadd), + "%ld", l); + x[0] = *mode_ptr; } - Req->argv[arg_arg][0] = '\0'; - arg_arg++; } else { - if (*mode_ptr == 'I') - Channel_ShowInvites(Origin, Channel); + connected = IRC_WriteStrClient(Origin, + ERR_CHANOPRIVSNEEDED_MSG, + Client_ID(Origin), + Channel_Name(Channel)); + } + Req->argv[arg_arg][0] = '\0'; + arg_arg++; + } else { + connected = IRC_WriteStrClient(Origin, + ERR_NEEDMOREPARAMS_MSG, + Client_ID(Origin), Req->command); + goto chan_exit; + } + break; + case 'P': /* Persistent channel */ + if (modeok) { + /* Only IRC operators are allowed to + * set the 'P' channel mode! */ + if (set && !(Client_OperByMe(Client) + || Client_Type(Client) == CLIENT_SERVER)) + connected = IRC_WriteStrClient(Origin, + ERR_NOPRIVILEGES_MSG, + Client_ID(Origin)); + else + x[0] = 'P'; + } else + connected = 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 - Channel_ShowBans(Origin, Channel); + connected = IRC_WriteStrClient(Client, + ERR_NOSUCHNICK_MSG, + Client_ID(Client), + Req->argv[arg_arg]); + } else { + connected = IRC_WriteStrClient(Origin, + ERR_CHANOPRIVSNEEDED_MSG, + Client_ID(Origin), + Channel_Name(Channel)); } - break; - default: - Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\" on %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin ), Channel_Name( Channel )); - if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr ); - x[0] = '\0'; + Req->argv[arg_arg][0] = '\0'; + arg_arg++; + } else { + connected = IRC_WriteStrClient(Origin, + ERR_NEEDMOREPARAMS_MSG, + Client_ID(Origin), Req->command); goto chan_exit; - } - if( ! ok ) break; + } + break; + /* --- Channel lists --- */ + case 'I': /* Invite lists */ + case 'b': /* Ban lists */ + if (arg_arg > mode_arg) { + /* modify list */ + if (modeok) { + connected = set + ? Add_Ban_Invite(*mode_ptr, Origin, + Client, Channel, + Req->argv[arg_arg]) + : Del_Ban_Invite(*mode_ptr, Origin, + Client, Channel, + Req->argv[arg_arg]); + } else { + connected = IRC_WriteStrClient(Origin, + ERR_CHANOPRIVSNEEDED_MSG, + Client_ID(Origin), + Channel_Name(Channel)); + } + Req->argv[arg_arg][0] = '\0'; + arg_arg++; + } else { + if (*mode_ptr == 'I') + Channel_ShowInvites(Origin, Channel); + else + Channel_ShowBans(Origin, Channel); + } + break; + default: + Log(LOG_DEBUG, + "Unknown mode \"%c%c\" from \"%s\" on %s!?", + set ? '+' : '-', *mode_ptr, Client_ID(Origin), + Channel_Name(Channel)); + if (Client_Type(Client) != CLIENT_SERVER) + connected = IRC_WriteStrClient(Origin, + ERR_UMODEUNKNOWNFLAG2_MSG, + Client_ID(Origin), + set ? '+' : '-', *mode_ptr); + x[0] = '\0'; + goto chan_exit; + } /* switch() */ + + if (!connected) + break; /* Is there a valid mode change? */ - if( ! x[0] ) continue; + if (!x[0]) + continue; /* Validate target client */ - if( client && ( ! Channel_IsMemberOf( Channel, client ))) - { - if( ! IRC_WriteStrClient( Origin, ERR_USERNOTINCHANNEL_MSG, Client_ID( Origin ), Client_ID( client ), Channel_Name( Channel ))) break; + if (client && (!Channel_IsMemberOf(Channel, client))) { + if (!IRC_WriteStrClient + (Origin, ERR_USERNOTINCHANNEL_MSG, + Client_ID(Origin), Client_ID(client), + Channel_Name(Channel))) + break; + continue; } - if( set ) - { - /* Set mode */ - if( client ) - { - /* Channel-User-Mode */ - if( Channel_UserModeAdd( Channel, client, x[0] )) - { - strlcat( the_args, " ", sizeof( the_args )); - strlcat( the_args, Client_ID( client ), sizeof( the_args )); - strlcat( the_modes, x, sizeof( the_modes )); - Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client )); - } - } - else - { - /* Channel-Mode */ - if( Channel_ModeAdd( Channel, x[0] )) - { - strlcat( the_modes, x, sizeof( the_modes )); - Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel )); - } - } - } - else - { - /* Unset mode */ - if( client ) - { - /* Channel-User-Mode */ - if( Channel_UserModeDel( Channel, client, x[0] )) - { - strlcat( the_args, " ", sizeof( the_args )); - strlcat( the_args, Client_ID( client ), sizeof( the_args )); - strlcat( the_modes, x, sizeof( the_modes )); - Log( LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"", Client_Mask( client ), Channel_Name( Channel ), Channel_UserModes( Channel, client )); - } + if (client) { + /* Channel-User-Mode */ + retval = set + ? Channel_UserModeAdd(Channel, client, x[0]) + : Channel_UserModeDel(Channel, client, x[0]); + if (retval) { + strlcat(the_args, " ", sizeof(the_args)); + strlcat(the_args, Client_ID(client), + sizeof(the_args)); + strlcat(the_modes, x, sizeof(the_modes)); + LogDebug + ("User \"%s\": Mode change on %s, now \"%s\"", + Client_Mask(client), Channel_Name(Channel), + Channel_UserModes(Channel, client)); } - else - { - /* Channel-Mode */ - if( Channel_ModeDel( Channel, x[0] )) - { - strlcat( the_modes, x, sizeof( the_modes )); - Log( LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name( Channel ), Channel_Modes( Channel )); - } + } else { + /* Channel-Mode */ + retval = set + ? Channel_ModeAdd(Channel, x[0]) + : Channel_ModeDel(Channel, x[0]); + if (retval) { + strlcat(the_modes, x, sizeof(the_modes)); + LogDebug("Channel %s: Mode change, now \"%s\".", + Channel_Name(Channel), + Channel_Modes(Channel)); } } /* Are there additional arguments to add? */ - if( argadd[0] ) - { - strlcat( the_args, " ", sizeof( the_args )); - strlcat( the_args, argadd, sizeof( the_args )); + if (argadd[0]) { + strlcat(the_args, " ", sizeof(the_args)); + strlcat(the_args, argadd, sizeof(the_args)); } } -chan_exit: + chan_exit: /* Are there changed modes? */ if (the_modes[1]) { /* Clean up mode string */ @@ -587,21 +655,41 @@ chan_exit: the_modes[len] = '\0'; if (Client_Type(Client) == CLIENT_SERVER) { - /* 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); + /* MODE requests for local channels from other servers + * are definitely invalid! */ + if (Channel_IsLocal(Channel)) { + Log(LOG_ALERT, "Got remote MODE command for local channel!? Ignored."); + return CONNECTED; + } + + /* Forward mode changes to channel users and all the + * other remote 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); } 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 ); + connected = IRC_WriteStrClientPrefix(Client, Origin, + "MODE %s %s%s", Channel_Name(Channel), + the_modes, the_args); + /* Only forward requests for non-local channels */ + if (!Channel_IsLocal(Channel)) + 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_SetPenalty( Client, 1 ); - return CONNECTED; + IRC_SetPenalty(Client, 1); + return connected; } /* Channel_Mode */ @@ -611,12 +699,10 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - /* Falsche Anzahl Parameter? */ if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); if(( Req->argc == 1 ) && (Req->argv[0][0] )) { - /* AWAY setzen */ Client_SetAway( Client, Req->argv[0] ); Client_ModeAdd( Client, 'a' ); IRC_WriteStrServersPrefix( Client, Client, "MODE %s :+a", Client_ID( Client )); @@ -624,7 +710,6 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req ) } else { - /* AWAY loeschen */ Client_ModeDel( Client, 'a' ); IRC_WriteStrServersPrefix( Client, Client, "MODE %s :-a", Client_ID( Client )); return IRC_WriteStrClient( Client, RPL_UNAWAY_MSG, Client_ID( Client )); @@ -690,23 +775,22 @@ Del_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const static bool -Send_ListChange( char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Mask ) +Send_ListChange(const char *Mode, CLIENT *Prefix, CLIENT *Client, + CHANNEL *Channel, const char *Mask) { - /* Bestaetigung an Client schicken & andere Server sowie Channel-User informieren */ - bool ok; if( Client_Type( Client ) == CLIENT_USER ) { - /* Bestaetigung an Client */ + /* send confirmation to client */ ok = IRC_WriteStrClientPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask ); } else ok = true; - /* an andere Server */ + /* to other servers */ IRC_WriteStrServersPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask ); - /* und lokale User im Channel */ + /* and local users in channel */ IRC_WriteStrChannelPrefix( Client, Channel, Prefix, false, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask ); return ok;