X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-channel.c;h=6f20b03fb9297e006f897017d429f10a9328f880;hb=8f5cbe51a79c786be30ebc93466988cf67a825e1;hp=c683640149cd9b618340d4871d69ed35fcac8632;hpb=69ce65bacb0155be5fb9159a3dfc5c8e3390cc0d;p=ngircd-alex.git diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index c6836401..6f20b03f 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -82,10 +82,9 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, const char *key) { bool is_invited, is_banned, is_exception; - const char *channel_modes; /* 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); @@ -99,8 +98,7 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *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, Client_ID(Client), channame); @@ -115,7 +113,7 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *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, @@ -123,7 +121,7 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *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, @@ -131,14 +129,14 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, return false; } - if (strchr(channel_modes, 'O') && !Client_OperByMe(Client)) { + if (Channel_HasMode(chan, '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')) { + if (Channel_HasMode(chan, 'R') && !Client_HasMode(Client, 'R')) { /* Only registered users are allowed! */ IRC_WriteStrClient(Client, ERR_REGONLYCHANNEL_MSG, Client_ID(Client), channame); @@ -167,15 +165,15 @@ join_set_channelmodes(CHANNEL *chan, CLIENT *target, const char *flags) /* 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')) + 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. @@ -253,7 +251,7 @@ 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 @@ -344,7 +342,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) } chan = Channel_Search(channame); - if (!chan && Conf_PredefChannelsOnly) { + if (!chan && !strchr(Conf_AllowedChannelTypes, channame[0])) { /* channel must be created, but forbidden by config */ IRC_WriteStrClient(Client, ERR_NOSUCHCHANNEL_MSG, Client_ID(Client), channame); @@ -495,7 +493,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) 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 + * 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'); @@ -530,13 +528,13 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) Channel_Name(chan)); } - if (strchr(Channel_Modes(chan), 't')) { + if (Channel_HasMode(chan, 't')) { /* 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')) + !Channel_UserHasMode(chan, from, 'h') && + !Channel_UserHasMode(chan, from, 'o') && + !Channel_UserHasMode(chan, from, 'a') && + !Channel_UserHasMode(chan, from, 'q')) return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(from), Channel_Name(chan)); @@ -619,7 +617,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) /* Check search pattern */ if (MatchCaseInsensitive(pattern, Channel_Name(chan))) { /* Gotcha! */ - if (!strchr(Channel_Modes(chan), 's') + if (!Channel_HasMode(chan, 's') || Channel_IsMemberOf(chan, from) || (!Conf_MorePrivacy && Client_OperByMe(Client))) { if ((Conf_MaxListSize > 0) @@ -659,7 +657,7 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) 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; @@ -690,16 +688,15 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) return CONNECTED; if (Req->argv[1][0] == '+') { - ptr = Channel_Modes(chan); - if (!*ptr) { - /* OK, this channel doesn't have modes jet, + 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(strchr(Channel_Modes(chan), 'k')) + if(Channel_HasMode(chan, 'k')) Channel_SetKey(chan, Req->argv[2]); - if(strchr(Channel_Modes(chan), 'l')) + if(Channel_HasMode(chan, 'l')) Channel_SetMaxUsers(chan, atol(Req->argv[3])); } else { /* Delete modes which we never want to inherit */ @@ -708,21 +705,15 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) } 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++; + 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 */ @@ -736,8 +727,7 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) 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, @@ -745,7 +735,7 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) } } - /* Forward CHANINFO to other serevrs */ + /* Forward CHANINFO to other servers */ if (Req->argc == 5) IRC_WriteStrServersPrefixFlag(Client, from, 'C', "CHANINFO %s %s %s %s :%s",