X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-channel.c;h=c683640149cd9b618340d4871d69ed35fcac8632;hp=81a9eb2e89f5f017f7dc9a9007441655df66059d;hb=ae0af66d504125104eca984f92449b2bd78bc192;hpb=5ed7a4ea5755954dc6e25349125963cff7a4355c diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 81a9eb2e..c6836401 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -1,19 +1,21 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex@barton.de) + * Copyright (c)2001-2013 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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. - * - * IRC channel commands */ - #include "portab.h" +/** + * @file + * IRC channel commands + */ + #include "imp.h" #include #include @@ -29,21 +31,27 @@ #include "match.h" #include "messages.h" #include "parse.h" +#include "irc.h" #include "irc-info.h" +#include "irc-macros.h" #include "irc-write.h" #include "conf.h" #include "exp.h" #include "irc-channel.h" - -/* +/** + * Part from all channels. + * * RFC 2812, (3.2.1 Join message Command): - * Note that this message - * accepts a special argument ("0"), which is a special request to leave all - * channels the user is currently a member of. The server will process this - * message as if the user had sent a PART command (See Section 3.2.2) for - * each channel he is a member of. + * Note that this message accepts a special argument ("0"), which is a + * special request to leave all channels the user is currently a member of. + * The server will process this message as if the user had sent a PART + * command (See Section 3.2.2) for each channel he is a member of. + * + * @param client Client that initiated the part request + * @param target Client that should part all joined channels + * @returns CONNECTED or DISCONNECTED */ static bool part_from_all_channels(CLIENT* client, CLIENT *target) @@ -57,23 +65,23 @@ part_from_all_channels(CLIENT* client, CLIENT *target) Channel_Part(target, client, Channel_Name(chan), Client_ID(target)); } return CONNECTED; -} - +} /* part_from_all_channels */ /** * Check weather a local client is allowed to join an already existing * channel or not. - * @param Client Client that sent the JOIN command - * @param chan Channel to check - * @param channame Name of the channel - * @param key Provided channel key (or NULL if none has been provided) - * @return true if client is allowed to join channel, false otherwise + * + * @param Client Client that sent the JOIN command + * @param chan Channel to check + * @param channame Name of the channel + * @param key Provided channel key (or NULL) + * @returns true if client is allowed to join, false otherwise */ static bool join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, const char *key) { - bool is_invited, is_banned; + bool is_invited, is_banned, is_exception; const char *channel_modes; /* Allow IRC operators to overwrite channel limits */ @@ -81,9 +89,10 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, return true; is_banned = Lists_Check(Channel_GetListBans(chan), Client); + is_exception = Lists_Check(Channel_GetListExcepts(chan), Client); is_invited = Lists_Check(Channel_GetListInvites(chan), Client); - if (is_banned && !is_invited) { + if (is_banned && !is_invited && !is_exception) { /* Client is banned from channel (and not on invite list) */ IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame); @@ -122,10 +131,30 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, return false; } - return true; -} + if (strchr(channel_modes, 'O') && !Client_OperByMe(Client)) { + /* Only IRC operators are allowed! */ + IRC_WriteStrClient(Client, ERR_OPONLYCHANNEL_MSG, + Client_ID(Client), channame); + return false; + } + + if (strchr(channel_modes, 'R') && !strchr(Client_Modes(Client), 'R')) { + /* Only registered users are allowed! */ + IRC_WriteStrClient(Client, ERR_REGONLYCHANNEL_MSG, + Client_ID(Client), channame); + return false; + } + return true; +} /* join_allowed */ +/** + * Set user channel modes. + * + * @param chan Channel + * @param target User to set modes for + * @param flags Channel modes to add + */ static void join_set_channelmodes(CHANNEL *chan, CLIENT *target, const char *flags) { @@ -136,12 +165,26 @@ join_set_channelmodes(CHANNEL *chan, CLIENT *target, const char *flags) } } - /* If channel persistent and client is ircop: make client chanop */ - if (strchr(Channel_Modes(chan), 'P') && strchr(Client_Modes(target), 'o')) + /* If the channel is persistent (+P) and client is an IRC op: + * make client chanop, if not disabled in configuration. */ + if (strchr(Channel_Modes(chan), 'P') && Conf_OperChanPAutoOp + && strchr(Client_Modes(target), 'o')) Channel_UserModeAdd(chan, target, 'o'); -} - +} /* join_set_channelmodes */ +/** + * Forward JOIN command to a specific server + * + * This function diffentiates between servers using RFC 2813 mode that + * support the JOIN command with appended ASCII 7 character and channel + * modes, and servers using RFC 1459 protocol which require separate JOIN + * and MODE commands. + * + * @param To Forward JOIN (and MODE) command to this peer server + * @param Prefix Client used to prefix the genrated commands + * @param Data Parameters of JOIN command to forward, probably + * containing channel modes separated by ASCII 7. + */ static void cb_join_forward(CLIENT *To, CLIENT *Prefix, void *Data) { @@ -165,13 +208,25 @@ cb_join_forward(CLIENT *To, CLIENT *Prefix, void *Data) Client_ID(Prefix)); } /* cb_join_forward */ - +/** + * Forward JOIN command to all servers + * + * This function calls cb_join_forward(), which differentiates between + * protocol implementations (e.g. RFC 2812, RFC 1459). + * + * @param Client Client used to prefix the genrated commands + * @param target Forward JOIN (and MODE) command to this peer server + * @param chan Channel structure + * @param channame Channel name + */ static void join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan, const char *channame) { char modes[CHANNEL_MODE_LEN], str[COMMAND_LEN]; + /* RFC 2813, 4.2.1: channel modes are separated from the channel + * name with ASCII 7, if any, and not spaces: */ strlcpy(&modes[1], Channel_UserModes(chan, target), sizeof(modes) - 1); if (modes[1]) modes[0] = 0x7; @@ -189,7 +244,7 @@ join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan, IRC_WriteStrChannelPrefix(Client, chan, target, false, "JOIN :%s", channame); - /* syncronize channel modes */ + /* synchronize channel modes */ if (modes[1]) { IRC_WriteStrChannelPrefix(Client, chan, target, false, "MODE %s +%s %s", channame, @@ -197,7 +252,14 @@ join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan, } } /* join_forward */ - +/** + * Aknowledge user JOIN request and send "channel info" numerics. + * + * @param Client Client used to prefix the genrated commands + * @param target Forward commands/numerics to this user + * @param chan Channel structure + * @param channame Channel name + */ static bool join_send_topic(CLIENT *Client, CLIENT *target, CHANNEL *chan, const char *channame) @@ -228,10 +290,17 @@ join_send_topic(CLIENT *Client, CLIENT *target, CHANNEL *chan, /* send list of channel members to client */ if (!IRC_Send_NAMES(Client, chan)) return false; - return IRC_WriteStrClient(Client, RPL_ENDOFNAMES_MSG, Client_ID(Client), Channel_Name(chan)); -} - + return IRC_WriteStrClient(Client, RPL_ENDOFNAMES_MSG, Client_ID(Client), + Channel_Name(chan)); +} /* join_send_topic */ +/** + * Handler for the IRC "JOIN" command. + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_JOIN( CLIENT *Client, REQUEST *Req ) { @@ -239,22 +308,12 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) CLIENT *target; CHANNEL *chan; - assert( Client != NULL ); - assert( Req != NULL ); - - /* Bad number of arguments? */ - if (Req->argc < 1 || Req->argc > 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + assert (Client != NULL); + assert (Req != NULL); - /* Who is the sender? */ - if (Client_Type(Client) == CLIENT_SERVER) - target = Client_Search(Req->prefix); - else - target = Client; - - if (!target) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix); + _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) + _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) + _IRC_GET_SENDER_OR_RETURN_(target, Req, Client) /* Is argument "0"? */ if (Req->argc == 1 && !strncmp("0", Req->argv[0], 2)) @@ -286,24 +345,35 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) chan = Channel_Search(channame); if (!chan && Conf_PredefChannelsOnly) { - /* channel must be created, but server does not allow this */ - IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame); - break; + /* channel must be created, but forbidden by config */ + IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG, + Client_ID(Client), channame); + goto join_next; } /* Local client? */ if (Client_Type(Client) == CLIENT_USER) { + if (chan) { + /* Already existing channel: already member? */ + if (Channel_IsMemberOf(chan, Client)) + goto join_next; + } + /* Test if the user has reached the channel limit */ if ((Conf_MaxJoins > 0) && - (Channel_CountForUser(Client) >= Conf_MaxJoins)) - return IRC_WriteStrClient(Client, + (Channel_CountForUser(Client) >= Conf_MaxJoins)) { + if (!IRC_WriteStrClient(Client, ERR_TOOMANYCHANNELS_MSG, - Client_ID(Client), channame); + Client_ID(Client), channame)) + return DISCONNECTED; + goto join_next; + } + if (chan) { /* Already existing channel: check if the * client is allowed to join */ if (!join_allowed(Client, chan, channame, key)) - break; + goto join_next; } else { /* New channel: first user will become channel * operator unless this is a modeless channel */ @@ -326,7 +396,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) /* Join channel (and create channel if it doesn't exist) */ if (!Channel_Join(target, channame)) - break; + goto join_next; if (!chan) { /* channel is new; it has been created above */ chan = Channel_Search(channame); @@ -345,6 +415,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) if (!join_send_topic(Client, target, chan, channame)) break; /* write error */ + join_next: /* next channel? */ channame = strtok_r(NULL, ",", &lastchan); if (channame && key) @@ -353,9 +424,12 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) return CONNECTED; } /* IRC_JOIN */ - /** * Handler for the IRC "PART" command. + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. */ GLOBAL bool IRC_PART(CLIENT * Client, REQUEST * Req) @@ -366,18 +440,9 @@ IRC_PART(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - if (Req->argc < 1 || Req->argc > 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); - - /* Get the sender */ - if (Client_Type(Client) == CLIENT_SERVER) - target = Client_Search(Req->prefix); - else - target = Client; - if (!target) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, - Client_ID(Client), Req->prefix); + _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) + _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) + _IRC_GET_SENDER_OR_RETURN_(target, Req, Client) /* Loop over all the given channel names */ chan = strtok(Req->argv[0], ","); @@ -400,42 +465,46 @@ IRC_PART(CLIENT * Client, REQUEST * Req) return CONNECTED; } /* IRC_PART */ - +/** + * Handler for the IRC "TOPIC" command. + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_TOPIC( CLIENT *Client, REQUEST *Req ) { CHANNEL *chan; CLIENT *from; char *topic; - bool onchannel, topicok, use_servermode, r; + bool r, topic_power; assert( Client != NULL ); assert( Req != NULL ); - if (Req->argc < 1 || Req->argc > 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); - - if (Client_Type(Client) == CLIENT_SERVER) - from = Client_Search(Req->prefix); - else - from = Client; + IRC_SetPenalty(Client, 1); - if (!from) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, - Client_ID(Client), Req->prefix); + _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) + _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) + _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) chan = Channel_Search(Req->argv[0]); if (!chan) return IRC_WriteStrClient(from, ERR_NOSUCHCHANNEL_MSG, Client_ID(from), Req->argv[0]); - Channel_CheckAdminRights(chan, Client, from, - &onchannel, &topicok, &use_servermode); - - if (!onchannel && !topicok) - return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, - Client_ID(from), Req->argv[0]); + /* Only remote servers and channel members are allowed to change the + * channel topic, and IRC opreators when the Conf_OperCanMode option + * is set in the server configuration. */ + if (Client_Type(Client) != CLIENT_SERVER) { + topic_power = Client_HasMode(from, 'o'); + if (!Channel_IsMemberOf(chan, from) + && !(Conf_OperCanMode && topic_power)) + return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, + Client_ID(from), Req->argv[0]); + } else + topic_power = true; if (Req->argc == 1) { /* Request actual topic */ @@ -445,6 +514,8 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) Client_ID(Client), Channel_Name(chan), topic); #ifndef STRICT_RFC + if (!r) + return r; r = IRC_WriteStrClient(from, RPL_TOPICSETBY_MSG, Client_ID(Client), Channel_Name(chan), @@ -460,8 +531,12 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) } if (strchr(Channel_Modes(chan), 't')) { - /* Topic Lock. Is the user a channel or IRC operator? */ - if (!topicok) + /* Topic Lock. Is the user a channel op or IRC operator? */ + if(!topic_power && + !strchr(Channel_UserModes(chan, from), 'h') && + !strchr(Channel_UserModes(chan, from), 'o') && + !strchr(Channel_UserModes(chan, from), 'a') && + !strchr(Channel_UserModes(chan, from), 'q')) return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(from), Channel_Name(chan)); @@ -473,7 +548,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) Client_TypeText(from), Client_Mask(from), Channel_Name(chan), Req->argv[1][0] ? Req->argv[1] : ""); - if (use_servermode) + if (Conf_OperServerMode) from = Client_ThisServer(); /* Update channel and forward new topic to other servers */ @@ -490,11 +565,12 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) return CONNECTED; } /* IRC_TOPIC */ - /** * Handler for the IRC "LIST" command. - * This implementation handles the local case as well as the forwarding of the - * LIST command to other servers in the IRC network. + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. */ GLOBAL bool IRC_LIST( CLIENT *Client, REQUEST *Req ) @@ -502,82 +578,84 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) char *pattern; CHANNEL *chan; CLIENT *from, *target; + int count = 0; - assert( Client != NULL ); - assert( Req != NULL ); + assert(Client != NULL); + assert(Req != NULL); - /* Bad number of prameters? */ - if( Req->argc > 2 ) - return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID( Client ), Req->command ); + IRC_SetPenalty(Client, 2); - if( Req->argc > 0 ) - pattern = strtok( Req->argv[0], "," ); - else - pattern = "*"; + _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) + _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) - /* Get sender from prefix, if any */ - if( Client_Type( Client ) == CLIENT_SERVER ) - from = Client_Search( Req->prefix ); + if (Req->argc > 0) + pattern = strtok(Req->argv[0], ","); else - from = Client; - - if( ! from ) - return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, - Client_ID( Client ), Req->prefix ); + pattern = "*"; - if( Req->argc == 2 ) - { + if (Req->argc == 2) { /* Forward to other server? */ - target = Client_Search( Req->argv[1] ); - if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) - return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, - Client_ID( Client ), Req->argv[1] ); + target = Client_Search(Req->argv[1]); + if (! target || Client_Type(target) != CLIENT_SERVER) + return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG, + Client_ID(Client), + Req->argv[1]); - if( target != Client_ThisServer( )) - { + if (target != Client_ThisServer()) { /* Target is indeed an other server, forward it! */ - return IRC_WriteStrClientPrefix( target, from, - "LIST %s :%s", Client_ID( from ), - Req->argv[1] ); + return IRC_WriteStrClientPrefix(target, from, + "LIST %s :%s", + Req->argv[0], + Req->argv[1]); } } - while( pattern ) - { + while (pattern) { /* Loop through all the channels */ - chan = Channel_First( ); - while( chan ) - { + if (Req->argc > 0) + ngt_LowerStr(pattern); + chan = Channel_First(); + while (chan) { /* Check search pattern */ - if( Match( pattern, Channel_Name( chan ))) - { + if (MatchCaseInsensitive(pattern, Channel_Name(chan))) { /* Gotcha! */ - if( ! strchr( Channel_Modes( chan ), 's' ) || - Channel_IsMemberOf( chan, from )) - { - if( ! IRC_WriteStrClient( from, - RPL_LIST_MSG, Client_ID( from ), - Channel_Name( chan ), - Channel_MemberCount( chan ), - Channel_Topic( chan ))) + if (!strchr(Channel_Modes(chan), 's') + || Channel_IsMemberOf(chan, from) + || (!Conf_MorePrivacy && Client_OperByMe(Client))) { + if ((Conf_MaxListSize > 0) + && IRC_CheckListTooBig(from, count, + Conf_MaxListSize, + "LIST")) + break; + if (!IRC_WriteStrClient(from, + RPL_LIST_MSG, Client_ID(from), + Channel_Name(chan), + Channel_MemberCount(chan), + Channel_Topic( chan ))) return DISCONNECTED; + count++; } } - chan = Channel_Next( chan ); + chan = Channel_Next(chan); } /* Get next name ... */ - if( Req->argc > 0 ) - pattern = strtok( NULL, "," ); + if(Req->argc > 0) + pattern = strtok(NULL, ","); else pattern = NULL; } - return IRC_WriteStrClient( from, RPL_LISTEND_MSG, Client_ID( from )); + return IRC_WriteStrClient(from, RPL_LISTEND_MSG, Client_ID(from)); } /* IRC_LIST */ - +/** + * Handler for the IRC+ "CHANINFO" command. + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) { @@ -590,71 +668,76 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) assert( Req != NULL ); /* Bad number of parameters? */ - if(( Req->argc < 2 ) || ( Req->argc == 4 ) || ( Req->argc > 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); /* Compatibility kludge */ - if( Req->argc == 5 ) arg_topic = 4; - else if( Req->argc == 3 ) arg_topic = 2; - else arg_topic = -1; + if (Req->argc == 5) + arg_topic = 4; + else if(Req->argc == 3) + arg_topic = 2; + else + arg_topic = -1; - /* Search origin */ - from = Client_Search( Req->prefix ); - if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) /* Search or create channel */ chan = Channel_Search( Req->argv[0] ); - if( ! chan ) chan = Channel_Create( Req->argv[0] ); - if( ! chan ) return CONNECTED; - - if( Req->argv[1][0] == '+' ) - { - ptr = Channel_Modes( chan ); - if( ! *ptr ) - { - /* OK, this channel doesn't have modes jet, set the received ones: */ - Channel_SetModes( chan, &Req->argv[1][1] ); - - if( Req->argc == 5 ) - { - if( strchr( Channel_Modes( chan ), 'k' )) Channel_SetKey( chan, Req->argv[2] ); - if( strchr( Channel_Modes( chan ), 'l' )) Channel_SetMaxUsers( chan, atol( Req->argv[3] )); - } - else - { + if (!chan) + chan = Channel_Create( Req->argv[0] ); + if (!chan) + return CONNECTED; + + if (Req->argv[1][0] == '+') { + ptr = Channel_Modes(chan); + if (!*ptr) { + /* OK, this channel doesn't have modes jet, + * set the received ones: */ + Channel_SetModes(chan, &Req->argv[1][1]); + + if(Req->argc == 5) { + if(strchr(Channel_Modes(chan), 'k')) + Channel_SetKey(chan, Req->argv[2]); + if(strchr(Channel_Modes(chan), 'l')) + Channel_SetMaxUsers(chan, atol(Req->argv[3])); + } else { /* Delete modes which we never want to inherit */ - Channel_ModeDel( chan, 'l' ); - Channel_ModeDel( chan, 'k' ); + Channel_ModeDel(chan, 'l'); + Channel_ModeDel(chan, 'k'); } - strcpy( modes_add, "" ); - ptr = Channel_Modes( chan ); - while( *ptr ) - { - if( *ptr == 'l' ) - { - snprintf( l, sizeof( l ), " %lu", Channel_MaxUsers( chan )); - strlcat( modes_add, l, sizeof( modes_add )); + strcpy(modes_add, ""); + ptr = Channel_Modes(chan); + while (*ptr) { + if (*ptr == 'l') { + snprintf(l, sizeof(l), " %lu", + Channel_MaxUsers(chan)); + strlcat(modes_add, l, + sizeof(modes_add)); } - if( *ptr == 'k' ) - { - strlcat( modes_add, " ", sizeof( modes_add )); - strlcat( modes_add, Channel_Key( chan ), sizeof( modes_add )); + if (*ptr == 'k') { + strlcat(modes_add, " ", + sizeof(modes_add)); + strlcat(modes_add, Channel_Key(chan), + sizeof(modes_add)); } ptr++; } /* Inform members of this channel */ - IRC_WriteStrChannelPrefix( Client, chan, from, false, "MODE %s +%s%s", Req->argv[0], Channel_Modes( chan ), modes_add ); + IRC_WriteStrChannelPrefix(Client, chan, from, false, + "MODE %s +%s%s", Req->argv[0], + Channel_Modes(chan), modes_add); } } - else Log( LOG_WARNING, "CHANINFO: invalid MODE format ignored!" ); + else + Log(LOG_WARNING, "CHANINFO: invalid MODE format ignored!"); - if( arg_topic > 0 ) - { + if (arg_topic > 0) { /* We got a topic */ ptr = Channel_Topic( chan ); - if(( ! *ptr ) && ( Req->argv[arg_topic][0] )) - { + if (!*ptr && Req->argv[arg_topic][0]) { /* OK, there is no topic jet */ Channel_SetTopic(chan, Client, Req->argv[arg_topic]); IRC_WriteStrChannelPrefix(Client, chan, from, false, @@ -663,12 +746,23 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) } /* Forward CHANINFO to other serevrs */ - if( Req->argc == 5 ) IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2], Req->argv[3], Req->argv[4] ); - else if( Req->argc == 3 ) IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s :%s", Req->argv[0], Req->argv[1], Req->argv[2] ); - else IRC_WriteStrServersPrefixFlag( Client, from, 'C', "CHANINFO %s %s", Req->argv[0], Req->argv[1] ); + if (Req->argc == 5) + IRC_WriteStrServersPrefixFlag(Client, from, 'C', + "CHANINFO %s %s %s %s :%s", + Req->argv[0], Req->argv[1], + Req->argv[2], Req->argv[3], + Req->argv[4]); + else if (Req->argc == 3) + IRC_WriteStrServersPrefixFlag(Client, from, 'C', + "CHANINFO %s %s :%s", + Req->argv[0], Req->argv[1], + Req->argv[2]); + else + IRC_WriteStrServersPrefixFlag(Client, from, 'C', + "CHANINFO %s %s", + Req->argv[0], Req->argv[1]); return CONNECTED; } /* IRC_CHANINFO */ - /* -eof- */