From: pk910 Date: Thu, 5 Jul 2012 19:35:09 +0000 (+0200) Subject: added UNINVITE command X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=2fec862674d5b33145529ab0397640a2e4d516c7 added UNINVITE command --- diff --git a/include/handlers.h b/include/handlers.h index 34d9be0..2cb2954 100644 --- a/include/handlers.h +++ b/include/handlers.h @@ -134,6 +134,7 @@ extern int m_svsjoin(struct Client*, struct Client*, int, char*[]); extern int m_time(struct Client*, struct Client*, int, char*[]); extern int m_topic(struct Client*, struct Client*, int, char*[]); extern int m_trace(struct Client*, struct Client*, int, char*[]); +extern int m_uninvite(struct Client*, struct Client*, int, char*[]); extern int m_unregistered(struct Client*, struct Client*, int, char*[]); extern int m_unsupported(struct Client*, struct Client*, int, char*[]); extern int m_user(struct Client*, struct Client*, int, char*[]); @@ -235,6 +236,7 @@ extern int ms_svsjoin(struct Client*, struct Client*, int, char*[]); extern int ms_svspart(struct Client*, struct Client*, int, char*[]); extern int ms_topic(struct Client*, struct Client*, int, char*[]); extern int ms_trace(struct Client*, struct Client*, int, char*[]); +extern int ms_uninvite(struct Client*, struct Client*, int, char*[]); extern int ms_uping(struct Client*, struct Client*, int, char*[]); extern int ms_version(struct Client*, struct Client*, int, char*[]); extern int ms_wallchops(struct Client*, struct Client*, int, char*[]); diff --git a/include/msg.h b/include/msg.h index 59f921c..e5ed340 100644 --- a/include/msg.h +++ b/include/msg.h @@ -88,6 +88,10 @@ struct Client; #define TOK_INVITE "I" #define CMD_INVITE MSG_INVITE, TOK_INVITE +#define MSG_UNINVITE "UNINVITE" /* INVI */ +#define TOK_UNINVITE "UI" +#define CMD_UNINVITE MSG_UNINVITE, TOK_UNINVITE + #define MSG_VERSION "VERSION" /* VERS */ #define TOK_VERSION "V" #define CMD_VERSION MSG_VERSION, TOK_VERSION diff --git a/include/numeric.h b/include/numeric.h index 4b144e7..1d8e372 100644 --- a/include/numeric.h +++ b/include/numeric.h @@ -264,6 +264,7 @@ extern const struct Numeric* get_error_numeric(int err); #define RPL_USERIP 340 /* Undernet extension */ #define RPL_INVITING 341 /* RPL_SUMMONING 342 removed from RFC1459 */ +#define RPL_UNINVITE 343 #define RPL_ISSUEDINVITE 345 /* Undernet extension */ #define RPL_INVITELIST 346 /* IRCnet, Undernet extension */ @@ -375,6 +376,7 @@ extern const struct Numeric* get_error_numeric(int err); /* ERR_SUMMONDISABLED 445 removed from RFC1459 */ /* ERR_USERSDISABLED 446 removed from RFC1459 */ /* ERR_NONICKCHANGE 447 unreal */ +#define ERR_USERNOTINVITED 448 #define ERR_NOTREGISTERED 451 /* ERR_IDCOLLISION 452 IRCnet extension ? */ diff --git a/ircd/Makefile.in b/ircd/Makefile.in index 2e3cf13..d007a8c 100644 --- a/ircd/Makefile.in +++ b/ircd/Makefile.in @@ -179,6 +179,7 @@ IRCD_SRC = \ m_time.c \ m_topic.c \ m_trace.c \ + m_uninvite.c \ m_uping.c \ m_user.c \ m_userhost.c \ diff --git a/ircd/m_uninvite.c b/ircd/m_uninvite.c new file mode 100644 index 0000000..bfb8f54 --- /dev/null +++ b/ircd/m_uninvite.c @@ -0,0 +1,238 @@ +/* + * IRC - Internet Relay Chat, ircd/m_uninvite.c + * Written by Philipp Kreil. + * + * See file AUTHORS in IRC package for additional names of + * the programmers. + * + * 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 1, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +/* + * m_functions execute protocol messages on this server: + * + * cptr is always NON-NULL, pointing to a *LOCAL* client + * structure (with an open socket connected!). This + * identifies the physical socket where the message + * originated (or which caused the m_function to be + * executed--some m_functions may call others...). + * + * sptr is the source of the message, defined by the + * prefix part of the message if present. If not + * or prefix not found, then sptr==cptr. + * + * (!IsServer(cptr)) => (cptr == sptr), because + * prefixes are taken *only* from servers... + * + * (IsServer(cptr)) + * (sptr == cptr) => the message didn't + * have the prefix. + * + * (sptr != cptr && IsServer(sptr) means + * the prefix specified servername. (?) + * + * (sptr != cptr && !IsServer(sptr) means + * that message originated from a remote + * user (not local). + * + * combining + * + * (!IsServer(sptr)) means that, sptr can safely + * taken as defining the target structure of the + * message in this server. + * + * *Always* true (if 'parse' and others are working correct): + * + * 1) sptr->from == cptr (note: cptr->from == cptr) + * + * 2) MyConnect(sptr) <=> sptr == cptr (e.g. sptr + * *cannot* be a local connection, unless it's + * actually cptr!). [MyConnect(x) should probably + * be defined as (x == x->from) --msa ] + * + * parc number of variable parameter strings (if zero, + * parv is allowed to be NULL) + * + * parv a NULL terminated list of parameter pointers, + * + * parv[0], sender (prefix string), if not present + * this points to an empty string. + * parv[1]...parv[parc-1] + * pointers to additional parameters + * parv[parc] == NULL, *always* + * + * note: it is guaranteed that parv[0]..parv[parc-1] are all + * non-NULL pointers. + */ +#include "config.h" + +#include "channel.h" +#include "client.h" +#include "hash.h" +#include "ircd.h" +#include "ircd_features.h" +#include "ircd_log.h" +#include "ircd_reply.h" +#include "ircd_string.h" +#include "list.h" +#include "msg.h" +#include "numeric.h" +#include "numnicks.h" +#include "s_user.h" +#include "send.h" +#include "struct.h" + +/* #include -- Now using assert in ircd_log.h */ + +/* + * m_uninvite - generic message handler + * + * parv[0] - sender prefix + * parv[1] - user to uninvite + * parv[2] - channel name + * + */ +int m_uninvite(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) +{ + struct Client *acptr; + struct Channel *chptr; + + if (parc < 3 || EmptyString(parv[2])) + return need_more_params(sptr, "UNINVITE"); + + if (!(acptr = FindUser(parv[1]))) { + send_reply(sptr, ERR_NOSUCHNICK, parv[1]); + return 0; + } + + if (!IsChannelName(parv[2]) + || !strIsIrcCh(parv[2]) + || !(chptr = FindChannel(parv[2]))) { + send_reply(sptr, ERR_NOSUCHCHANNEL, parv[2]); + return 0; + } + + if (!find_channel_member(sptr, chptr)) { + send_reply(sptr, ERR_NOTONCHANNEL, chptr->chname); + return 0; + } + + if (find_channel_member(acptr, chptr)) { + send_reply(sptr, ERR_USERONCHANNEL, cli_name(acptr), chptr->chname); + return 0; + } + + if (!is_chan_op(sptr, chptr) && !is_halfop(sptr, chptr)) { + send_reply(sptr, ERR_CHANOPRIVSNEEDED, chptr->chname); + return 0; + } + + if(!IsInvited(acptr, chptr)) { + send_reply(sptr, ERR_USERNOTINVITED, cli_name(acptr), chptr->chname); + return 0; + } + + /* If we get here, it was a VALID and meaningful UNINVITE */ + + send_reply(sptr, RPL_UNINVITE, cli_name(acptr), chptr->chname); + + if (MyConnect(acptr)) { + del_invite(acptr, chptr); + sendcmdto_one(sptr, CMD_UNINVITE, acptr, "%s %H", cli_name(acptr), chptr); + } else if (!IsLocalChannel(chptr->chname)) { + sendcmdto_one(sptr, CMD_UNINVITE, acptr, "%s %H %Tu", cli_name(acptr), chptr, chptr->creationtime); + } + + return 0; +} + +/* + * ms_uninvite - server message handler + * + * parv[0] - sender prefix + * parv[1] - user to invite + * parv[2] - channel name + * parv[3] - (optional) channel timestamp + * + */ +int ms_uninvite(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) +{ + struct Client *acptr; + struct Channel *chptr; + time_t uninvite_ts; + + if (IsServer(sptr)) { + /* + * this will blow up if we get an uninvite from a server + * we look for channel membership in sptr below. + */ + return protocol_violation(sptr,"Server attempting to uninvite"); + } + if (parc < 3 || EmptyString(parv[2])) { + /* + * should have been handled upstream, ignore it. + */ + protocol_violation(sptr,"Too few arguments to uninvite"); + return need_more_params(sptr,"UNINVITE"); + } + if (!IsGlobalChannel(parv[2])) { + /* + * should not be sent + */ + return protocol_violation(sptr, "Uninvite from a non-standard channel %s",parv[2]); + } + if (!(acptr = FindUser(parv[1]))) { + send_reply(sptr, ERR_NOSUCHNICK, parv[1]); + return 0; + } + + if (!(chptr = FindChannel(parv[2]))) { + send_reply(sptr, ERR_NOSUCHCHANNEL, parv[2]); + return 0; + } + + if (parc > 3) { + uninvite_ts = atoi(parv[3]); + if (uninvite_ts > chptr->creationtime) + return 0; + } else if (IsBurstOrBurstAck(cptr)) + return 0; + + if (!IsChannelService(sptr) && !find_channel_member(sptr, chptr)) { + send_reply(sptr, ERR_NOTONCHANNEL, chptr->chname); + return 0; + } + + if (find_channel_member(acptr, chptr)) { + send_reply(sptr, ERR_USERONCHANNEL, cli_name(acptr), chptr->chname); + return 0; + } + + if(!IsInvited(acptr, chptr)) { + send_reply(sptr, ERR_USERNOTINVITED, cli_name(acptr), chptr->chname); + return 0; + } + + if (MyConnect(acptr)) { + del_invite(acptr, chptr); + sendcmdto_one(sptr, CMD_UNINVITE, acptr, "%s %H", cli_name(acptr), chptr); + } else { + sendcmdto_one(sptr, CMD_UNINVITE, acptr, "%s %H %Tu", cli_name(acptr), chptr, + chptr->creationtime); + } + + return 0; +} diff --git a/ircd/parse.c b/ircd/parse.c index 0a0d88d..fab2743 100644 --- a/ircd/parse.c +++ b/ircd/parse.c @@ -218,6 +218,13 @@ struct Message msgtab[] = { /* UNREG, CLIENT, SERVER, OPER, SERVICE */ { m_unregistered, m_invite, ms_invite, m_invite, m_ignore } }, + { + MSG_UNINVITE, + TOK_UNINVITE, + 0, MAXPARA, MFLG_SLOW, 0, NULL, + /* UNREG, CLIENT, SERVER, OPER, SERVICE */ + { m_unregistered, m_uninvite, ms_uninvite, m_uninvite, m_ignore } + }, { MSG_KICK, TOK_KICK, diff --git a/ircd/s_err.c b/ircd/s_err.c index e5531d7..1a31ebf 100644 --- a/ircd/s_err.c +++ b/ircd/s_err.c @@ -718,7 +718,7 @@ static Numeric replyTable[] = { /* 342 */ { 0 }, /* 343 */ - { 0 }, + { RPL_UNINVITE, "%s %s", "343" }, /* 344 */ { 0 }, /* 345 */ @@ -928,7 +928,7 @@ static Numeric replyTable[] = { /* 447 */ { 0 }, /* 448 */ - { 0 }, + { ERR_USERNOTINVITED, "%s %s :is not invited to channel", "448" }, /* 449 */ { 0 }, /* 450 */