X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-op.c;h=82a78ebf7d712675497a3f5314514aa420620b6f;hp=0297015a8758e9075b608a95e17502fe6e391540;hb=a13bb78b1e7adf7c261ac427341c397ef9a6a1ed;hpb=e8f512bfe70a6c620e09aa221fb7058dc2c6687e diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 0297015a..82a78ebf 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors. + * Copyright (c)2001-2014 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,23 +16,18 @@ * Channel operator commands */ -#include "imp.h" #include #include -#include -#include "defines.h" #include "conn.h" #include "channel.h" +#include "irc-macros.h" #include "irc-write.h" #include "lists.h" #include "log.h" #include "messages.h" #include "parse.h" -#include "exp.h" -#include "irc-op.h" - /* Local functions */ static bool @@ -42,7 +37,8 @@ try_kick(CLIENT *peer, CLIENT* from, const char *nick, const char *channel, CLIENT *target = Client_Search(nick); if (!target) - return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG, Client_ID(from), nick); + return IRC_WriteErrClient(from, ERR_NOSUCHNICK_MSG, + Client_ID(from), nick); Channel_Kick(peer, target, from, channel, reason); return true; @@ -69,9 +65,7 @@ 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_GET_SENDER_OR_RETURN_(from, Req, Client) while (*itemList) { if (*itemList == ',') { @@ -90,15 +84,6 @@ IRC_KICK(CLIENT *Client, REQUEST *Req) 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]; @@ -131,7 +116,7 @@ IRC_KICK(CLIENT *Client, REQUEST *Req) nickCount--; } } else { - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); } return true; @@ -155,51 +140,48 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req) 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_GET_SENDER_OR_RETURN_(from, Req, Client) /* Search user */ target = Client_Search(Req->argv[0]); if (!target || (Client_Type(target) != CLIENT_USER)) - return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG, - Client_ID(Client), Req->argv[0]); + return IRC_WriteErrClient(from, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->argv[0]); chan = Channel_Search(Req->argv[1]); if (chan) { /* Channel exists. Is the user a valid member of the channel? */ if (!Channel_IsMemberOf(chan, from)) - return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, Client_ID(Client), Req->argv[1]); + return IRC_WriteErrClient(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)); + if (Channel_HasMode(chan, 'V')) + return IRC_WriteErrClient(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 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)); + if (Channel_HasMode(chan, 'i')) { + /* Yes. The user issuing the INVITE command must be + * channel owner/admin/operator/halfop! */ + if (!Channel_UserHasMode(chan, from, 'q') && + !Channel_UserHasMode(chan, from, 'a') && + !Channel_UserHasMode(chan, from, 'o') && + !Channel_UserHasMode(chan, from, 'h')) + return IRC_WriteErrClient(from, + ERR_CHANOPRIVSNEEDED_MSG, + Client_ID(from), + Channel_Name(chan)); remember = true; } /* Is the target user already member of the channel? */ if (Channel_IsMemberOf(chan, target)) - return IRC_WriteStrClient(from, ERR_USERONCHANNEL_MSG, - Client_ID(from), Req->argv[0], Req->argv[1]); + return IRC_WriteErrClient(from, ERR_USERONCHANNEL_MSG, + Client_ID(from), + Req->argv[0], Req->argv[1]); /* If the target user is banned on that channel: remember invite */ if (Lists_Check(Channel_GetListBans(chan), target)) @@ -207,7 +189,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req) if (remember) { /* We must remember this invite */ - if (!Channel_AddInvite(chan, Client_Mask(target), true)) + if (!Channel_AddInvite(chan, Client_MaskCloaked(target), + true)) return CONNECTED; } } @@ -216,24 +199,25 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req) 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. + * RFC 2812 states: + * '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%s", Req->argv[0], - colon_if_necessary, Req->argv[1]); + 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], colon_if_necessary, Req->argv[1])) + Client_ID(from), Req->argv[0], + colon_if_necessary, Req->argv[1])) return DISCONNECTED; - if (strchr(Client_Modes(target), 'a') && + if (Client_HasMode(target, 'a') && !IRC_WriteStrClient(from, RPL_AWAY_MSG, Client_ID(from), Client_ID(target), Client_Away(target))) return DISCONNECTED;