/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2013 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
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;
}
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;
}
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 (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 (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 (Channel_HasMode(chan, '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 (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;
}
assert (Client != NULL);
assert (Req != NULL);
- _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"? */
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) {
}
chan = Channel_Search(channame);
- 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);
- goto join_next;
- }
/* Local client? */
if (Client_Type(Client) == CLIENT_USER) {
/* 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)) {
- if (!IRC_WriteStrClient(Client,
+ if (!IRC_WriteErrClient(Client,
ERR_TOOMANYCHANNELS_MSG,
Client_ID(Client), channame))
return DISCONNECTED;
assert(Client != NULL);
assert(Req != NULL);
- _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], ",");
/* 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) {
IRC_SetPenalty(Client, 1);
- _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,
+ return IRC_WriteErrClient(from, ERR_NOSUCHCHANNEL_MSG,
Client_ID(from), Req->argv[0]);
/* Only remote servers and channel members are allowed to change the
topic_power = Client_HasMode(from, 'o');
if (!Channel_IsMemberOf(chan, from)
&& !(Conf_OperCanMode && topic_power))
- return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG,
+ return IRC_WriteErrClient(from, ERR_NOTONCHANNEL_MSG,
Client_ID(from), Req->argv[0]);
} else
topic_power = true;
!Channel_UserHasMode(chan, from, 'o') &&
!Channel_UserHasMode(chan, from, 'a') &&
!Channel_UserHasMode(chan, from, 'q'))
- return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
+ return IRC_WriteErrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
Client_ID(from),
Channel_Name(chan));
}
IRC_SetPenalty(Client, 2);
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
if (Req->argc > 0)
/* 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]);
/* Gotcha! */
if (!Channel_HasMode(chan, 's')
|| Channel_IsMemberOf(chan, from)
- || (!Conf_MorePrivacy && Client_OperByMe(Client))) {
+ || (!Conf_MorePrivacy
+ && Client_HasMode(Client, 'o')
+ && Client_Conn(Client) > NONE))
+ {
if ((Conf_MaxListSize > 0)
&& IRC_CheckListTooBig(from, count,
Conf_MaxListSize,
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;
/* 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 */
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]);
}
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 */
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,
projects / ngircd-alex.git / blobdiff