/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 by 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
* 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.
- *
- * Channel operator commands
*/
-
#include "portab.h"
+/**
+ * @file
+ * Channel operator commands
+ */
+
#include "imp.h"
#include <assert.h>
#include <string.h>
#include "defines.h"
#include "conn.h"
-#include "client.h"
#include "channel.h"
+#include "irc-macros.h"
#include "irc-write.h"
#include "lists.h"
#include "log.h"
#include "exp.h"
#include "irc-op.h"
+/* Local functions */
static bool
-try_kick(CLIENT* from, const char *nick, const char *channel, const char *reason)
+try_kick(CLIENT *peer, CLIENT* from, const char *nick, const char *channel,
+ const char *reason)
{
CLIENT *target = Client_Search(nick);
if (!target)
return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG, Client_ID(from), nick);
- Channel_Kick(target, from, channel, reason);
+ Channel_Kick(peer, target, from, channel, reason);
return true;
}
+/* Global functions */
+/**
+ * Handler for the IRC command "KICK".
+ *
+ * @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_KICK(CLIENT *Client, REQUEST *Req)
{
assert( Client != NULL );
assert( Req != NULL );
- if ((Req->argc < 2) || (Req->argc > 3))
- return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
- Client_ID(Client), Req->command);
+ _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 2, 3)
+ _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
while (*itemList) {
if (*itemList == ',') {
itemList++;
}
- 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);
-
reason = Req->argc == 3 ? Req->argv[2] : Client_ID(from);
currentNick = Req->argv[1];
currentChannel = Req->argv[0];
if (channelCount == 1) {
while (nickCount > 0) {
- if (!try_kick(from, currentNick, currentChannel, reason))
+ if (!try_kick(Client, from, currentNick,
+ currentChannel, reason))
return false;
while (*currentNick)
}
} else if (channelCount == nickCount) {
while (nickCount > 0) {
- if (!try_kick(from, currentNick, currentChannel, reason))
+ if (!try_kick(Client, from, currentNick,
+ currentChannel, reason))
return false;
while (*currentNick)
return true;
} /* IRC_KICK */
-
+/**
+ * Handler for the IRC command "INVITE".
+ *
+ * @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_INVITE(CLIENT *Client, REQUEST *Req)
{
CHANNEL *chan;
CLIENT *target, *from;
+ const char *colon_if_necessary;
bool remember = false;
assert( Client != NULL );
assert( Req != NULL );
- if (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_ARGC_EQ_OR_RETURN_(Client, Req, 2)
+ _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
/* Search user */
target = Client_Search(Req->argv[0]);
if (!Channel_IsMemberOf(chan, from))
return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, Client_ID(Client), Req->argv[1]);
+ /* Is the channel "invite-disallow"? */
+ if (strchr(Channel_Modes(chan), 'V'))
+ return IRC_WriteStrClient(from, ERR_NOINVITE_MSG,
+ Client_ID(from), Channel_Name(chan));
+
/* Is the channel "invite-only"? */
if (strchr(Channel_Modes(chan), 'i')) {
- /* Yes. The user must be channel operator! */
- if (!strchr(Channel_UserModes(chan, from), 'o'))
+ /* Yes. The user must be channel owner/admin/operator/halfop! */
+ if (!strchr(Channel_UserModes(chan, from), 'q') &&
+ !strchr(Channel_UserModes(chan, from), 'a') &&
+ !strchr(Channel_UserModes(chan, from), 'o') &&
+ !strchr(Channel_UserModes(chan, from), 'h'))
return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG,
Client_ID(from), Channel_Name(chan));
remember = true;
}
}
- LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from), Req->argv[0], Req->argv[1]);
-
+ LogDebug("User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask(from),
+ Req->argv[0], Req->argv[1]);
+
+ /*
+ * RFC 2812 says:
+ * 'There is no requirement that the channel [..] must exist or be a valid channel'
+ * The problem with this is that this allows the "channel" to contain spaces,
+ * in which case we must prefix its name with a colon to make it clear that
+ * it is only a single argument.
+ */
+ colon_if_necessary = strchr(Req->argv[1], ' ') ? ":":"";
/* Inform target client */
- IRC_WriteStrClientPrefix(target, from, "INVITE %s %s", Req->argv[0], Req->argv[1]);
+ IRC_WriteStrClientPrefix(target, from, "INVITE %s %s%s", Req->argv[0],
+ colon_if_necessary, Req->argv[1]);
if (Client_Conn(target) > NONE) {
/* The target user is local, so we have to send the status code */
if (!IRC_WriteStrClientPrefix(from, target, RPL_INVITING_MSG,
- Client_ID(from), Req->argv[0], Req->argv[1]))
+ Client_ID(from), Req->argv[0], colon_if_necessary, Req->argv[1]))
return DISCONNECTED;
if (strchr(Client_Modes(target), 'a') &&
return CONNECTED;
} /* IRC_INVITE */
-
/* -eof- */
projects / ngircd-alex.git / blobdiff