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=c7a3e1b31e7f8b81e79f8d8854446965fb0f3351;hp=94a8a4d723db07661fdcff9bb794dffe9654f6f7;hb=f8f7f83f5a2228bb9deeb8324be015cd76b84ced;hpb=fdfc27265ef27e445de89217d08f9a57219355df diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 94a8a4d7..c7a3e1b3 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex@barton.de) + * Copyright (c)2001-2015 Alexander Barton (alex@barton.de) and Contributors. * * 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 @@ -16,13 +16,11 @@ * IRC channel commands */ -#include "imp.h" #include #include #include #include -#include "defines.h" #include "conn.h" #include "channel.h" #include "conn-func.h" @@ -31,14 +29,14 @@ #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. * @@ -66,7 +64,6 @@ part_from_all_channels(CLIENT* client, CLIENT *target) return CONNECTED; } /* part_from_all_channels */ - /** * Check weather a local client is allowed to join an already existing * channel or not. @@ -81,27 +78,26 @@ static bool join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, const char *key) { - bool is_invited, is_banned; - const char *channel_modes; + bool is_invited, is_banned, is_exception; /* Allow IRC operators to overwrite channel limits */ - if (strchr(Client_Modes(Client), 'o')) + if (Client_HasMode(Client, 'o')) 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, + IRC_WriteErrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame); return false; } - channel_modes = Channel_Modes(chan); - if (strchr(channel_modes, 'i') && !is_invited) { + if (Channel_HasMode(chan, 'i') && !is_invited) { /* Channel is "invite-only" and client is not on invite list */ - IRC_WriteStrClient(Client, ERR_INVITEONLYCHAN_MSG, + IRC_WriteErrClient(Client, ERR_INVITEONLYCHAN_MSG, Client_ID(Client), channame); return false; } @@ -109,37 +105,37 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, if (!Channel_CheckKey(chan, Client, key ? key : "")) { /* Channel is protected by a channel key and the client * didn't specify the correct one */ - IRC_WriteStrClient(Client, ERR_BADCHANNELKEY_MSG, + IRC_WriteErrClient(Client, ERR_BADCHANNELKEY_MSG, Client_ID(Client), channame); return false; } - if (strchr(channel_modes, 'l') && + if (Channel_HasMode(chan, 'l') && (Channel_MaxUsers(chan) <= Channel_MemberCount(chan))) { /* There are more clints joined to this channel than allowed */ - IRC_WriteStrClient(Client, ERR_CHANNELISFULL_MSG, + IRC_WriteErrClient(Client, ERR_CHANNELISFULL_MSG, Client_ID(Client), channame); return false; } - if (strchr(channel_modes, 'z') && !Conn_UsesSSL(Client_Conn(Client))) { + if (Channel_HasMode(chan, 'z') && !Conn_UsesSSL(Client_Conn(Client))) { /* Only "secure" clients are allowed, but clients doesn't * use SSL encryption */ - IRC_WriteStrClient(Client, ERR_SECURECHANNEL_MSG, + IRC_WriteErrClient(Client, ERR_SECURECHANNEL_MSG, Client_ID(Client), channame); return false; } - if (strchr(channel_modes, 'O') && !Client_OperByMe(Client)) { + if (Channel_HasMode(chan, 'O') && !Client_HasMode(Client, 'o')) { /* Only IRC operators are allowed! */ - IRC_WriteStrClient(Client, ERR_OPONLYCHANNEL_MSG, + IRC_WriteErrClient(Client, ERR_OPONLYCHANNEL_MSG, Client_ID(Client), channame); return false; } - if (strchr(channel_modes, 'R') && !strchr(Client_Modes(Client), 'R')) { + if (Channel_HasMode(chan, 'R') && !Client_HasMode(Client, 'R')) { /* Only registered users are allowed! */ - IRC_WriteStrClient(Client, ERR_REGONLYCHANNEL_MSG, + IRC_WriteErrClient(Client, ERR_REGONLYCHANNEL_MSG, Client_ID(Client), channame); return false; } @@ -147,7 +143,6 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, return true; } /* join_allowed */ - /** * Set user channel modes. * @@ -165,16 +160,17 @@ 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 (Channel_HasMode(chan, 'P') && Conf_OperChanPAutoOp + && Client_HasMode(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 + * This function differentiates 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. @@ -207,7 +203,6 @@ cb_join_forward(CLIENT *To, CLIENT *Prefix, void *Data) Client_ID(Prefix)); } /* cb_join_forward */ - /** * Forward JOIN command to all servers * @@ -252,9 +247,8 @@ join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan, } } /* join_forward */ - /** - * Aknowledge user JOIN request and send "channel info" numerics. + * Acknowledge 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 @@ -295,15 +289,12 @@ join_send_topic(CLIENT *Client, CLIENT *target, CHANNEL *chan, Channel_Name(chan)); } /* join_send_topic */ - /** * Handler for the IRC "JOIN" command. * - * See RFC 2812, 3.2.1 "Join message"; RFC 2813, 4.2.1 "Join message". - * - * @param Client The client from which this command has been received - * @param Req Request structure with prefix and all parameters - * @returns CONNECTED or DISCONNECTED + * @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 ) @@ -315,20 +306,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) 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); - - /* 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_GET_SENDER_OR_RETURN_(target, Req, Client) /* Is argument "0"? */ if (Req->argc == 1 && !strncmp("0", Req->argv[0], 2)) @@ -342,8 +320,8 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) channame = strtok_r(channame, ",", &lastchan); /* Make sure that "channame" is not the empty string ("JOIN :") */ - if (! channame) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + if (!channame) + return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); while (channame) { @@ -359,26 +337,39 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) } chan = Channel_Search(channame); - if (!chan && Conf_PredefChannelsOnly) { - /* channel must be created, but forbidden by config */ - IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, - Client_ID(Client), channame); - break; - } /* Local client? */ if (Client_Type(Client) == CLIENT_USER) { + if (chan) { + /* Already existing channel: already member? */ + if (Channel_IsMemberOf(chan, Client)) + goto join_next; + } else { + /* Channel must be created */ + if (!strchr(Conf_AllowedChannelTypes, channame[0])) { + /* ... but channel type is not allowed! */ + IRC_WriteErrClient(Client, + ERR_NOSUCHCHANNEL_MSG, + Client_ID(Client), channame); + 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_WriteErrClient(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 */ @@ -429,15 +420,12 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) return CONNECTED; } /* IRC_JOIN */ - /** * Handler for the IRC "PART" command. * - * See RFC 2812, 3.2.2: "Part message". - * - * @param Client The client from which this command has been received - * @param Req Request structure with prefix and all parameters - * @returns CONNECTED or DISCONNECTED + * @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) @@ -448,30 +436,19 @@ 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_GET_SENDER_OR_RETURN_(target, Req, Client) /* Loop over all the given channel names */ chan = strtok(Req->argv[0], ","); /* Make sure that "chan" is not the empty string ("PART :") */ - if (! chan) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + if (!chan) + return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); while (chan) { Channel_Part(target, Client, chan, - Req->argc > 1 ? Req->argv[1] : Client_ID(target)); + Req->argc > 1 ? Req->argv[1] : ""); chan = strtok(NULL, ","); } @@ -482,15 +459,12 @@ IRC_PART(CLIENT * Client, REQUEST * Req) return CONNECTED; } /* IRC_PART */ - /** * Handler for the IRC "TOPIC" command. * - * See RFC 2812, 3.2.4 "Topic message". - * - * @param Client The client from which this command has been received - * @param Req Request structure with prefix and all parameters - * @returns CONNECTED or DISCONNECTED + * @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 ) @@ -498,35 +472,29 @@ 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; - - if (!from) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, - Client_ID(Client), Req->prefix); + _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) chan = Channel_Search(Req->argv[0]); if (!chan) - return IRC_WriteStrClient(from, ERR_NOSUCHCHANNEL_MSG, + return IRC_WriteErrClient(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 operators 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_WriteErrClient(from, ERR_NOTONCHANNEL_MSG, + Client_ID(from), Req->argv[0]); + } else + topic_power = true; if (Req->argc == 1) { /* Request actual topic */ @@ -552,10 +520,14 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) Channel_Name(chan)); } - if (strchr(Channel_Modes(chan), 't')) { - /* Topic Lock. Is the user a channel or IRC operator? */ - if (!topicok) - return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG, + if (Channel_HasMode(chan, 't')) { + /* Topic Lock. Is the user a channel op or IRC operator? */ + if(!topic_power && + !Channel_UserHasMode(chan, from, 'h') && + !Channel_UserHasMode(chan, from, 'o') && + !Channel_UserHasMode(chan, from, 'a') && + !Channel_UserHasMode(chan, from, 'q')) + return IRC_WriteErrClient(from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(from), Channel_Name(chan)); } @@ -566,7 +538,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 */ @@ -583,15 +555,9 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) return CONNECTED; } /* IRC_TOPIC */ - /** * Handler for the IRC "LIST" command. * - * See RFC 2812, 3.2.6 "List message". - * - * 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. @@ -602,35 +568,23 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) char *pattern; CHANNEL *chan; CLIENT *from, *target; + int count = 0; 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_GET_SENDER_OR_RETURN_(from, Req, Client) if (Req->argc > 0) pattern = strtok(Req->argv[0], ","); else pattern = "*"; - /* Get sender from prefix, if any */ - if (Client_Type(Client) == CLIENT_SERVER) - from = Client_Search(Req->prefix); - else - from = Client; - - if (!from) - return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG, - Client_ID(Client), Req->prefix); - 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, + return IRC_WriteErrClient(from, ERR_NOSUCHSERVER_MSG, Client_ID(Client), Req->argv[1]); @@ -638,7 +592,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) /* Target is indeed an other server, forward it! */ return IRC_WriteStrClientPrefix(target, from, "LIST %s :%s", - Client_ID(from), + Req->argv[0], Req->argv[1]); } } @@ -652,14 +606,22 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) /* Check search pattern */ if (MatchCaseInsensitive(pattern, Channel_Name(chan))) { /* Gotcha! */ - if (!strchr(Channel_Modes(chan), 's') - || Channel_IsMemberOf(chan, from)) { + if (!Channel_HasMode(chan, 's') + || Channel_IsMemberOf(chan, from) + || Client_HasMode(from, 'o')) + { + 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); @@ -675,21 +637,17 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) return IRC_WriteStrClient(from, RPL_LISTEND_MSG, Client_ID(from)); } /* IRC_LIST */ - /** - * Handler for the IRC+ command "CHANINFO". + * Handler for the IRC+ "CHANINFO" command. * - * See doc/Protocol.txt, section II.3: - * "Exchange channel-modes, topics, and persistent channels". - * - * @param Client The client from which this command has been received - * @param Req Request structure with prefix and all parameters - * @returns CONNECTED or DISCONNECTED + * @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 ) { - char modes_add[COMMAND_LEN], l[16], *ptr; + char modes_add[COMMAND_LEN], l[16]; CLIENT *from; CHANNEL *chan; int arg_topic; @@ -699,72 +657,67 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) /* Bad number of parameters? */ if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + return IRC_WriteErrClient(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] == '+') { + if (!*Channel_Modes(chan)) { + /* OK, this channel doesn't have modes yet, + * set the received ones: */ + Channel_SetModes(chan, &Req->argv[1][1]); + + if(Req->argc == 5) { + if(Channel_HasMode(chan, 'k')) + Channel_SetKey(chan, Req->argv[2]); + if(Channel_HasMode(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 )); - } - if( *ptr == 'k' ) - { - strlcat( modes_add, " ", sizeof( modes_add )); - strlcat( modes_add, Channel_Key( chan ), sizeof( modes_add )); - } - ptr++; + strcpy(modes_add, ""); + if (Channel_HasMode(chan, 'l')) { + snprintf(l, sizeof(l), " %lu", + Channel_MaxUsers(chan)); + strlcat(modes_add, l, sizeof(modes_add)); + } + if (Channel_HasMode(chan, 'k')) { + strlcat(modes_add, " ", sizeof(modes_add)); + strlcat(modes_add, Channel_Key(chan), + sizeof(modes_add)); } /* 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 (!*Channel_Topic(chan) && 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, @@ -772,13 +725,24 @@ 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] ); + /* Forward CHANINFO to other servers */ + 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- */