* 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.
+ *
+ * $Id$
*/
-
-#include "sys.h"
-#include <sys/stat.h>
-#include <utmp.h>
-#if HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <stdlib.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef USE_SYSLOG
-#include <syslog.h>
-#endif
-#include "h.h"
-#include "struct.h"
-#include "common.h"
-#include "s_serv.h"
-#include "numeric.h"
-#include "send.h"
-#include "s_conf.h"
-#include "s_misc.h"
-#include "match.h"
-#include "hash.h"
-#include "s_bsd.h"
-#include "whowas.h"
-#include "list.h"
-#include "s_err.h"
-#include "parse.h"
-#include "ircd.h"
-#include "s_user.h"
-#include "support.h"
#include "s_user.h"
+#include "IPcheck.h"
#include "channel.h"
-#include "random.h"
-#include "version.h"
+#include "class.h"
+#include "client.h"
+#include "hash.h"
+#include "ircd.h"
+#include "ircd_alloc.h"
+#include "ircd_chattr.h"
+#include "ircd_log.h"
+#include "ircd_reply.h"
+#include "ircd_string.h"
+#include "list.h"
+#include "match.h"
#include "msg.h"
-#include "userload.h"
+#include "numeric.h"
#include "numnicks.h"
-#include "sprintf_irc.h"
+#include "parse.h"
#include "querycmds.h"
-#include "IPcheck.h"
-#include "class.h"
+#include "random.h"
+#include "s_bsd.h"
+#include "s_conf.h"
+#include "s_debug.h"
+#include "s_misc.h"
+#include "s_serv.h" /* max_client_count */
+#include "send.h"
+#include "sprintf_irc.h"
+#include "struct.h"
+#include "support.h"
+#include "supported.h"
+#include "sys.h"
+#include "userload.h"
+#include "version.h"
+#include "whowas.h"
+
+#include <assert.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
-RCSTAG_CC("$Id$");
-/* *INDENT-OFF* */
+static int userCount = 0;
-/* This is not ANSI, but we have it anyway... */
-__BEGIN_DECLS
-char *crypt(const char *key, const char *salt);
-__END_DECLS
+/*
+ * 'make_user' add's an User information block to a client
+ * if it was not previously allocated.
+ */
+struct User *make_user(struct Client *cptr)
+{
+ assert(0 != cptr);
-/* *INDENT-ON* */
+ if (!cptr->user) {
+ cptr->user = (struct User*) MyMalloc(sizeof(struct User));
+ assert(0 != cptr->user);
-static char buf[BUFSIZE], buf2[BUFSIZE];
+ /* All variables are 0 by default */
+ memset(cptr->user, 0, sizeof(struct User));
+#ifdef DEBUGMODE
+ ++userCount;
+#endif
+ cptr->user->refcnt = 1;
+ }
+ return cptr->user;
+}
/*
- * 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. (?)
+ * free_user
*
- * (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.
+ * Decrease user reference count by one and release block, if count reaches 0.
+ */
+void free_user(struct User* user)
+{
+ assert(0 != user);
+ assert(0 < user->refcnt);
+
+ if (--user->refcnt == 0) {
+ if (user->away)
+ MyFree(user->away);
+ /*
+ * sanity check
+ */
+ assert(0 == user->joined);
+ assert(0 == user->invited);
+ assert(0 == user->channel);
+
+ MyFree(user);
+#ifdef DEBUGMODE
+ --userCount;
+#endif
+ }
+}
+
+void user_count_memory(size_t* count_out, size_t* bytes_out)
+{
+ assert(0 != count_out);
+ assert(0 != bytes_out);
+ *count_out = userCount;
+ *bytes_out = userCount * sizeof(struct User);
+}
+
+/*
+ * user_set_away - set user away state
+ * returns 1 if client is away or changed away message, 0 if
+ * client is removing away status.
+ * NOTE: this function may modify user and message, so they
+ * must be mutable.
*/
+int user_set_away(struct User* user, char* message)
+{
+ char* away;
+ assert(0 != user);
+
+ away = user->away;
+
+ if (EmptyString(message)) {
+ /*
+ * Marking as not away
+ */
+ if (away) {
+ MyFree(away);
+ user->away = 0;
+ }
+ }
+ else {
+ /*
+ * Marking as away
+ */
+ size_t len = strlen(message);
+
+ if (len > TOPICLEN) {
+ message[TOPICLEN] = '\0';
+ len = TOPICLEN;
+ }
+ if (away)
+ away = (char*) MyRealloc(away, len + 1);
+ else
+ away = (char*) MyMalloc(len + 1);
+ assert(0 != away);
+
+ user->away = away;
+ strcpy(away, message);
+ }
+ return (user->away != 0);
+}
/*
* next_client
* HandleMatchingClient;
*
*/
-aClient *next_client(aClient *next, char *ch)
+struct Client *next_client(struct Client *next, const char* ch)
{
- Reg3 aClient *tmp = next;
+ struct Client *tmp = next;
if (!tmp)
return NULL;
*
* returns: (see #defines)
*/
-int hunt_server(int MustBeOper, aClient *cptr, aClient *sptr, char *command,
+int hunt_server(int MustBeOper, struct Client *cptr, struct Client *sptr, char *command,
int server, int parc, char *parv[])
{
- aClient *acptr;
+ struct Client *acptr;
char y[8];
/* Assume it's me, if no server or an unregistered client */
- if (parc <= server || BadPtr(parv[server]) || IsUnknown(sptr))
+ if (parc <= server || EmptyString(parv[server]) || IsUnknown(sptr))
return (HUNTED_ISME);
/* Make sure it's a server */
if (MyUser(sptr) || Protocol(cptr) < 10)
{
/* Make sure it's a server */
- if (!strchr(parv[server], '*'))
- {
+ if (!strchr(parv[server], '*')) {
if (0 == (acptr = FindClient(parv[server])))
- return HUNTED_NOSUCH;
+ return HUNTED_NOSUCH;
if (acptr->user)
- acptr = acptr->user->server;
+ acptr = acptr->user->server;
}
else if (!(acptr = find_match_server(parv[server])))
{
sendto_one(sptr, err_str(ERR_NOSUCHSERVER),
- me.name, parv[0], parv[server]);
+ me.name, parv[0], parv[server]);
return (HUNTED_NOSUCH);
}
}
else if (!(acptr = FindNServer(parv[server])))
- return (HUNTED_NOSUCH); /* Server broke off in the meantime */
+ return (HUNTED_NOSUCH); /* Server broke off in the meantime */
if (IsMe(acptr))
return (HUNTED_ISME);
return HUNTED_NOSUCH;
}
-#ifdef NO_PROTOCOL9
- if (MyUser(sptr))
- {
- strcpy(y, acptr->yxx);
- parv[server] = y;
- }
-#else
- if (Protocol(acptr->from) > 9)
- {
- strcpy(y, acptr->yxx);
- parv[server] = y;
- }
- else
- parv[server] = acptr->name;
-#endif
+ strcpy(y, acptr->yxx);
+ parv[server] = y;
- sendto_one(acptr, command, parv[0], parv[1], parv[2], parv[3], parv[4],
+ assert(!IsServer(sptr));
+ sendto_one(acptr, command, NumNick(sptr), parv[1], parv[2], parv[3], parv[4],
parv[5], parv[6], parv[7], parv[8]);
return (HUNTED_PASS);
* The '~'-character should be allowed, but a change should be global,
* some confusion would result if only few servers allowed it...
*/
-
-static int do_nick_name(char *nick)
+int do_nick_name(char* nick)
{
- Reg1 char *ch;
+ char* ch = nick;
+ char* end = ch + NICKLEN;
+ assert(0 != ch);
- if (*nick == '-' || isDigit(*nick)) /* first character in [0..9-] */
+ if (*ch == '-' || IsDigit(*ch)) /* first character in [0..9-] */
return 0;
- for (ch = nick; *ch && (ch - nick) < NICKLEN; ch++)
- if (!isIrcNk(*ch))
+ for ( ; (ch < end) && *ch; ++ch)
+ if (!IsNickChar(*ch))
break;
*ch = '\0';
return (ch - nick);
}
-/*
- * canonize
- *
- * reduce a string of duplicate list entries to contain only the unique
- * items. Unavoidably O(n^2).
- */
-char *canonize(char *buffer)
-{
- static char cbuf[BUFSIZ];
- register char *s, *t, *cp = cbuf;
- register int l = 0;
- char *p = NULL, *p2;
-
- *cp = '\0';
-
- for (s = strtoken(&p, buffer, ","); s; s = strtoken(&p, NULL, ","))
- {
- if (l)
- {
- p2 = NULL;
- for (t = strtoken(&p2, cbuf, ","); t; t = strtoken(&p2, NULL, ","))
- if (!strCasediff(s, t))
- break;
- else if (p2)
- p2[-1] = ',';
- }
- else
- t = NULL;
- if (!t)
- {
- if (l)
- *(cp - 1) = ',';
- else
- l = 1;
- strcpy(cp, s);
- if (p)
- cp += (p - s);
- }
- else if (p2)
- p2[-1] = ',';
- }
- return cbuf;
-}
-
/*
* clean_user_id
*
* Note that `dest' and `source' can point to the same area or to different
* non-overlapping areas.
*/
-
static char *clean_user_id(char *dest, char *source, int tilde)
{
- register char ch;
+ char ch;
char *d = dest;
char *s = source;
int rlen = USERLEN;
- ch = *s++; /* Store first character to copy: */
+ ch = *s++; /* Store first character to copy: */
if (tilde)
{
- *d++ = '~'; /* If `dest' == `source', then this overwrites `ch' */
+ *d++ = '~'; /* If `dest' == `source', then this overwrites `ch' */
--rlen;
}
- while (ch && !isCntrl(ch) && rlen--)
+ while (ch && !IsCntrl(ch) && rlen--)
{
- register char nch = *s++; /* Store next character to copy */
- *d++ = isIrcUi(ch) ? ch : '_'; /* This possibly overwrites it */
+ char nch = *s++; /* Store next character to copy */
+ *d++ = IsUserChar(ch) ? ch : '_'; /* This possibly overwrites it */
if (nch == '~')
ch = '_';
else
* this is not fair. It should actually request another
* nick from local user or kill him/her...
*/
-
-static int register_user(aClient *cptr, aClient *sptr,
- char *nick, char *username)
+int register_user(struct Client *cptr, struct Client *sptr,
+ const char *nick, char *username)
{
- Reg1 aConfItem *aconf;
- char *parv[3], *tmpstr, *tmpstr2;
- char c = 0 /* not alphanum */ , d = 'a' /* not a digit */ ;
- short upper = 0;
- short lower = 0;
- short pos = 0, leadcaps = 0, other = 0, digits = 0, badid = 0;
- short digitgroups = 0;
- anUser *user = sptr->user;
- Dlink *lp;
- char ip_base64[8];
-
- user->last = now;
+ struct ConfItem* aconf;
+ char* parv[3];
+ char* tmpstr;
+ char* tmpstr2;
+ char c = 0; /* not alphanum */
+ char d = 'a'; /* not a digit */
+ short upper = 0;
+ short lower = 0;
+ short pos = 0;
+ short leadcaps = 0;
+ short other = 0;
+ short digits = 0;
+ short badid = 0;
+ short digitgroups = 0;
+ struct User* user = sptr->user;
+ char ip_base64[8];
+ char featurebuf[512];
+
+ user->last = CurrentTime;
parv[0] = sptr->name;
parv[1] = parv[2] = NULL;
if (MyConnect(sptr))
{
- static time_t last_too_many1, last_too_many2;
- switch (check_client(sptr))
+ static time_t last_too_many1;
+ static time_t last_too_many2;
+
+ assert(cptr == sptr);
+ switch (conf_check_client(sptr))
{
case ACR_OK:
- break;
+ break;
case ACR_NO_AUTHORIZATION:
- sendto_op_mask(SNO_UNAUTH, "Unauthorized connection from %s.",
- sptr->sockhost);
- ircstp->is_ref++;
- return exit_client(cptr, sptr, &me,
- "No Authorization - use another server");
+ sendto_op_mask(SNO_UNAUTH, "Unauthorized connection from %s.",
+ get_client_name(sptr, HIDE_IP));
+ ++ServerStats->is_ref;
+ return exit_client(cptr, sptr, &me,
+ "No Authorization - use another server");
case ACR_TOO_MANY_IN_CLASS:
- if (now - last_too_many1 >= (time_t) 60)
- {
- last_too_many1 = now;
- sendto_op_mask(SNO_TOOMANY, "Too many connections in class for %s.",
- sptr->sockhost);
- }
- IPcheck_connect_fail(sptr);
- ircstp->is_ref++;
- return exit_client(cptr, sptr, &me,
- "Sorry, your connection class is full - try again later or try another server");
+ if (CurrentTime - last_too_many1 >= (time_t) 60)
+ {
+ last_too_many1 = CurrentTime;
+ sendto_op_mask(SNO_TOOMANY, "Too many connections in class for %s.",
+ get_client_name(sptr, HIDE_IP));
+ }
+ ++ServerStats->is_ref;
+ IPcheck_connect_fail(sptr->ip);
+ return exit_client(cptr, sptr, &me,
+ "Sorry, your connection class is full - try again later or try another server");
case ACR_TOO_MANY_FROM_IP:
- if (now - last_too_many2 >= (time_t) 60)
- {
- last_too_many2 = now;
- sendto_op_mask(SNO_TOOMANY,
- "Too many connections from same IP for %s.",
- sptr->sockhost);
- }
- ircstp->is_ref++;
- return exit_client(cptr, sptr, &me,
- "Too many connections from your host");
+ if (CurrentTime - last_too_many2 >= (time_t) 60)
+ {
+ last_too_many2 = CurrentTime;
+ sendto_op_mask(SNO_TOOMANY, "Too many connections from same IP for %s.",
+ get_client_name(sptr, HIDE_IP));
+ }
+ ++ServerStats->is_ref;
+ return exit_client(cptr, sptr, &me,
+ "Too many connections from your host");
case ACR_ALREADY_AUTHORIZED:
- /* Can this ever happen? */
+ /* Can this ever happen? */
case ACR_BAD_SOCKET:
- IPcheck_connect_fail(sptr);
- return exit_client(cptr, sptr, &me, "Unknown error -- Try again");
+ ++ServerStats->is_ref;
+ IPcheck_connect_fail(sptr->ip);
+ return exit_client(cptr, sptr, &me, "Unknown error -- Try again");
}
- if (IsUnixSocket(sptr))
- strncpy(user->host, me.name, HOSTLEN);
- else
- strncpy(user->host, sptr->sockhost, HOSTLEN);
+ ircd_strncpy(user->host, sptr->sockhost, HOSTLEN);
aconf = sptr->confs->value.aconf;
clean_user_id(user->username,
- (sptr->flags & FLAGS_GOTID) ? sptr->username : username,
- (sptr->flags & FLAGS_DOID) && !(sptr->flags & FLAGS_GOTID));
+ (sptr->flags & FLAGS_GOTID) ? sptr->username : username,
+ (sptr->flags & FLAGS_DOID) && !(sptr->flags & FLAGS_GOTID));
- if ((user->username[0] == '\000')
- || ((user->username[0] == '~') && (user->username[1] == '\000')))
+ if ((user->username[0] == '\0')
+ || ((user->username[0] == '~') && (user->username[1] == '\000')))
return exit_client(cptr, sptr, &me, "USER: Bogus userid.");
- if (!BadPtr(aconf->passwd)
- && !(isDigit(*aconf->passwd) && !aconf->passwd[1])
+ if (!EmptyString(aconf->passwd)
+ && !(IsDigit(*aconf->passwd) && !aconf->passwd[1])
#ifdef USEONE
- && strcmp("ONE", aconf->passwd)
+ && strcmp("ONE", aconf->passwd)
#endif
- && strcmp(sptr->passwd, aconf->passwd))
+ && strcmp(sptr->passwd, aconf->passwd))
{
- ircstp->is_ref++;
+ ServerStats->is_ref++;
+ IPcheck_connect_fail(sptr->ip);
sendto_one(sptr, err_str(ERR_PASSWDMISMATCH), me.name, parv[0]);
- IPcheck_connect_fail(sptr);
return exit_client(cptr, sptr, &me, "Bad Password");
}
memset(sptr->passwd, 0, sizeof(sptr->passwd));
/*
* following block for the benefit of time-dependent K:-lines
*/
- if (find_kill(sptr))
- {
- ircstp->is_ref++;
+ if (find_kill(sptr)) {
+ ServerStats->is_ref++;
+ IPcheck_connect_fail(sptr->ip);
return exit_client(cptr, sptr, &me, "K-lined");
}
-#ifdef R_LINES
- if (find_restrict(sptr))
- {
- ircstp->is_ref++;
- return exit_client(cptr, sptr, &me, "R-lined");
- }
-#endif
-
/*
* Check for mixed case usernames, meaning probably hacked. Jon2 3-94
* Summary of rules now implemented in this patch: Ensor 11-94
pos++;
c = *tmpstr;
tmpstr++;
- if (isLower(c))
+ if (IsLower(c))
{
- lower++;
+ lower++;
}
- else if (isUpper(c))
+ else if (IsUpper(c))
{
- upper++;
- if ((leadcaps || pos == 1) && !lower && !digits)
- leadcaps++;
+ upper++;
+ if ((leadcaps || pos == 1) && !lower && !digits)
+ leadcaps++;
}
- else if (isDigit(c))
+ else if (IsDigit(c))
{
- digits++;
- if (pos == 1 || !isDigit(d))
- {
- digitgroups++;
- if (digitgroups > 2)
- badid = 1;
- }
+ digits++;
+ if (pos == 1 || !IsDigit(d))
+ {
+ digitgroups++;
+ if (digitgroups > 2)
+ badid = 1;
+ }
}
else if (c == '-' || c == '_' || c == '.')
{
- other++;
- if (pos == 1)
- badid = 1;
- else if (d == '-' || d == '_' || d == '.' || other > 2)
- badid = 1;
+ other++;
+ if (pos == 1)
+ badid = 1;
+ else if (d == '-' || d == '_' || d == '.' || other > 2)
+ badid = 1;
}
else
- badid = 1;
+ badid = 1;
d = c;
}
if (!badid)
{
if (lower && upper && (!leadcaps || leadcaps > 3 ||
- (upper > 2 && upper > leadcaps)))
- badid = 1;
- else if (digitgroups == 2 && !(isDigit(tmpstr2[0]) || isDigit(c)))
- badid = 1;
- else if ((!lower && !upper) || !isAlnum(c))
- badid = 1;
+ (upper > 2 && upper > leadcaps)))
+ badid = 1;
+ else if (digitgroups == 2 && !(IsDigit(tmpstr2[0]) || IsDigit(c)))
+ badid = 1;
+ else if ((!lower && !upper) || !IsAlnum(c))
+ badid = 1;
}
if (badid && (!(sptr->flags & FLAGS_GOTID) ||
- strcmp(sptr->username, username) != 0))
+ strcmp(sptr->username, username) != 0))
{
- ircstp->is_ref++;
+ ServerStats->is_ref++;
sendto_one(cptr, ":%s %d %s :Your username is invalid.",
- me.name, ERR_INVALIDUSERNAME, cptr->name);
+ me.name, ERR_INVALIDUSERNAME, cptr->name);
sendto_one(cptr,
- ":%s %d %s :Connect with your real username, in lowercase.",
- me.name, ERR_INVALIDUSERNAME, cptr->name);
+ ":%s %d %s :Connect with your real username, in lowercase.",
+ me.name, ERR_INVALIDUSERNAME, cptr->name);
sendto_one(cptr, ":%s %d %s :If your mail address were foo@bar.com, "
- "your username would be foo.",
- me.name, ERR_INVALIDUSERNAME, cptr->name);
+ "your username would be foo.",
+ me.name, ERR_INVALIDUSERNAME, cptr->name);
return exit_client(cptr, sptr, &me, "USER: Bad username");
}
- Count_unknownbecomesclient(sptr, nrof);
+ Count_unknownbecomesclient(sptr, UserStats);
}
- else
- {
- strncpy(user->username, username, USERLEN);
- Count_newremoteclient(nrof);
+ else {
+ ircd_strncpy(user->username, username, USERLEN);
+ Count_newremoteclient(UserStats, user->server);
}
SetUser(sptr);
+
if (IsInvisible(sptr))
- ++nrof.inv_clients;
+ ++UserStats.inv_clients;
if (IsOper(sptr))
- ++nrof.opers;
+ ++UserStats.opers;
+
+ if (MyConnect(sptr)) {
+ sptr->handler = CLIENT_HANDLER;
+ release_dns_reply(sptr);
- if (MyConnect(sptr))
- {
sendto_one(sptr, rpl_str(RPL_WELCOME), me.name, nick, nick);
- /* This is a duplicate of the NOTICE but see below... */
+ /*
+ * This is a duplicate of the NOTICE but see below...
+ */
sendto_one(sptr, rpl_str(RPL_YOURHOST), me.name, nick,
- me.name, version);
+ me.name, version);
sendto_one(sptr, rpl_str(RPL_CREATED), me.name, nick, creation);
sendto_one(sptr, rpl_str(RPL_MYINFO), me.name, parv[0], me.name, version);
+ sprintf_irc(featurebuf,FEATURES,FEATURESVALUES);
+ sendto_one(sptr, rpl_str(RPL_ISUPPORT), me.name, nick, featurebuf);
m_lusers(sptr, sptr, 1, parv);
update_load();
#ifdef NODEFAULTMOTD
#else
m_motd(sptr, sptr, 1, parv);
#endif
- nextping = now;
+ nextping = CurrentTime;
if (sptr->snomask & SNO_NOISY)
set_snomask(sptr, sptr->snomask & SNO_NOISY, SNO_ADD);
#ifdef ALLOW_SNO_CONNEXIT
#ifdef SNO_CONNEXIT_IP
sprintf_irc(sendbuf,
- ":%s NOTICE * :*** Notice -- Client connecting: %s (%s@%s) [%s] {%d}",
- me.name, nick, user->username, user->host, inetntoa(sptr->ip),
- get_client_class(sptr));
+ ":%s NOTICE * :*** Notice -- Client connecting: %s (%s@%s) [%s] {%d}",
+ me.name, nick, user->username, user->host, cptr->sock_ip,
+ get_client_class(sptr));
sendbufto_op_mask(SNO_CONNEXIT);
#else /* SNO_CONNEXIT_IP */
sprintf_irc(sendbuf,
- ":%s NOTICE * :*** Notice -- Client connecting: %s (%s@%s)",
- me.name, nick, user->username, user->host);
+ ":%s NOTICE * :*** Notice -- Client connecting: %s (%s@%s)",
+ me.name, nick, user->username, user->host);
sendbufto_op_mask(SNO_CONNEXIT);
#endif /* SNO_CONNEXIT_IP */
#endif /* ALLOW_SNO_CONNEXIT */
else
/* if (IsServer(cptr)) */
{
- aClient *acptr;
+ struct Client *acptr;
acptr = user->server;
if (acptr->from != sptr->from)
{
- if (Protocol(cptr) < 10)
- sendto_one(cptr, ":%s KILL %s :%s (%s != %s[%s])",
- me.name, sptr->name, me.name, user->server->name, acptr->from->name,
- acptr->from->sockhost);
- else
- sendto_one(cptr, "%s KILL %s%s :%s (%s != %s[%s])",
- NumServ(&me), NumNick(sptr), me.name, user->server->name,
- acptr->from->name, acptr->from->sockhost);
+ sendto_one(cptr, "%s " TOK_KILL " %s%s :%s (%s != %s[%s])",
+ NumServ(&me), NumNick(sptr), me.name, user->server->name,
+ acptr->from->name, acptr->from->sockhost);
sptr->flags |= FLAGS_KILLED;
return exit_client(cptr, sptr, &me, "NICK server wrong direction");
}
* FIXME: This can be speeded up - its stupid to check it for
* every NICK message in a burst again --Run.
*/
- for (acptr = user->server; acptr != &me; acptr = acptr->serv->up)
+ for (acptr = user->server; acptr != &me; acptr = acptr->serv->up) {
if (IsBurst(acptr) || Protocol(acptr) < 10)
- break;
+ break;
+ }
if (IPcheck_remote_connect(sptr, user->host, (acptr != &me)) == -1)
- /* We ran out of bits to count this */
- return exit_client(cptr, sptr, &me,
- "More then 255 connections from this IP number");
+ /*
+ * We ran out of bits to count this
+ */
+ return exit_client(cptr, sptr, &me, "More than 255 connections from this address");
}
-#ifdef NO_PROTOCOL9 /* Use this when all servers are 2.10 (but test it first) --Run */
tmpstr = umode_str(sptr);
sendto_serv_butone(cptr, *tmpstr ?
- "%s NICK %s %d %d %s %s +%s %s %s%s :%s" :
- "%s NICK %s %d %d %s %s %s%s %s%s :%s",
- NumServ(user->server), nick, sptr->hopcount + 1, sptr->lastnick,
- user->username, user->host, tmpstr,
- inttobase64(ip_base64, ntohl(sptr->ip.s_addr), 6),
- NumNick(sptr), sptr->info);
-
-#else /* Remove the following when all servers are 2.10 */
-
- /* First send message to all 2.9 servers */
- sprintf_irc(sendbuf, ":%s NICK %s %d " TIME_T_FMT " %s %s %s :%s",
- user->server->name, nick, sptr->hopcount + 1, sptr->lastnick,
- user->username, user->host, user->server->name, sptr->info);
- for (lp = me.serv->down; lp; lp = lp->next)
- {
- if (lp->value.cptr == cptr)
- continue;
- if (Protocol(lp->value.cptr) < 10)
- sendbufto_one(lp->value.cptr);
- }
-
- /* If the user has no umode, no need to generate a user MODE */
- if (*(tmpstr = umode_str(sptr)) && (MyConnect(sptr) || Protocol(cptr) > 9))
- /* Is it necessary to generate an user MODE message ? */
- {
- for (lp = me.serv->down; lp; lp = lp->next)
- {
- if (lp->value.cptr == cptr)
- continue;
- if (Protocol(lp->value.cptr) < 10)
- sendto_one(lp->value.cptr, ":%s MODE %s :%s", sptr->name,
- sptr->name, tmpstr);
- }
- }
-
- /* Now send message to all 2.10 servers */
- sprintf_irc(sendbuf, *tmpstr ?
- "%s NICK %s %d %d %s %s +%s %s %s%s :%s" :
- "%s NICK %s %d %d %s %s %s%s %s%s :%s",
- NumServ(user->server), nick, sptr->hopcount + 1, sptr->lastnick,
- user->username, user->host, tmpstr,
- inttobase64(ip_base64, ntohl(sptr->ip.s_addr), 6),
- NumNick(sptr), sptr->info);
- for (lp = me.serv->down; lp; lp = lp->next)
- {
- if (lp->value.cptr == cptr || Protocol(lp->value.cptr) < 10)
- continue;
- sendbufto_one(lp->value.cptr);
- }
-
-#endif
+ "%s " TOK_NICK " %s %d %d %s %s +%s %s %s%s :%s" :
+ "%s " TOK_NICK " %s %d %d %s %s %s%s %s%s :%s",
+ NumServ(user->server), nick, sptr->hopcount + 1, sptr->lastnick,
+ user->username, user->host, tmpstr,
+ inttobase64(ip_base64, ntohl(sptr->ip.s_addr), 6),
+ NumNick(sptr), sptr->info);
/* Send umode to client */
if (MyUser(sptr))
send_umode(cptr, sptr, 0, ALL_UMODES);
if (sptr->snomask != SNO_DEFAULT && (sptr->flags & FLAGS_SERVNOTICE))
sendto_one(sptr, rpl_str(RPL_SNOMASK), me.name, sptr->name,
- sptr->snomask, sptr->snomask);
+ sptr->snomask, sptr->snomask);
}
return 0;
}
-/* *INDENT-OFF* */
-static int user_modes[] = {
- FLAGS_OPER, 'o',
- FLAGS_LOCOP, 'O',
- FLAGS_INVISIBLE, 'i',
- FLAGS_WALLOP, 'w',
- FLAGS_SERVNOTICE, 's',
- FLAGS_DEAF, 'd',
- FLAGS_CHSERV, 'k',
- FLAGS_DEBUG, 'g',
- 0, 0
+static const struct UserMode {
+ unsigned int flag;
+ char c;
+} userModeList[] = {
+ { FLAGS_OPER, 'o' },
+ { FLAGS_LOCOP, 'O' },
+ { FLAGS_INVISIBLE, 'i' },
+ { FLAGS_WALLOP, 'w' },
+ { FLAGS_SERVNOTICE, 's' },
+ { FLAGS_DEAF, 'd' },
+ { FLAGS_CHSERV, 'k' },
+ { FLAGS_DEBUG, 'g' }
};
-/* *INDENT-ON* */
+#define USERMODELIST_SIZE sizeof(userModeList) / sizeof(struct UserMode)
-#define COOKIE_VERIFIED ((unsigned int)-1)
+#if 0
+static int user_modes[] = {
+ FLAGS_OPER, 'o',
+ FLAGS_LOCOP, 'O',
+ FLAGS_INVISIBLE, 'i',
+ FLAGS_WALLOP, 'w',
+ FLAGS_SERVNOTICE, 's',
+ FLAGS_DEAF, 'd',
+ FLAGS_CHSERV, 'k',
+ FLAGS_DEBUG, 'g',
+ 0, 0
+};
+#endif
/*
- * m_nick
- *
- * parv[0] = sender prefix
- * parv[1] = nickname
- *
- * If from server, source is client:
- * parv[2] = timestamp
- *
- * Source is server:
- * parv[2] = hopcount
- * parv[3] = timestamp
- * parv[4] = username
- * parv[5] = hostname
- * parv[6] = umode (optional)
- * parv[parc-3] = IP# <- Only Protocol >= 10
- * parv[parc-2] = YXX, numeric nick <- Only Protocol >= 10
- * parv[parc-1] = info
- * parv[0] = server
+ * XXX - find a way to get rid of this
*/
-int m_nick(aClient *cptr, aClient *sptr, int parc, char *parv[])
-{
- aClient* acptr;
- aClient* server = NULL;
- char nick[NICKLEN + 2];
- char* s;
- Link* lp;
- time_t lastnick = (time_t) 0;
- int differ = 1;
+static char umodeBuf[BUFSIZE];
- if (parc < 2)
- {
- sendto_one(sptr, err_str(ERR_NONICKNAMEGIVEN), me.name, parv[0]);
- return 0;
- }
- else if ((IsServer(sptr) && parc < 8) || (IsServer(cptr) && parc < 3))
- {
- sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "NICK");
- sendto_ops("bad NICK param count for %s from %s",
- parv[1], cptr->name);
- return 0;
- }
- if (MyConnect(sptr) && (s = strchr(parv[1], '~')))
- *s = '\0';
- strncpy(nick, parv[1], NICKLEN + 1);
- nick[sizeof(nick) - 1] = 0;
- /*
- * If do_nick_name() returns a null name OR if the server sent a nick
- * name and do_nick_name() changed it in some way (due to rules of nick
- * creation) then reject it. If from a server and we reject it,
- * and KILL it. -avalon 4/4/92
- */
- if (do_nick_name(nick) == 0 || (IsServer(cptr) && strcmp(nick, parv[1])))
- {
- sendto_one(sptr, err_str(ERR_ERRONEUSNICKNAME), me.name, parv[0], parv[1]);
+int set_nick_name(struct Client* cptr, struct Client* sptr,
+ const char* nick, int parc, char* parv[])
+{
+ if (IsServer(sptr)) {
+ int i;
+ const char* p;
- if (IsServer(cptr))
- {
- ircstp->is_kill++;
- sendto_ops("Bad Nick: %s From: %s %s",
- parv[1], parv[0], cptr->name);
- if (Protocol(cptr) < 10)
- sendto_one(cptr, ":%s KILL %s :%s (%s <- %s[%s])",
- me.name, parv[1], me.name, parv[1], nick, cptr->name);
- else
- sendto_one(cptr, "%s KILL %s :%s (%s <- %s[%s])",
- NumServ(&me), IsServer(sptr) ? parv[parc - 2] : parv[0], me.name,
- parv[1], nick, cptr->name);
- if (!IsServer(sptr)) /* bad nick _change_ */
- {
- sendto_lowprot_butone(cptr, 9, ":%s KILL %s :%s (%s <- %s!%s@%s)",
- me.name, parv[0], me.name, cptr->name, parv[0],
- sptr->user ? sptr->username : "",
- sptr->user ? sptr->user->server->name : cptr->name);
- sendto_highprot_butone(cptr, 10, "%s KILL %s :%s (%s <- %s!%s@%s)",
- NumServ(&me), parv[0], me.name, cptr->name,
- parv[0], sptr->user ? sptr->username : "",
- sptr->user ? sptr->user->server->name : cptr->name);
- sptr->flags |= FLAGS_KILLED;
- return exit_client(cptr, sptr, &me, "BadNick");
+ /*
+ * A server introducing a new client, change source
+ */
+ struct Client* new_client = make_client(cptr, STAT_UNKNOWN);
+ assert(0 != new_client);
+
+ new_client->hopcount = atoi(parv[2]);
+ new_client->lastnick = atoi(parv[3]);
+ if (Protocol(cptr) > 9 && parc > 7 && *parv[6] == '+') {
+ for (p = parv[6] + 1; *p; p++) {
+ for (i = 0; i < USERMODELIST_SIZE; ++i) {
+ if (userModeList[i].c == *p) {
+ new_client->flags |= userModeList[i].flag;
+ break;
+ }
+ }
}
}
- return 0;
- }
-
- /*
- * Check if this is a LOCAL user trying to use a reserved (Juped)
- * nick, if so tell him that it's a nick in use...
- */
-
- if ((!IsServer(cptr)) && isNickJuped(nick))
- {
- sendto_one(sptr, err_str(ERR_NICKNAMEINUSE), me.name,
- /* parv[0] is empty when connecting */
- BadPtr(parv[0]) ? "*" : parv[0], nick);
- return 0; /* NICK message ignored */
- }
-
- /*
- * Check against nick name collisions.
- *
- * Put this 'if' here so that the nesting goes nicely on the screen :)
- * We check against server name list before determining if the nickname
- * is present in the nicklist (due to the way the below for loop is
- * constructed). -avalon
- */
- if ((acptr = FindServer(nick))) {
- if (MyConnect(sptr))
- {
- sendto_one(sptr, err_str(ERR_NICKNAMEINUSE), me.name,
- BadPtr(parv[0]) ? "*" : parv[0], nick);
- return 0; /* NICK message ignored */
- }
/*
- * We have a nickname trying to use the same name as
- * a server. Send out a nick collision KILL to remove
- * the nickname. As long as only a KILL is sent out,
- * there is no danger of the server being disconnected.
- * Ultimate way to jupiter a nick ? >;-). -avalon
+ * Set new nick name.
*/
- sendto_ops("Nick collision on %s(%s <- %s)",
- sptr->name, acptr->from->name, cptr->name);
- ircstp->is_kill++;
- if (Protocol(cptr) < 10)
- sendto_one(cptr, ":%s KILL %s :%s (%s <- %s)",
- me.name, sptr->name, me.name, acptr->from->name,
- cptr->name);
- else
- sendto_one(cptr, "%s KILL %s%s :%s (%s <- %s)",
- NumServ(&me), NumNick(sptr), me.name, acptr->from->name,
- /*
- * NOTE: Cannot use get_client_name twice here, it returns static
- * string pointer--the other info would be lost.
- */
- cptr->name);
- sptr->flags |= FLAGS_KILLED;
- return exit_client(cptr, sptr, &me, "Nick/Server collision");
- }
-
- if (!(acptr = FindClient(nick)))
- goto nickkilldone; /* No collisions, all clear... */
- /*
- * If acptr == sptr, then we have a client doing a nick
- * change between *equivalent* nicknames as far as server
- * is concerned (user is changing the case of his/her
- * nickname or somesuch)
- */
- if (acptr == sptr)
- {
- if (strcmp(acptr->name, nick) != 0)
- /*
- * Allows change of case in his/her nick
- */
- goto nickkilldone; /* -- go and process change */
- else
+ strcpy(new_client->name, nick);
+ new_client->user = make_user(new_client);
+ new_client->user->server = sptr;
+ if (!SetRemoteNumNick(new_client, parv[parc - 2])) {
/*
- * This is just ':old NICK old' type thing.
- * Just forget the whole thing here. There is
- * no point forwarding it to anywhere,
- * especially since servers prior to this
- * version would treat it as nick collision.
+ * if this fails squit the server and free the client
*/
- return 0; /* NICK Message ignored */
- }
+ free_client(new_client);
+ return exit_client_msg(cptr, sptr, &me, "Invalid numeric index");
+ }
+ new_client->ip.s_addr = htonl(base64toint(parv[parc - 3]));
+ /* IP# of remote client */
- /*
- * Note: From this point forward it can be assumed that
- * acptr != sptr (point to different client structures).
- */
- /*
- * If the older one is "non-person", the new entry is just
- * allowed to overwrite it. Just silently drop non-person,
- * and proceed with the nick. This should take care of the
- * "dormant nick" way of generating collisions...
- */
- if (IsUnknown(acptr) && MyConnect(acptr))
- {
- IPcheck_connect_fail(acptr);
- exit_client(cptr, acptr, &me, "Overridden by other sign on");
- goto nickkilldone;
+ add_client_to_list(new_client);
+ hAddClient(new_client);
+
+ sptr->serv->ghost = 0; /* :server NICK means end of net.burst */
+ ircd_strncpy(new_client->username, parv[4], USERLEN);
+ ircd_strncpy(new_client->user->host, parv[5], HOSTLEN);
+ ircd_strncpy(new_client->info, parv[parc - 1], REALLEN);
+ return register_user(cptr, new_client, new_client->name, parv[4]);
}
- /*
- * Decide, we really have a nick collision and deal with it
- */
- if (!IsServer(cptr))
- {
+ else if (sptr->name[0]) {
/*
- * NICK is coming from local client connection. Just
- * send error reply and ignore the command.
+ * Client changing its nick
+ *
+ * If the client belongs to me, then check to see
+ * if client is on any channels where it is currently
+ * banned. If so, do not allow the nick change to occur.
*/
- sendto_one(sptr, err_str(ERR_NICKNAMEINUSE), me.name,
- /* parv[0] is empty when connecting */
- BadPtr(parv[0]) ? "*" : parv[0], nick);
- return 0; /* NICK message ignored */
- }
- /*
- * NICK was coming from a server connection.
- * This means we have a race condition (two users signing on
- * at the same time), or two net fragments reconnecting with the same nick.
- * The latter can happen because two different users connected
- * or because one and the same user switched server during a net break.
- * If the TimeStamps are equal, we kill both (or only 'new'
- * if it was a ":server NICK new ...").
- * Otherwise we kill the youngest when user@host differ,
- * or the oldest when they are the same.
- * We treat user and ~user as different, because if it wasn't
- * a faked ~user the AUTH wouldn't have added the '~'.
- * --Run
- *
- */
- if (IsServer(sptr))
- {
+ if (MyUser(sptr)) {
+ const char* channel_name;
+ if ((channel_name = find_no_nickchange_channel(sptr))) {
+ sendto_one(cptr, err_str(ERR_BANNICKCHANGE), me.name, parv[0],
+ channel_name);
+ return 0;
+ }
+ /*
+ * Refuse nick change if the last nick change was less
+ * then 30 seconds ago. This is intended to get rid of
+ * clone bots doing NICK FLOOD. -SeKs
+ * If someone didn't change their nick for more then 60 seconds
+ * however, allow to do two nick changes immedately after another
+ * before limiting the nick flood. -Run
+ */
+ if (CurrentTime < cptr->nextnick) {
+ cptr->nextnick += 2;
+ sendto_one(cptr, err_str(ERR_NICKTOOFAST),
+ me.name, parv[0], parv[1], cptr->nextnick - CurrentTime);
+ /* Send error message */
+ sendto_prefix_one(cptr, cptr, ":%s NICK %s", parv[0], parv[0]);
+ /* bounce NICK to user */
+ return 0; /* ignore nick change! */
+ }
+ else {
+ /* Limit total to 1 change per NICK_DELAY seconds: */
+ cptr->nextnick += NICK_DELAY;
+ /* However allow _maximal_ 1 extra consecutive nick change: */
+ if (cptr->nextnick < CurrentTime)
+ cptr->nextnick = CurrentTime;
+ }
+ }
/*
- * A new NICK being introduced by a neighbouring
- * server (e.g. message type ":server NICK new ..." received)
+ * Also set 'lastnick' to current time, if changed.
*/
- lastnick = atoi(parv[3]);
- differ = (strCasediff(acptr->user->username, parv[4]) ||
- strCasediff(acptr->user->host, parv[5]));
- sendto_ops("Nick collision on %s (%s " TIME_T_FMT " <- %s " TIME_T_FMT
- " (%s user@host))", acptr->name, acptr->from->name, acptr->lastnick,
- cptr->name, lastnick, differ ? "Different" : "Same");
- }
- else
- {
+ if (0 != ircd_strcmp(parv[0], nick))
+ sptr->lastnick = (sptr == cptr) ? TStime() : atoi(parv[2]);
+
/*
- * A NICK change has collided (e.g. message type ":old NICK new").
+ * Client just changing his/her nick. If he/she is
+ * on a channel, send note of change to all clients
+ * on that channel. Propagate notice to other servers.
*/
- lastnick = atoi(parv[2]);
- differ = (strCasediff(acptr->user->username, sptr->user->username) ||
- strCasediff(acptr->user->host, sptr->user->host));
- sendto_ops("Nick change collision from %s to %s (%s " TIME_T_FMT " <- %s "
- TIME_T_FMT ")", sptr->name, acptr->name, acptr->from->name,
- acptr->lastnick, cptr->name, lastnick);
- }
- /*
- * Now remove (kill) the nick on our side if it is the youngest.
- * If no timestamp was received, we ignore the incoming nick
- * (and expect a KILL for our legit nick soon ):
- * When the timestamps are equal we kill both nicks. --Run
- * acptr->from != cptr should *always* be true (?).
- */
- if (acptr->from != cptr)
- {
- if ((differ && lastnick >= acptr->lastnick) ||
- (!differ && lastnick <= acptr->lastnick))
- {
- if (!IsServer(sptr))
- {
- ircstp->is_kill++;
- sendto_lowprot_butone(cptr, 9, /* Kill old from outgoing servers */
- ":%s KILL %s :%s (%s <- %s (Nick collision))",
- me.name, sptr->name, me.name, acptr->from->name,
- cptr->name);
- sendto_highprot_butone(cptr, 10, /* Kill old from outgoing servers */
- "%s KILL %s%s :%s (%s <- %s (Nick collision))",
- NumServ(&me), NumNick(sptr), me.name, acptr->from->name,
- cptr->name);
- if (MyConnect(sptr) && IsServer(cptr) && Protocol(cptr) > 9)
- sendto_one(cptr, "%s KILL %s%s :%s (Ghost2)",
- NumServ(&me), NumNick(sptr), me.name);
- sptr->flags |= FLAGS_KILLED;
- exit_client(cptr, sptr, &me, "Nick collision (you're a ghost)");
- }
- if (lastnick != acptr->lastnick)
- return 0; /* Ignore the NICK */
- }
- sendto_one(acptr, err_str(ERR_NICKCOLLISION), me.name, acptr->name, nick);
- }
- ircstp->is_kill++;
- acptr->flags |= FLAGS_KILLED;
- if (differ)
- {
- sendto_lowprot_butone(cptr, 9, /* Kill our old from outgoing servers */
- ":%s KILL %s :%s (%s <- %s (older nick overruled))",
- me.name, acptr->name, me.name, acptr->from->name,
- cptr->name);
- sendto_highprot_butone(cptr, 10, /* Kill our old from outgoing servers */
- "%s KILL %s%s :%s (%s <- %s (older nick overruled))",
- NumServ(&me), NumNick(acptr), me.name, acptr->from->name,
- cptr->name);
- if (MyConnect(acptr) && IsServer(cptr) && Protocol(cptr) > 9)
- sendto_one(cptr, "%s%s QUIT :Local kill by %s (Ghost)",
- NumNick(acptr), me.name);
- exit_client(cptr, acptr, &me, "Nick collision (older nick overruled)");
- }
- else
- {
- sendto_lowprot_butone(cptr, 9, /* Kill our old from outgoing servers */
- ":%s KILL %s :%s (%s <- %s (nick collision from same user@host))",
- me.name, acptr->name, me.name, acptr->from->name,
- cptr->name);
- sendto_highprot_butone(cptr, 10, /* Kill our old from outgoing servers */
- "%s KILL %s%s :%s (%s <- %s (nick collision from same user@host))",
- NumServ(&me), NumNick(acptr), me.name, acptr->from->name,
- cptr->name);
- if (MyConnect(acptr) && IsServer(cptr) && Protocol(cptr) > 9)
- sendto_one(cptr,
- "%s%s QUIT :Local kill by %s (Ghost: switched servers too fast)",
- NumNick(acptr), me.name);
- exit_client(cptr, acptr, &me, "Nick collision (You collided yourself)");
- }
- if (lastnick == acptr->lastnick)
- return 0;
-
-nickkilldone:
- if (IsServer(sptr))
- {
- int flag, *s;
- char *p;
-#ifndef NO_PROTOCOL9
- const char *nnp9 = NULL; /* Init. to avoid compiler warning */
-#endif
-
- /* A server introducing a new client, change source */
- if (!server)
- server = sptr;
-#ifndef NO_PROTOCOL9
- /*
- * Numeric Nicks does, in contrast to all other protocol enhancements,
- * translation from protocol 9 -> protocol 10 !
- * The reason is that I just can't know what protocol it is when I
- * receive a "MODE #channel +o Run", because I can't 'find' "Run"
- * before I know the protocol, and I can't know the protocol if I
- * first have to find the server of "Run".
- * Therefore, in THIS case, the protocol is determined by the Connected
- * server: cptr.
- */
- if (Protocol(cptr) < 10 && !(nnp9 = CreateNNforProtocol9server(server)))
- return exit_client_msg(cptr, server, &me,
- "Too many clients (> %d) from P09 server (%s)", 64, server->name);
-#endif
- sptr = make_client(cptr, STAT_UNKNOWN);
- sptr->hopcount = atoi(parv[2]);
- sptr->lastnick = atoi(parv[3]);
- if (Protocol(cptr) > 9 && parc > 7 && *parv[6] == '+')
- for (p = parv[6] + 1; *p; p++)
- for (s = user_modes; (flag = *s); s += 2)
- if (((char)*(s + 1)) == *p)
- {
- sptr->flags |= flag;
- break;
- }
- /*
- * Set new nick name.
- */
- strcpy(sptr->name, nick);
- sptr->user = make_user(sptr);
- sptr->user->server = server;
-#ifndef NO_PROTOCOL9
- if (Protocol(cptr) < 10)
- {
- if (!SetRemoteNumNick(sptr, nnp9))
- {
- /*
- * if this fails squit the server and free the client
- */
- free_client(sptr);
- return exit_client_msg(cptr, server, &me, "Invalid numeric index");
- }
- sptr->ip.s_addr = 0;
- }
- else
- {
-#endif
- if (!SetRemoteNumNick(sptr, parv[parc - 2]))
- {
- /*
- * if this fails squit the server and free the client
- */
- free_client(sptr);
- return exit_client_msg(cptr, server, &me, "Invalid numeric index");
- }
- sptr->ip.s_addr = htonl(base64toint(parv[parc - 3]));
- /* IP# of remote client */
-#ifndef NO_PROTOCOL9
- }
-#endif
- add_client_to_list(sptr);
- hAddClient(sptr);
-
- server->serv->ghost = 0; /* :server NICK means end of net.burst */
- strncpy(sptr->info, parv[parc - 1], sizeof(sptr->info) - 1);
- strncpy(sptr->user->host, parv[5], sizeof(sptr->user->host) - 1);
- return register_user(cptr, sptr, sptr->name, parv[4]);
- }
- else if (sptr->name[0])
- {
- /*
- * Client changing its nick
- *
- * If the client belongs to me, then check to see
- * if client is on any channels where it is currently
- * banned. If so, do not allow the nick change to occur.
- */
- if (MyUser(sptr))
- {
- for (lp = cptr->user->channel; lp; lp = lp->next)
- if (can_send(cptr, lp->value.chptr) == MODE_BAN)
- {
- sendto_one(cptr, err_str(ERR_BANNICKCHANGE), me.name, parv[0],
- lp->value.chptr->chname);
- return 0;
- }
- /*
- * Refuse nick change if the last nick change was less
- * then 30 seconds ago. This is intended to get rid of
- * clone bots doing NICK FLOOD. -SeKs
- * If someone didn't change their nick for more then 60 seconds
- * however, allow to do two nick changes immedately after another
- * before limiting the nick flood. -Run
- */
- if (now < cptr->nextnick)
- {
- cptr->nextnick += 2;
- sendto_one(cptr, err_str(ERR_NICKTOOFAST),
- me.name, parv[0], parv[1], cptr->nextnick - now);
- /* Send error message */
- sendto_prefix_one(cptr, cptr, ":%s NICK %s", parv[0], parv[0]);
- /* bounce NICK to user */
- return 0; /* ignore nick change! */
- }
- else
- {
- /* Limit total to 1 change per NICK_DELAY seconds: */
- cptr->nextnick += NICK_DELAY;
- /* However allow _maximal_ 1 extra consecutive nick change: */
- if (cptr->nextnick < now)
- cptr->nextnick = now;
- }
- }
- /*
- * Also set 'lastnick' to current time, if changed.
- */
- if (strCasediff(parv[0], nick))
- sptr->lastnick = (sptr == cptr) ? TStime() : atoi(parv[2]);
-
- /*
- * Client just changing his/her nick. If he/she is
- * on a channel, send note of change to all clients
- * on that channel. Propagate notice to other servers.
- */
- if (IsUser(sptr))
- {
+ if (IsUser(sptr)) {
sendto_common_channels(sptr, ":%s NICK :%s", parv[0], nick);
add_history(sptr, 1);
-#ifdef NO_PROTOCOL9
sendto_serv_butone(cptr,
- "%s%s NICK %s " TIME_T_FMT, NumNick(sptr), nick, sptr->lastnick);
-#else
- sendto_lowprot_butone(cptr, 9,
- ":%s NICK %s " TIME_T_FMT, parv[0], nick, sptr->lastnick);
- sendto_highprot_butone(cptr, 10,
- "%s%s NICK %s " TIME_T_FMT, NumNick(sptr), nick, sptr->lastnick);
-#endif
+ "%s%s " TOK_NICK " %s " TIME_T_FMT, NumNick(sptr), nick, sptr->lastnick);
}
else
sendto_one(sptr, ":%s NICK :%s", parv[0], nick);
+
if (sptr->name[0])
hRemClient(sptr);
strcpy(sptr->name, nick);
hAddClient(sptr);
}
- else
- {
+ else {
/* Local client setting NICK the first time */
strcpy(sptr->name, nick);
- if (!sptr->user)
- {
+ if (!sptr->user) {
sptr->user = make_user(sptr);
sptr->user->server = &me;
}
SetLocalNumNick(sptr);
hAddClient(sptr);
-
- /*
- * If the client hasn't gotten a cookie-ping yet,
- * choose a cookie and send it. -record!jegelhof@cloud9.net
- */
- if (!sptr->cookie)
- {
- do
- sptr->cookie = (ircrandom() & 0x7fffffff);
- while (!sptr->cookie);
- sendto_one(cptr, "PING :%u", sptr->cookie);
- }
- else if (*sptr->user->host && sptr->cookie == COOKIE_VERIFIED)
- {
- /*
- * USER and PONG already received, now we have NICK.
- * register_user may reject the client and call exit_client
- * for it - must test this and exit m_nick too !
- */
- sptr->lastnick = TStime(); /* Always local client */
- if (register_user(cptr, sptr, nick, sptr->user->username) == CPTR_KILLED)
- return CPTR_KILLED;
- }
- }
- return 0;
-}
-
-/*
- * add_target
- *
- * sptr must be a local client!
- *
- * Cannonifies target for client `sptr'.
- */
-void add_target(aClient *sptr, void *target)
-{
- register unsigned char *p;
- register unsigned int tmp = ((size_t)target & 0xffff00) >> 8;
- unsigned char hash = (tmp * tmp) >> 12;
- if (sptr->targets[0] == hash) /* Last person that we messaged ourself? */
- return;
- for (p = sptr->targets; p < &sptr->targets[MAXTARGETS - 1];)
- if (*++p == hash)
- return; /* Already in table */
-
- /* New target */
- memmove(&sptr->targets[RESERVEDTARGETS + 1],
- &sptr->targets[RESERVEDTARGETS], MAXTARGETS - RESERVEDTARGETS - 1);
- sptr->targets[RESERVEDTARGETS] = hash;
- return;
-}
-
-/*
- * check_target_limit
- *
- * sptr must be a local client !
- *
- * Returns 'true' (1) when too many targets are addressed.
- * Returns 'false' (0) when it's ok to send to this target.
- */
-int check_target_limit(aClient *sptr, void *target, const char *name,
- int created)
-{
- register unsigned char *p;
- register unsigned int tmp = ((size_t)target & 0xffff00) >> 8;
- unsigned char hash = (tmp * tmp) >> 12;
- if (sptr->targets[0] == hash) /* Same target as last time ? */
- return 0;
- for (p = sptr->targets; p < &sptr->targets[MAXTARGETS - 1];)
- if (*++p == hash)
- {
- memmove(&sptr->targets[1], &sptr->targets[0], p - sptr->targets);
- sptr->targets[0] = hash;
- return 0;
- }
-
- /* New target */
- if (!created)
- {
- if (now < sptr->nexttarget)
- {
- if (sptr->nexttarget - now < TARGET_DELAY + 8) /* No server flooding */
- {
- sptr->nexttarget += 2;
- sendto_one(sptr, err_str(ERR_TARGETTOOFAST),
- me.name, sptr->name, name, sptr->nexttarget - now);
- }
- return 1;
- }
- else
- {
-#ifdef GODMODE
- sendto_one(sptr, ":%s NOTICE %s :New target: %s; ft " TIME_T_FMT,
- me.name, sptr->name, name, (now - sptr->nexttarget) / TARGET_DELAY);
-#endif
- sptr->nexttarget += TARGET_DELAY;
- if (sptr->nexttarget < now - (TARGET_DELAY * (MAXTARGETS - 1)))
- sptr->nexttarget = now - (TARGET_DELAY * (MAXTARGETS - 1));
- }
- }
- memmove(&sptr->targets[1], &sptr->targets[0], MAXTARGETS - 1);
- sptr->targets[0] = hash;
- return 0;
-}
-
-/*
- * m_message (used in m_private() and m_notice())
- *
- * The general function to deliver MSG's between users/channels
- *
- * parv[0] = sender prefix
- * parv[1] = receiver list
- * parv[parc-1] = message text
- *
- * massive cleanup
- * rev argv 6/91
- */
-static int m_message(aClient *cptr, aClient *sptr,
- int parc, char *parv[], int notice)
-{
- Reg1 aClient *acptr;
- Reg2 char *s;
- aChannel *chptr;
- char *nick, *server, *p, *cmd, *host;
-
- sptr->flags &= ~FLAGS_TS8;
-
- cmd = notice ? MSG_NOTICE : MSG_PRIVATE;
-
- if (parc < 2 || *parv[1] == '\0')
- {
- sendto_one(sptr, err_str(ERR_NORECIPIENT), me.name, parv[0], cmd);
- return -1;
- }
-
- if (parc < 3 || *parv[parc - 1] == '\0')
- {
- sendto_one(sptr, err_str(ERR_NOTEXTTOSEND), me.name, parv[0]);
- return -1;
- }
-
- if (MyUser(sptr))
- parv[1] = canonize(parv[1]);
- for (p = NULL, nick = strtoken(&p, parv[1], ","); nick;
- nick = strtoken(&p, NULL, ","))
- {
- /*
- * channel msg?
- */
- if (IsChannelName(nick))
- {
- if ((chptr = FindChannel(nick)))
- {
- if (can_send(sptr, chptr) == 0 /* This first: Almost never a server/service */
- || IsChannelService(sptr) || IsServer(sptr))
- {
- if (MyUser(sptr) && (chptr->mode.mode & MODE_NOPRIVMSGS) &&
- check_target_limit(sptr, chptr, chptr->chname, 0))
- continue;
- sendto_channel_butone(cptr, sptr, chptr,
- ":%s %s %s :%s", parv[0], cmd, chptr->chname, parv[parc - 1]);
- }
- else if (!notice)
- sendto_one(sptr, err_str(ERR_CANNOTSENDTOCHAN),
- me.name, parv[0], chptr->chname);
- continue;
- }
- }
- else if (*nick != '$' && !strchr(nick, '@'))
- {
- /*
- * nickname addressed?
- */
- if (MyUser(sptr) || Protocol(cptr) < 10)
- acptr = FindUser(nick);
- else if ((acptr = findNUser(nick)) && !IsUser(acptr))
- acptr = NULL;
- if (acptr)
- {
- if (MyUser(sptr) && check_target_limit(sptr, acptr, acptr->name, 0))
- continue;
- if (!is_silenced(sptr, acptr))
- {
- if (!notice && MyConnect(sptr) && acptr->user && acptr->user->away)
- sendto_one(sptr, rpl_str(RPL_AWAY),
- me.name, parv[0], acptr->name, acptr->user->away);
- if (MyUser(acptr) || Protocol(acptr->from) < 10)
- {
- if (MyUser(acptr))
- add_target(acptr, sptr);
- sendto_prefix_one(acptr, sptr, ":%s %s %s :%s",
- parv[0], cmd, acptr->name, parv[parc - 1]);
- }
- else
- sendto_prefix_one(acptr, sptr, ":%s %s %s%s :%s",
- parv[0], cmd, NumNick(acptr), parv[parc - 1]);
- }
- }
- else if (MyUser(sptr) || Protocol(cptr) < 10)
- sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], nick);
- else
- sendto_one(sptr,
- ":%s %d %s * :Target left UnderNet. Failed to deliver: [%.50s]",
- me.name, ERR_NOSUCHNICK, sptr->name, parv[parc - 1]);
- continue;
- }
- /*
- * The following two cases allow masks in NOTICEs
- * (for OPERs only)
- *
- * Armin, 8Jun90 (gruner@informatik.tu-muenchen.de)
- */
- if ((*nick == '$' || *nick == '#') && IsAnOper(sptr))
- {
- if (MyConnect(sptr))
- {
- if (!(s = strrchr(nick, '.')))
- {
- sendto_one(sptr, err_str(ERR_NOTOPLEVEL), me.name, parv[0], nick);
- continue;
- }
- while (*++s)
- if (*s == '.' || *s == '*' || *s == '?')
- break;
- if (*s == '*' || *s == '?')
- {
- sendto_one(sptr, err_str(ERR_WILDTOPLEVEL), me.name, parv[0], nick);
- continue;
- }
- }
- sendto_match_butone(IsServer(cptr) ? cptr : NULL,
- sptr, nick + 1, (*nick == '#') ? MATCH_HOST : MATCH_SERVER,
- ":%s %s %s :%s", parv[0], cmd, nick, parv[parc - 1]);
- continue;
- }
- else if ((server = strchr(nick, '@')) && (acptr = FindServer(server + 1)))
- {
- /*
- * NICK[%host]@server addressed? See if <server> is me first
- */
- if (!IsMe(acptr))
- {
- sendto_one(acptr, ":%s %s %s :%s", parv[0], cmd, nick, parv[parc - 1]);
- continue;
- }
-
- /* Look for an user whose NICK is equal to <nick> and then
- * check if it's hostname matches <host> and if it's a local
- * user. */
- *server = '\0';
- if ((host = strchr(nick, '%')))
- *host++ = '\0';
-
- if ((!(acptr = FindUser(nick))) ||
- (!(MyUser(acptr))) ||
- ((!(BadPtr(host))) && match(host, acptr->user->host)))
- acptr = NULL;
-
- *server = '@';
- if (host)
- *--host = '%';
-
- if (acptr)
- {
- if (!(is_silenced(sptr, acptr)))
- sendto_prefix_one(acptr, sptr, ":%s %s %s :%s",
- parv[0], cmd, nick, parv[parc - 1]);
- continue;
- }
- }
- if (IsChannelName(nick))
- sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL), me.name, parv[0], nick);
- else
- sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], nick);
- }
- return 0;
-}
-
-/*
- * m_private
- *
- * parv[0] = sender prefix
- * parv[1] = receiver list
- * parv[parc-1] = message text
- */
-int m_private(aClient *cptr, aClient *sptr, int parc, char *parv[])
-{
- return m_message(cptr, sptr, parc, parv, 0);
-}
-
-/*
- * m_notice
- *
- * parv[0] = sender prefix
- * parv[1] = receiver list
- * parv[parc-1] = notice text
- */
-int m_notice(aClient *cptr, aClient *sptr, int parc, char *parv[])
-{
- if (MyUser(sptr) && parv[1] && parv[1][0] == '@' &&
- IsChannelName(&parv[1][1]))
- {
- parv[1]++; /* Get rid of '@' */
- return m_wallchops(cptr, sptr, parc, parv);
- }
- return m_message(cptr, sptr, parc, parv, 1);
-}
-
-
-/*
- * whisper - called from m_cnotice and m_cprivmsg.
- *
- * parv[0] = sender prefix
- * parv[1] = nick
- * parv[2] = #channel
- * parv[3] = Private message text
- *
- * Added 971023 by Run.
- * Reason: Allows channel operators to sent an arbitrary number of private
- * messages to users on their channel, avoiding the max.targets limit.
- * Building this into m_private would use too much cpu because we'd have
- * to a cross channel lookup for every private message!
- * Note that we can't allow non-chan ops to use this command, it would be
- * abused by mass advertisers.
- */
-int whisper(aClient *sptr, int parc, char *parv[], int notice)
-{
- int s_is_member = 0, s_is_voiced = 0, t_is_member = 0;
- aClient *tcptr;
- aChannel *chptr;
- register Link *lp;
-
- if (!MyUser(sptr))
- return 0;
- if (parc < 4 || BadPtr(parv[3]))
- {
- sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
- me.name, parv[0], notice ? "CNOTICE" : "CPRIVMSG");
- return 0;
- }
- if (!(chptr = FindChannel(parv[2])))
- {
- sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL), me.name, parv[0], parv[2]);
- return 0;
- }
- if (!(tcptr = FindUser(parv[1])))
- {
- sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], parv[1]);
- return 0;
- }
- for (lp = chptr->members; lp; lp = lp->next)
- {
- register aClient *mcptr = lp->value.cptr;
- if (mcptr == sptr)
- {
- s_is_member = 1;
- if ((lp->flags & (CHFL_CHANOP | CHFL_VOICE)))
- s_is_voiced = 1;
- else
- break;
- if (t_is_member)
- break;
- }
- if (mcptr == tcptr)
- {
- t_is_member = 1;
- if (s_is_voiced)
- break;
- }
- }
- if (!s_is_voiced)
- {
- sendto_one(sptr, err_str(s_is_member ? ERR_VOICENEEDED : ERR_NOTONCHANNEL),
- me.name, parv[0], chptr->chname);
- return 0;
- }
- if (!t_is_member)
- {
- sendto_one(sptr, err_str(ERR_USERNOTINCHANNEL),
- me.name, parv[0], tcptr->name, chptr->chname);
- return 0;
- }
- if (is_silenced(sptr, tcptr))
- return 0;
-
- if (tcptr->user && tcptr->user->away)
- sendto_one(sptr, rpl_str(RPL_AWAY),
- me.name, parv[0], tcptr->name, tcptr->user->away);
- if (MyUser(tcptr) || Protocol(tcptr->from) < 10)
- sendto_prefix_one(tcptr, sptr, ":%s %s %s :%s",
- parv[0], notice ? "NOTICE" : "PRIVMSG", tcptr->name, parv[3]);
- else
- sendto_prefix_one(tcptr, sptr, ":%s %s %s%s :%s",
- parv[0], notice ? "NOTICE" : "PRIVMSG", NumNick(tcptr), parv[3]);
-
- return 0;
-}
-
-int m_cnotice(aClient *UNUSED(cptr), aClient *sptr, int parc, char *parv[])
-{
- return whisper(sptr, parc, parv, 1);
-}
-
-int m_cprivmsg(aClient *UNUSED(cptr), aClient *sptr, int parc, char *parv[])
-{
- return whisper(sptr, parc, parv, 0);
-}
-
-/*
- * m_wallchops
- *
- * parv[0] = sender prefix
- * parv[1] = target channel
- * parv[parc - 1] = wallchops text
- */
-int m_wallchops(aClient *cptr, aClient *sptr, int parc, char *parv[])
-{
- aChannel *chptr;
-
- sptr->flags &= ~FLAGS_TS8;
-
- if (parc < 2 || *parv[1] == '\0')
- {
- sendto_one(sptr, err_str(ERR_NORECIPIENT), me.name, parv[0], "WALLCHOPS");
- return -1;
- }
-
- if (parc < 3 || *parv[parc - 1] == '\0')
- {
- sendto_one(sptr, err_str(ERR_NOTEXTTOSEND), me.name, parv[0]);
- return -1;
- }
-
- if (MyUser(sptr))
- parv[1] = canonize(parv[1]);
-
- if (IsChannelName(parv[1]))
- {
- if ((chptr = FindChannel(parv[1])))
- {
- if (can_send(sptr, chptr) == 0)
- {
- if (MyUser(sptr) && (chptr->mode.mode & MODE_NOPRIVMSGS) &&
- check_target_limit(sptr, chptr, chptr->chname, 0))
- return 0;
- /* Send to local clients: */
- sendto_lchanops_butone(cptr, sptr, chptr,
- ":%s NOTICE @%s :%s", parv[0], parv[1], parv[parc - 1]);
-#ifdef NO_PROTOCOL9
- /* And to other servers: */
- sendto_chanopsserv_butone(cptr, sptr, chptr,
- ":%s WC %s :%s", parv[0], parv[1], parv[parc - 1]);
-#else
- /*
- * WARNING: `sendto_chanopsserv_butone' is heavily hacked when
- * `NO_PROTOCOL9' is not defined ! Therefore this is the ONLY
- * place you may use `sendto_chanopsserv_butone', until all
- * servers are 2.10.
- */
- sendto_chanopsserv_butone(cptr, sptr, chptr,
- ":%s WC %s :%s", parv[0], parv[1], parv[parc - 1]);
-#endif
- }
- else
- sendto_one(sptr, err_str(ERR_CANNOTSENDTOCHAN),
- me.name, parv[0], parv[1]);
- }
- }
- else
- sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL), me.name, parv[0], parv[1]);
-
- return 0;
-}
-
-/*
- * m_user
- *
- * parv[0] = sender prefix
- * parv[1] = username (login name, account)
- * parv[2] = umode mask
- * parv[3] = server notice mask
- * parv[4] = users real name info
- */
-int m_user(aClient *cptr, aClient *sptr, int parc, char *parv[])
-{
-#define UFLAGS (FLAGS_INVISIBLE|FLAGS_WALLOP|FLAGS_SERVNOTICE)
- char *username, *host, *server, *realname;
- anUser *user;
-
- if (IsServer(cptr))
- return 0;
-
- if (IsServerPort(cptr))
- return exit_client(cptr, cptr, &me, "Use a different port");
-
- if (parc > 2 && (username = strchr(parv[1], '@')))
- *username = '\0';
- if (parc < 5 || *parv[1] == '\0' || *parv[2] == '\0' ||
- *parv[3] == '\0' || *parv[4] == '\0')
- {
- sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "USER");
- return 0;
- }
-
- /* Copy parameters into better documenting variables */
-
- username = (parc < 2 || BadPtr(parv[1])) ? "<bad-boy>" : parv[1];
- host = (parc < 3 || BadPtr(parv[2])) ? "<nohost>" : parv[2];
- server = (parc < 4 || BadPtr(parv[3])) ? "<noserver>" : parv[3];
- realname = (parc < 5 || BadPtr(parv[4])) ? "<bad-realname>" : parv[4];
-
- user = make_user(sptr);
-
- if (!IsUnknown(sptr))
- {
- sendto_one(sptr, err_str(ERR_ALREADYREGISTRED), me.name, parv[0]);
- return 0;
- }
-
- if (!strchr(host, '.')) /* Not an IP# as hostname ? */
- sptr->flags |= (UFLAGS & atoi(host));
- if ((sptr->flags & FLAGS_SERVNOTICE))
- set_snomask(sptr, (isDigit(*server) && !strchr(server, '.')) ?
- (atoi(server) & SNO_USER) : SNO_DEFAULT, SNO_SET);
- user->server = &me;
- strncpy(sptr->info, realname, sizeof(sptr->info) - 1);
- if (sptr->name[0] && sptr->cookie == COOKIE_VERIFIED)
- /* NICK and PONG already received, now we have USER... */
- return register_user(cptr, sptr, sptr->name, username);
- else
- {
- strncpy(sptr->user->username, username, USERLEN);
- strncpy(user->host, host, sizeof(user->host) - 1);
- }
- return 0;
-}
-
-/*
- * m_quit
- *
- * parv[0] = sender prefix
- * parv[parc-1] = comment
- */
-int m_quit(aClient *cptr, aClient *sptr, int parc, char *parv[])
-{
- register char *comment = (parc > 1
- && parv[parc - 1]) ? parv[parc - 1] : cptr->name;
-
- if (MyUser(sptr))
- {
- if (!strncmp("Local Kill", comment, 10) || !strncmp(comment, "Killed", 6))
- comment = parv[0];
- if (sptr->user)
- {
- Link *lp;
- for (lp = sptr->user->channel; lp; lp = lp->next)
- if (can_send(sptr, lp->value.chptr) != 0)
- return exit_client(cptr, sptr, sptr, "Signed off");
- }
- }
- if (strlen(comment) > (size_t)TOPICLEN)
- comment[TOPICLEN] = '\0';
- return IsServer(sptr) ? 0 : exit_client(cptr, sptr, sptr, comment);
-}
-
-/*
- * m_kill
- *
- * parv[0] = sender prefix
- * parv[1] = kill victim
- * parv[parc-1] = kill path
- */
-int m_kill(aClient *cptr, aClient *sptr, int parc, char *parv[])
-{
- aClient *acptr;
- char *inpath = cptr->name;
- char *user, *path, *killer;
- int chasing = 0;
-
- if (parc < 3 || *parv[1] == '\0')
- {
- sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "KILL");
- return 0;
- }
-
- user = parv[1];
- path = parv[parc - 1]; /* Either defined or NULL (parc >= 3) */
-
-#ifdef OPER_KILL
- if (!IsPrivileged(cptr))
- {
- sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
- return 0;
- }
-#else
- if (!IsServer(cptr))
- {
- sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
- return 0;
- }
-#endif
- if (IsAnOper(cptr))
- {
- if (BadPtr(path))
- {
- sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "KILL");
- return 0;
- }
- if (strlen(path) > (size_t)TOPICLEN)
- path[TOPICLEN] = '\0';
- }
-
- if (MyUser(sptr) || Protocol(cptr) < 10)
- {
- if (!(acptr = FindClient(user)))
- {
- /*
- * If the user has recently changed nick, we automaticly
- * rewrite the KILL for this new nickname--this keeps
- * servers in synch when nick change and kill collide
- */
- if (!(acptr = get_history(user, (long)15)))
- {
- sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], user);
- return 0;
- }
- sendto_one(sptr, ":%s NOTICE %s :Changed KILL %s into %s",
- me.name, parv[0], user, acptr->name);
- chasing = 1;
- }
- }
- else if (!(acptr = findNUser(user)))
- {
- if (Protocol(cptr) < 10 && IsUser(sptr))
- sendto_one(sptr,
- ":%s NOTICE %s :KILL target disconnected before I got him :(",
- me.name, parv[0]);
- else if (IsUser(sptr))
- sendto_one(sptr,
- "%s NOTICE %s%s :KILL target disconnected before I got him :(",
- NumServ(&me), NumNick(sptr));
- return 0;
- }
- if (!MyConnect(acptr) && IsLocOp(cptr))
- {
- sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
- return 0;
- }
- if (IsServer(acptr) || IsMe(acptr))
- {
- sendto_one(sptr, err_str(ERR_CANTKILLSERVER), me.name, parv[0]);
- return 0;
- }
-
- /* if the user is +k, prevent a kill from local user */
- if (IsChannelService(acptr) && MyUser(sptr))
- {
- sendto_one(sptr, err_str(ERR_ISCHANSERVICE), me.name,
- parv[0], "KILL", acptr->name);
- return 0;
- }
-
-#ifdef LOCAL_KILL_ONLY
- if (MyConnect(sptr) && !MyConnect(acptr))
- {
- sendto_one(sptr, ":%s NOTICE %s :Nick %s isnt on your server",
- me.name, parv[0], acptr->name);
- return 0;
- }
-#endif
- if (!IsServer(cptr))
- {
- /*
- * The kill originates from this server, initialize path.
- * (In which case the 'path' may contain user suplied
- * explanation ...or some nasty comment, sigh... >;-)
- *
- * ...!operhost!oper
- * ...!operhost!oper (comment)
- */
- inpath = cptr->user->host;
- if (!BadPtr(path))
- {
- sprintf_irc(buf,
- "%s%s (%s)", cptr->name, IsOper(sptr) ? "" : "(L)", path);
- path = buf;
- }
- else
- path = cptr->name;
- }
- else if (BadPtr(path))
- path = "*no-path*"; /* Bogus server sending??? */
- /*
- * Notify all *local* opers about the KILL (this includes the one
- * originating the kill, if from this server--the special numeric
- * reply message is not generated anymore).
- *
- * Note: "acptr->name" is used instead of "user" because we may
- * have changed the target because of the nickname change.
- */
- if (IsLocOp(sptr) && !MyConnect(acptr))
- {
- sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
- return 0;
- }
- sendto_op_mask(IsServer(sptr) ? SNO_SERVKILL : SNO_OPERKILL,
- "Received KILL message for %s. From %s Path: %s!%s",
- acptr->name, parv[0], inpath, path);
-#if defined(USE_SYSLOG) && defined(SYSLOG_KILL)
- if (MyUser(acptr))
- { /* get more infos when your local
- clients are killed -- _dl */
- if (IsServer(sptr))
- syslog(LOG_DEBUG,
- "A local client %s!%s@%s KILLED from %s [%s] Path: %s!%s)",
- acptr->name, acptr->user->username, acptr->user->host,
- parv[0], sptr->name, inpath, path);
- else
- syslog(LOG_DEBUG,
- "A local client %s!%s@%s KILLED by %s [%s!%s@%s] (%s!%s)",
- acptr->name, acptr->user->username, acptr->user->host,
- parv[0], sptr->name, sptr->user->username, sptr->user->host,
- inpath, path);
- }
- else if (IsOper(sptr))
- syslog(LOG_DEBUG, "KILL From %s For %s Path %s!%s",
- parv[0], acptr->name, inpath, path);
-#endif
- /*
- * And pass on the message to other servers. Note, that if KILL
- * was changed, the message has to be sent to all links, also
- * back.
- * Suicide kills are NOT passed on --SRB
- */
- if (!MyConnect(acptr) || !MyConnect(sptr) || !IsAnOper(sptr))
- {
- sendto_lowprot_butone(cptr, 9, ":%s KILL %s :%s!%s",
- parv[0], acptr->name, inpath, path);
- sendto_highprot_butone(cptr, 10, ":%s KILL %s%s :%s!%s",
- parv[0], NumNick(acptr), inpath, path);
-#ifndef NO_PROTOCOL9
- if (chasing && IsServer(cptr)) /* Can be removed when all are Protocol 10 */
- sendto_one(cptr, ":%s KILL %s :%s!%s",
- me.name, acptr->name, inpath, path);
-#endif
- /* We *can* have crossed a NICK with this numeric... --Run */
- /* Note the following situation:
- * KILL SAA --> X
- * <-- S NICK ... SAA | <-- SAA QUIT <-- S NICK ... SAA <-- SQUIT S
- * Where the KILL reaches point X before the QUIT does.
- * This would then *still* cause an orphan because the KILL doesn't reach S
- * (because of the SQUIT), the QUIT is ignored (because of the KILL)
- * and the second NICK ... SAA causes an orphan on the server at the
- * right (which then isn't removed when the SQUIT arrives).
- * Therefore we still need to detect numeric nick collisions too.
- */
- if (MyConnect(acptr) && IsServer(cptr) && Protocol(cptr) > 9)
- sendto_one(cptr, "%s KILL %s%s :%s!%s (Ghost5)",
- NumServ(&me), NumNick(acptr), inpath, path);
- acptr->flags |= FLAGS_KILLED;
- }
-
- /*
- * Tell the victim she/he has been zapped, but *only* if
- * the victim is on current server--no sense in sending the
- * notification chasing the above kill, it won't get far
- * anyway (as this user don't exist there any more either)
- */
- if (MyConnect(acptr))
- sendto_prefix_one(acptr, sptr, ":%s KILL %s :%s!%s",
- parv[0], acptr->name, inpath, path);
- /*
- * Set FLAGS_KILLED. This prevents exit_one_client from sending
- * the unnecessary QUIT for this. (This flag should never be
- * set in any other place)
- */
- if (MyConnect(acptr) && MyConnect(sptr) && IsAnOper(sptr))
- sprintf_irc(buf2, "Local kill by %s (%s)", sptr->name,
- BadPtr(parv[parc - 1]) ? sptr->name : parv[parc - 1]);
- else
- {
- if ((killer = strchr(path, ' ')))
- {
- while (*killer && *killer != '!')
- killer--;
- if (!*killer)
- killer = path;
- else
- killer++;
- }
- else
- killer = path;
- sprintf_irc(buf2, "Killed (%s)", killer);
- }
- return exit_client(cptr, acptr, sptr, buf2);
-}
-
-/*
- * m_away - Added 14 Dec 1988 by jto.
- *
- * parv[0] = sender prefix
- * parv[1] = away message
- */
-int m_away(aClient *cptr, aClient *sptr, int parc, char *parv[])
-{
- Reg1 char *away, *awy2 = parv[1];
-
- away = sptr->user->away;
-
- if (parc < 2 || !*awy2)
- {
- /* Marking as not away */
- if (away)
- {
- RunFree(away);
- sptr->user->away = NULL;
- }
- sendto_serv_butone(cptr, ":%s AWAY", parv[0]);
- if (MyConnect(sptr))
- sendto_one(sptr, rpl_str(RPL_UNAWAY), me.name, parv[0]);
- return 0;
- }
-
- /* Marking as away */
-
- if (strlen(awy2) > (size_t)TOPICLEN)
- awy2[TOPICLEN] = '\0';
- sendto_serv_butone(cptr, ":%s AWAY :%s", parv[0], awy2);
-
- if (away)
- away = (char *)RunRealloc(away, strlen(awy2) + 1);
- else
- away = (char *)RunMalloc(strlen(awy2) + 1);
-
- sptr->user->away = away;
- strcpy(away, awy2);
- if (MyConnect(sptr))
- sendto_one(sptr, rpl_str(RPL_NOWAWAY), me.name, parv[0]);
- return 0;
-}
-
-/*
- * m_ping
- *
- * parv[0] = sender prefix
- * parv[1] = origin
- * parv[2] = destination
- */
-int m_ping(aClient *cptr, aClient *sptr, int parc, char *parv[])
-{
- aClient *acptr;
- char *origin, *destination;
-
- if (parc < 2 || *parv[1] == '\0')
- {
- sendto_one(sptr, err_str(ERR_NOORIGIN), me.name, parv[0]);
- return 0;
- }
- origin = parv[1];
- destination = parv[2]; /* Will get NULL or pointer (parc >= 2!!) */
-
- acptr = FindClient(origin);
- if (acptr && acptr != sptr)
- origin = cptr->name;
-
- if (!BadPtr(destination) && strCasediff(destination, me.name) != 0)
- {
- if ((acptr = FindServer(destination)))
- sendto_one(acptr, ":%s PING %s :%s", parv[0], origin, destination);
- else
- {
- sendto_one(sptr, err_str(ERR_NOSUCHSERVER),
- me.name, parv[0], destination);
- return 0;
- }
- }
- else
- sendto_one(sptr, ":%s PONG %s :%s", me.name, me.name, origin);
- return 0;
-}
-
-/*
- * m_pong
- *
- * parv[0] = sender prefix
- * parv[1] = origin
- * parv[2] = destination
- */
-int m_pong(aClient *cptr, aClient *sptr, int parc, char *parv[])
-{
- aClient *acptr;
- char *origin, *destination;
-
- if (MyUser(sptr))
- return 0;
-
- /* Check to see if this is a PONG :cookie reply from an
- * unregistered user. If so, process it. -record */
-
- if ((!IsRegistered(sptr)) && (sptr->cookie != 0) &&
- (sptr->cookie != COOKIE_VERIFIED) && (parc > 1))
- {
- if (atol(parv[parc - 1]) == (long)sptr->cookie)
- {
- sptr->cookie = COOKIE_VERIFIED;
- if (sptr->user && *sptr->user->host && sptr->name[0]) /* NICK and
- USER OK */
- return register_user(cptr, sptr, sptr->name, sptr->user->username);
- }
- else
- sendto_one(sptr, ":%s %d %s :To connect, type /QUOTE PONG %u",
- me.name, ERR_BADPING, sptr->name, sptr->cookie);
-
- return 0;
- }
-
- if (parc < 2 || *parv[1] == '\0')
- {
- sendto_one(sptr, err_str(ERR_NOORIGIN), me.name, parv[0]);
- return 0;
- }
-
- origin = parv[1];
- destination = parv[2];
- cptr->flags &= ~FLAGS_PINGSENT;
- sptr->flags &= ~FLAGS_PINGSENT;
-
- if (!BadPtr(destination) && strCasediff(destination, me.name) != 0)
- {
- if ((acptr = FindClient(destination)))
- sendto_one(acptr, ":%s PONG %s %s", parv[0], origin, destination);
- else
- {
- sendto_one(sptr, err_str(ERR_NOSUCHSERVER),
- me.name, parv[0], destination);
- return 0;
+
+ /*
+ * If the client hasn't gotten a cookie-ping yet,
+ * choose a cookie and send it. -record!jegelhof@cloud9.net
+ */
+ if (!sptr->cookie) {
+ do {
+ sptr->cookie = (ircrandom() & 0x7fffffff);
+ } while (!sptr->cookie);
+ sendto_one(cptr, "PING :%u", sptr->cookie);
+ }
+ else if (*sptr->user->host && sptr->cookie == COOKIE_VERIFIED) {
+ /*
+ * USER and PONG already received, now we have NICK.
+ * register_user may reject the client and call exit_client
+ * for it - must test this and exit m_nick too !
+ */
+ sptr->lastnick = TStime(); /* Always local client */
+ if (register_user(cptr, sptr, nick, sptr->user->username) == CPTR_KILLED)
+ return CPTR_KILLED;
}
}
-#ifdef DEBUGMODE
- else
- Debug((DEBUG_NOTICE, "PONG: %s %s",
- origin, destination ? destination : "*"));
-#endif
return 0;
}
-static char umode_buf[2 * sizeof(user_modes) / sizeof(int)];
/*
- * added Sat Jul 25 07:30:42 EST 1992
+ * add_target
+ *
+ * sptr must be a local client!
+ *
+ * Cannonifies target for client `sptr'.
*/
-static void send_umode_out(aClient *cptr, aClient *sptr, int old)
+void add_target(struct Client *sptr, void *target)
{
- Reg1 int i;
- Reg2 aClient *acptr;
-
- send_umode(NULL, sptr, old, SEND_UMODES);
-
- for (i = highest_fd; i >= 0; i--)
- if ((acptr = loc_clients[i]) && IsServer(acptr) &&
- (acptr != cptr) && (acptr != sptr) && *umode_buf)
- sendto_one(acptr, ":%s MODE %s :%s", sptr->name, sptr->name, umode_buf);
+ unsigned char *p;
+ unsigned int tmp = ((size_t)target & 0xffff00) >> 8;
+ unsigned char hash = (tmp * tmp) >> 12;
+ if (sptr->targets[0] == hash) /* Last person that we messaged ourself? */
+ return;
+ for (p = sptr->targets; p < &sptr->targets[MAXTARGETS - 1];)
+ if (*++p == hash)
+ return; /* Already in table */
- if (cptr && MyUser(cptr))
- send_umode(cptr, sptr, old, ALL_UMODES);
+ /* New target */
+ memmove(&sptr->targets[RESERVEDTARGETS + 1],
+ &sptr->targets[RESERVEDTARGETS], MAXTARGETS - RESERVEDTARGETS - 1);
+ sptr->targets[RESERVEDTARGETS] = hash;
+ return;
}
/*
- * m_oper
- * parv[0] = sender prefix
- * parv[1] = oper name
- * parv[2] = oper password
+ * check_target_limit
+ *
+ * sptr must be a local client !
+ *
+ * Returns 'true' (1) when too many targets are addressed.
+ * Returns 'false' (0) when it's ok to send to this target.
*/
-int m_oper(aClient *cptr, aClient *sptr, int parc, char *parv[])
+int check_target_limit(struct Client *sptr, void *target, const char *name,
+ int created)
{
- aConfItem *aconf;
- char *name, *password, *encr;
-#ifdef CRYPT_OPER_PASSWORD
- char salt[3];
-#endif /* CRYPT_OPER_PASSWORD */
-
- name = parc > 1 ? parv[1] : NULL;
- password = parc > 2 ? parv[2] : NULL;
-
- if (!IsServer(cptr) && (BadPtr(name) || BadPtr(password)))
- {
- sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "OPER");
- return 0;
- }
-
- /* if message arrived from server, trust it, and set to oper */
-
- if ((IsServer(cptr) || IsMe(cptr)) && !IsOper(sptr))
- {
- ++nrof.opers;
- sptr->flags |= FLAGS_OPER;
- sendto_serv_butone(cptr, ":%s MODE %s :+o", parv[0], parv[0]);
- if (IsMe(cptr))
- sendto_one(sptr, rpl_str(RPL_YOUREOPER), me.name, parv[0]);
- return 0;
- }
- else if (IsAnOper(sptr))
- {
- if (MyConnect(sptr))
- sendto_one(sptr, rpl_str(RPL_YOUREOPER), me.name, parv[0]);
- return 0;
- }
- if (!(aconf = find_conf_exact(name, sptr->username, sptr->sockhost,
- CONF_OPS)) && !(aconf = find_conf_exact(name, sptr->username,
- inetntoa(cptr->ip), CONF_OPS)))
- {
- sendto_one(sptr, err_str(ERR_NOOPERHOST), me.name, parv[0]);
- sendto_realops("Failed OPER attempt by %s (%s@%s)",
- parv[0], sptr->user->username, sptr->sockhost);
+ unsigned char *p;
+ unsigned int tmp = ((size_t)target & 0xffff00) >> 8;
+ unsigned char hash = (tmp * tmp) >> 12;
+ if (sptr->targets[0] == hash) /* Same target as last time ? */
return 0;
- }
-#ifdef CRYPT_OPER_PASSWORD
- /* use first two chars of the password they send in as salt */
-
- /* passwd may be NULL. Head it off at the pass... */
- salt[0] = '\0';
- if (password && aconf->passwd)
- {
- salt[0] = aconf->passwd[0];
- salt[1] = aconf->passwd[1];
- salt[2] = '\0';
- encr = crypt(password, salt);
- }
- else
- encr = "";
-#else
- encr = password;
-#endif /* CRYPT_OPER_PASSWORD */
+ for (p = sptr->targets; p < &sptr->targets[MAXTARGETS - 1];)
+ if (*++p == hash)
+ {
+ memmove(&sptr->targets[1], &sptr->targets[0], p - sptr->targets);
+ sptr->targets[0] = hash;
+ return 0;
+ }
- if ((aconf->status & CONF_OPS) &&
- !strcmp(encr, aconf->passwd) && attach_conf(sptr, aconf) == ACR_OK)
+ /* New target */
+ if (!created)
{
- int old = (sptr->flags & ALL_UMODES);
-
-#ifdef OPER_REMOTE
- if (aconf->status == CONF_LOCOP)
- {
-#else
- if (!IsLocal(sptr) || aconf->status == CONF_LOCOP)
+ if (CurrentTime < sptr->nexttarget)
{
-#endif
- ClearOper(sptr);
- SetLocOp(sptr);
+ if (sptr->nexttarget - CurrentTime < TARGET_DELAY + 8) /* No server flooding */
+ {
+ sptr->nexttarget += 2;
+ sendto_one(sptr, err_str(ERR_TARGETTOOFAST),
+ me.name, sptr->name, name, sptr->nexttarget - CurrentTime);
+ }
+ return 1;
}
else
{
- /* prevent someone from being both oper and local oper */
- ClearLocOp(sptr);
- SetOper(sptr);
- ++nrof.opers;
- }
- sendto_ops("%s (%s@%s) is now operator (%c)", parv[0],
- sptr->user->username, sptr->sockhost, IsOper(sptr) ? 'O' : 'o');
- sptr->flags |= (FLAGS_WALLOP | FLAGS_SERVNOTICE | FLAGS_DEBUG);
- set_snomask(sptr, SNO_OPERDEFAULT, SNO_ADD);
- send_umode_out(cptr, sptr, old);
- sendto_one(sptr, rpl_str(RPL_YOUREOPER), me.name, parv[0]);
-#if !defined(CRYPT_OPER_PASSWORD) && (defined(FNAME_OPERLOG) ||\
- (defined(USE_SYSLOG) && defined(SYSLOG_OPER)))
- encr = "";
-#endif
-#if defined(USE_SYSLOG) && defined(SYSLOG_OPER)
- syslog(LOG_INFO, "OPER (%s) (%s) by (%s!%s@%s)",
- name, encr, parv[0], sptr->user->username, sptr->sockhost);
-#endif
-#ifdef FNAME_OPERLOG
- if (IsUser(sptr))
- write_log(FNAME_OPERLOG,
- "%s OPER (%s) (%s) by (%s!%s@%s)\n", myctime(now), name,
- encr, parv[0], sptr->user->username, sptr->sockhost);
+#ifdef GODMODE
+ sendto_one(sptr, ":%s NOTICE %s :New target: %s; ft " TIME_T_FMT,
+ me.name, sptr->name, name, (CurrentTime - sptr->nexttarget) / TARGET_DELAY);
#endif
+ sptr->nexttarget += TARGET_DELAY;
+ if (sptr->nexttarget < CurrentTime - (TARGET_DELAY * (MAXTARGETS - 1)))
+ sptr->nexttarget = CurrentTime - (TARGET_DELAY * (MAXTARGETS - 1));
+ }
}
- else
- {
- detach_conf(sptr, aconf);
- sendto_one(sptr, err_str(ERR_PASSWDMISMATCH), me.name, parv[0]);
- sendto_realops("Failed OPER attempt by %s (%s@%s)",
- parv[0], sptr->user->username, sptr->sockhost);
- }
+ memmove(&sptr->targets[1], &sptr->targets[0], MAXTARGETS - 1);
+ sptr->targets[0] = hash;
return 0;
}
/*
- * m_pass
+ * whisper - called from m_cnotice and m_cprivmsg.
*
* parv[0] = sender prefix
- * parv[1] = password
+ * parv[1] = nick
+ * parv[2] = #channel
+ * parv[3] = Private message text
+ *
+ * Added 971023 by Run.
+ * Reason: Allows channel operators to sent an arbitrary number of private
+ * messages to users on their channel, avoiding the max.targets limit.
+ * Building this into m_private would use too much cpu because we'd have
+ * to a cross channel lookup for every private message!
+ * Note that we can't allow non-chan ops to use this command, it would be
+ * abused by mass advertisers.
+ *
*/
-int m_pass(aClient *cptr, aClient *sptr, int parc, char *parv[])
+int whisper(struct Client* source, const char* nick, const char* channel,
+ const char* text, int is_notice)
{
- char *password = parc > 1 ? parv[1] : NULL;
+ struct Client* dest;
+ struct Channel* chptr;
+ struct Membership* membership;
- if (BadPtr(password))
- {
- sendto_one(cptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "PASS");
+ assert(0 != source);
+ assert(0 != nick);
+ assert(0 != channel);
+ assert(MyUser(source));
+
+ if (!(dest = FindUser(nick))) {
+ sendto_one(source, err_str(ERR_NOSUCHNICK), me.name, source->name, nick);
return 0;
}
- if (!MyConnect(sptr) || (!IsUnknown(cptr) && !IsHandshake(cptr)))
- {
- sendto_one(cptr, err_str(ERR_ALREADYREGISTRED), me.name, parv[0]);
+ if (!(chptr = FindChannel(channel))) {
+ sendto_one(source, err_str(ERR_NOSUCHCHANNEL), me.name, source->name, channel);
return 0;
}
- strncpy(cptr->passwd, password, sizeof(cptr->passwd) - 1);
- return 0;
-}
-
-/*
- * m_userhost
- *
- * Added by Darren Reed 13/8/91 to aid clients and reduce the need for
- * complicated requests like WHOIS.
- *
- * Returns user/host information only (no spurious AWAY labels or channels).
- *
- * Rewritten to speed it up by Carlo Wood 3/8/97.
- */
-int m_userhost(aClient *UNUSED(cptr), aClient *sptr, int parc, char *parv[])
-{
- Reg1 char *s;
- Reg2 int i, j = 5;
- char *p = NULL, *sbuf;
- aClient *acptr;
-
- if (parc < 2)
- {
- sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "USERHOST");
+ /*
+ * compare both users channel lists, instead of the channels user list
+ * since the link is the same, this should be a little faster for channels
+ * with a lot of users
+ */
+ for (membership = source->user->channel; membership; membership = membership->next_channel) {
+ if (chptr == membership->channel)
+ break;
+ }
+ if (0 == membership) {
+ sendto_one(source, err_str(ERR_NOTONCHANNEL), me.name, source->name, chptr->chname);
return 0;
}
-
- sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERHOST), me.name, parv[0]);
- for (i = j, s = strtoken(&p, parv[1], " "); i && s;
- s = strtoken(&p, (char *)NULL, " "), i--)
- if ((acptr = FindUser(s)))
- {
- if (i < j)
- *sbuf++ = ' ';
- sbuf = sprintf_irc(sbuf, "%s%s=%c%s@%s", acptr->name,
- IsAnOper(acptr) ? "*" : "", (acptr->user->away) ? '-' : '+',
- acptr->user->username, acptr->user->host);
- }
- else
- {
- if (i < j)
- sendbufto_one(sptr);
- sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], s);
- sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERHOST), me.name, parv[0]);
- j = i - 1;
- }
- if (j)
- sendbufto_one(sptr);
+ if (!IsVoicedOrOpped(membership)) {
+ sendto_one(source, err_str(ERR_VOICENEEDED), me.name, source->name, chptr->chname);
+ return 0;
+ }
+ /*
+ * lookup channel in destination
+ */
+ assert(0 != dest->user);
+ for (membership = dest->user->channel; membership; membership = membership->next_channel) {
+ if (chptr == membership->channel)
+ break;
+ }
+ if (0 == membership || IsZombie(membership)) {
+ sendto_one(source, err_str(ERR_USERNOTINCHANNEL), me.name,
+ source->name, dest->name, chptr->chname);
+ return 0;
+ }
+ if (is_silenced(source, dest))
+ return 0;
+
+ if (dest->user->away)
+ sendto_one(source, rpl_str(RPL_AWAY), me.name, source->name,
+ dest->name, dest->user->away);
+ if (MyUser(dest))
+ sendto_prefix_one(dest, source, ":%s %s %s :%s",
+ source->name, is_notice ? MSG_NOTICE : MSG_PRIVATE,
+ dest->name, text);
+ else
+ sendto_one(dest, "%s%s %s %s%s :%s",
+ NumNick(source), is_notice ? TOK_NOTICE : TOK_PRIVATE,
+ NumNick(dest), text);
return 0;
}
+
/*
- * m_userip added by Carlo Wood 3/8/97.
- *
- * The same as USERHOST, but with the IP-number instead of the hostname.
+ * added Sat Jul 25 07:30:42 EST 1992
*/
-int m_userip(aClient *UNUSED(cptr), aClient *sptr, int parc, char *parv[])
+void send_umode_out(struct Client *cptr, struct Client *sptr, int old)
{
- Reg1 char *s;
- Reg3 int i, j = 5;
- char *p = NULL, *sbuf;
- aClient *acptr;
+ int i;
+ struct Client *acptr;
- if (parc < 2)
- {
- sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "USERIP");
- return 0;
- }
+ send_umode(NULL, sptr, old, SEND_UMODES);
- sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]);
- for (i = j, s = strtoken(&p, parv[1], " "); i && s;
- s = strtoken(&p, (char *)NULL, " "), i--)
- if ((acptr = FindUser(s)))
- {
- if (i < j)
- *sbuf++ = ' ';
- sbuf = sprintf_irc(sbuf, "%s%s=%c%s@%s", acptr->name,
- IsAnOper(acptr) ? "*" : "", (acptr->user->away) ? '-' : '+',
- acptr->user->username, inetntoa(acptr->ip));
- }
- else
- {
- if (i < j)
- sendbufto_one(sptr);
- sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], s);
- sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]);
- j = i - 1;
- }
- if (i < j)
- sendbufto_one(sptr);
- return 0;
+ for (i = HighestFd; i >= 0; i--) {
+ if ((acptr = LocalClientArray[i]) && IsServer(acptr) &&
+ (acptr != cptr) && (acptr != sptr) && *umodeBuf)
+ sendto_one(acptr, "%s%s " TOK_MODE " %s :%s", NumNick(sptr), sptr->name, umodeBuf);
+ }
+ if (cptr && MyUser(cptr))
+ send_umode(cptr, sptr, old, ALL_UMODES);
}
+
/*
- * m_ison
- *
- * Added by Darren Reed 13/8/91 to act as an efficent user indicator
- * with respect to cpu/bandwidth used. Implemented for NOTIFY feature in
- * clients. Designed to reduce number of whois requests. Can process
- * nicknames in batches as long as the maximum buffer length.
- *
- * format:
- * ISON :nicklist
+ * send_user_info - send user info userip/userhost
+ * NOTE: formatter must put info into buffer and return a pointer to the end of
+ * the data it put in the buffer.
*/
-
-int m_ison(aClient *UNUSED(cptr), aClient *sptr, int parc, char *parv[])
+void send_user_info(struct Client* sptr, char* names, int rpl, InfoFormatter fmt)
{
- Reg1 aClient *acptr;
- Reg2 char *s, **pav = parv;
- Reg3 size_t len;
- char *p = NULL;
-
- if (parc < 2)
- {
- sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "ISON");
- return 0;
- }
-
- sprintf_irc(buf, rpl_str(RPL_ISON), me.name, *parv);
- len = strlen(buf);
- buf[sizeof(buf) - 1] = 0;
-
- for (s = strtoken(&p, *++pav, " "); s; s = strtoken(&p, NULL, " "))
- if ((acptr = FindUser(s)))
- {
- strncat(buf, acptr->name, sizeof(buf) - 1 - len);
- len += strlen(acptr->name);
- if (len >= sizeof(buf) - 1)
- break;
- strcat(buf, " ");
- len++;
+ char* sbuf;
+ char* name;
+ char* p = 0;
+ int arg_count = 0;
+ int users_found = 0;
+ struct Client* acptr;
+ char buf[BUFSIZE * 2];
+
+ assert(0 != sptr);
+ assert(0 != names);
+ assert(0 != fmt);
+
+ sbuf = sprintf_irc(buf, rpl_str(rpl), me.name, sptr->name);
+
+ for (name = ircd_strtok(&p, names, " "); name; name = ircd_strtok(&p, 0, " ")) {
+ if ((acptr = FindUser(name))) {
+ if (users_found++)
+ *sbuf++ = ' ';
+ sbuf = (*fmt)(acptr, sbuf);
}
- sendto_one(sptr, "%s", buf);
- return 0;
+ else
+ send_error_to_client(sptr, ERR_NOSUCHNICK, name);
+ if (5 == ++arg_count)
+ break;
+ }
+ if (users_found)
+ send_buffer(sptr, buf);
}
+
/*
- * m_umode() added 15/10/91 By Darren Reed.
+ * set_user_mode() added 15/10/91 By Darren Reed.
*
* parv[0] - sender
* parv[1] - username to change mode for
* parv[2] - modes to change
*/
-int m_umode(aClient *cptr, aClient *sptr, int parc, char *parv[])
+int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
{
- Reg1 int flag;
- Reg2 int *s;
- Reg3 char **p, *m;
- aClient *acptr;
- int what, setflags;
- snomask_t tmpmask = 0;
+ char** p;
+ char* m;
+ struct Client *acptr;
+ int what;
+ int i;
+ int setflags;
+ unsigned int tmpmask = 0;
int snomask_given = 0;
+ char buf[BUFSIZE];
what = MODE_ADD;
if (parc < 2)
- {
- sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "MODE");
- return 0;
- }
+ return need_more_params(sptr, "MODE");
if (!(acptr = FindUser(parv[1])))
{
{
if (IsServer(cptr))
sendto_ops_butone(NULL, &me, ":%s WALLOPS :MODE for User %s From %s!%s",
- me.name, parv[1], cptr->name, sptr->name);
+ me.name, parv[1], cptr->name, sptr->name);
else
sendto_one(sptr, err_str(ERR_USERSDONTMATCH), me.name, parv[0]);
return 0;
{
m = buf;
*m++ = '+';
- for (s = user_modes; (flag = *s) && (m - buf < BUFSIZE - 4); s += 2)
- if (sptr->flags & flag)
- *m++ = (char)(*(s + 1));
+ for (i = 0; i < USERMODELIST_SIZE; ++i) {
+ if ( (userModeList[i].flag & sptr->flags))
+ *m++ = userModeList[i].c;
+ }
*m = '\0';
sendto_one(sptr, rpl_str(RPL_UMODEIS), me.name, parv[0], buf);
if ((sptr->flags & FLAGS_SERVNOTICE) && MyConnect(sptr)
- && sptr->snomask !=
- (unsigned int)(IsOper(sptr) ? SNO_OPERDEFAULT : SNO_DEFAULT))
+ && sptr->snomask !=
+ (unsigned int)(IsOper(sptr) ? SNO_OPERDEFAULT : SNO_DEFAULT))
sendto_one(sptr, rpl_str(RPL_SNOMASK), me.name, parv[0], sptr->snomask,
- sptr->snomask);
+ sptr->snomask);
return 0;
}
- /* find flags already set for user */
+ /*
+ * find flags already set for user
+ * why not just copy them?
+ */
+ setflags = sptr->flags;
+#if 0
setflags = 0;
- for (s = user_modes; (flag = *s); s += 2)
- if (sptr->flags & flag)
- setflags |= flag;
+ for (i = 0; i < USERMODELIST_SIZE; ++i) {
+ if (sptr->flags & userModeList[i].flag)
+ setflags |= userModeList[i].flag;
+ }
+#endif
if (MyConnect(sptr))
tmpmask = sptr->snomask;
/*
* parse mode change string(s)
*/
- for (p = &parv[2]; *p; p++) /* p is changed in loop too */
- for (m = *p; *m; m++)
- switch (*m)
- {
- case '+':
- what = MODE_ADD;
- break;
- case '-':
- what = MODE_DEL;
- break;
- case 's':
- if (*(p + 1) && is_snomask(*(p + 1)))
- {
- snomask_given = 1;
- tmpmask = umode_make_snomask(tmpmask, *++p, what);
- tmpmask &= (IsAnOper(sptr) ? SNO_ALL : SNO_USER);
- }
- else
- tmpmask = (what == MODE_ADD) ?
- (IsAnOper(sptr) ? SNO_OPERDEFAULT : SNO_DEFAULT) : 0;
- if (tmpmask)
- sptr->flags |= FLAGS_SERVNOTICE;
- else
- sptr->flags &= ~FLAGS_SERVNOTICE;
- break;
- /*
- * We may not get these, but they shouldnt be in default:
- */
- case ' ':
- case '\n':
- case '\r':
- case '\t':
- break;
- default:
- for (s = user_modes; (flag = *s); s += 2)
- if (*m == (char)(*(s + 1)))
- {
- if (what == MODE_ADD)
- sptr->flags |= flag;
- else if ((flag & (FLAGS_OPER | FLAGS_LOCOP)))
- {
- sptr->flags &= ~(FLAGS_OPER | FLAGS_LOCOP);
- if (MyConnect(sptr))
- tmpmask = sptr->snomask & ~SNO_OPER;
- }
- /* allow either -o or -O to reset all operator status's... */
- else
- sptr->flags &= ~flag;
- break;
- }
- if (flag == 0 && MyConnect(sptr))
- sendto_one(sptr, err_str(ERR_UMODEUNKNOWNFLAG), me.name, parv[0]);
- break;
+ for (p = &parv[2]; *p; p++) { /* p is changed in loop too */
+ for (m = *p; *m; m++) {
+ switch (*m) {
+ case '+':
+ what = MODE_ADD;
+ break;
+ case '-':
+ what = MODE_DEL;
+ break;
+ case 's':
+ if (*(p + 1) && is_snomask(*(p + 1))) {
+ snomask_given = 1;
+ tmpmask = umode_make_snomask(tmpmask, *++p, what);
+ tmpmask &= (IsAnOper(sptr) ? SNO_ALL : SNO_USER);
+ }
+ else
+ tmpmask = (what == MODE_ADD) ?
+ (IsAnOper(sptr) ? SNO_OPERDEFAULT : SNO_DEFAULT) : 0;
+ if (tmpmask)
+ sptr->flags |= FLAGS_SERVNOTICE;
+ else
+ sptr->flags &= ~FLAGS_SERVNOTICE;
+ break;
+ case 'w':
+ if (what == MODE_ADD)
+ SetWallops(sptr);
+ else
+ ClearWallops(sptr);
+ break;
+ case 'o':
+ if (what == MODE_ADD)
+ SetOper(sptr);
+ else {
+ sptr->flags &= ~(FLAGS_OPER | FLAGS_LOCOP);
+ if (MyConnect(sptr)) {
+ tmpmask = sptr->snomask & ~SNO_OPER;
+ sptr->handler = CLIENT_HANDLER;
+ }
+ }
+ break;
+ case 'O':
+ if (what == MODE_ADD)
+ SetLocOp(sptr);
+ else {
+ sptr->flags &= ~(FLAGS_OPER | FLAGS_LOCOP);
+ if (MyConnect(sptr)) {
+ tmpmask = sptr->snomask & ~SNO_OPER;
+ sptr->handler = CLIENT_HANDLER;
+ }
+ }
+ break;
+ case 'i':
+ if (what == MODE_ADD)
+ SetInvisible(sptr);
+ else
+ ClearInvisible(sptr);
+ break;
+ case 'd':
+ if (what == MODE_ADD)
+ SetDeaf(sptr);
+ else
+ ClearDeaf(sptr);
+ break;
+ case 'k':
+ if (what == MODE_ADD)
+ SetChannelService(sptr);
+ else
+ ClearChannelService(sptr);
+ break;
+ case 'g':
+ if (what == MODE_ADD)
+ SetDebug(sptr);
+ else
+ ClearDebug(sptr);
+ break;
+ default:
+ break;
}
+ }
+ }
/*
+ * Evaluate rules for new user mode
* Stop users making themselves operators too easily:
*/
if (!(setflags & FLAGS_OPER) && IsOper(sptr) && !IsServer(cptr))
ClearOper(sptr);
if (!(setflags & FLAGS_LOCOP) && IsLocOp(sptr) && !IsServer(cptr))
- sptr->flags &= ~FLAGS_LOCOP;
+ ClearLocOp(sptr);
+#ifdef WALLOPS_OPER_ONLY
+ /*
+ * only send wallops to opers
+ */
+ if (!IsAnOper(sptr) && !(setflags & FLAGS_WALLOP) && !IsServer(cptr))
+ ClearWallops(sptr);
+#endif
if ((setflags & (FLAGS_OPER | FLAGS_LOCOP)) && !IsAnOper(sptr) &&
MyConnect(sptr))
det_confs_butmask(sptr, CONF_CLIENT & ~CONF_OPS);
- /* new umode; servers can set it, local users cannot;
- * prevents users from /kick'ing or /mode -o'ing */
+ /*
+ * new umode; servers can set it, local users cannot;
+ * prevents users from /kick'ing or /mode -o'ing
+ */
if (!(setflags & FLAGS_CHSERV) && !IsServer(cptr))
- sptr->flags &= ~FLAGS_CHSERV;
+ ClearChannelService(sptr);
/*
* Compare new flags with old flags and send string which
* will cause servers to update correctly.
*/
if ((setflags & FLAGS_OPER) && !IsOper(sptr))
- --nrof.opers;
+ --UserStats.opers;
if (!(setflags & FLAGS_OPER) && IsOper(sptr))
- ++nrof.opers;
+ ++UserStats.opers;
if ((setflags & FLAGS_INVISIBLE) && !IsInvisible(sptr))
- --nrof.inv_clients;
+ --UserStats.inv_clients;
if (!(setflags & FLAGS_INVISIBLE) && IsInvisible(sptr))
- ++nrof.inv_clients;
+ ++UserStats.inv_clients;
send_umode_out(cptr, sptr, setflags);
- if (MyConnect(sptr))
- {
+ if (MyConnect(sptr)) {
if (tmpmask != sptr->snomask)
set_snomask(sptr, tmpmask, SNO_SET);
if (sptr->snomask && snomask_given)
sendto_one(sptr, rpl_str(RPL_SNOMASK), me.name, sptr->name,
- sptr->snomask, sptr->snomask);
+ sptr->snomask, sptr->snomask);
}
return 0;
* Build umode string for BURST command
* --Run
*/
-char *umode_str(aClient *cptr)
+char *umode_str(struct Client *cptr)
{
- char *m = umode_buf; /* Maximum string size: "owidg\0" */
- int *s, flag, c_flags;
+ char* m = umodeBuf; /* Maximum string size: "owidg\0" */
+ int i;
+ int c_flags;
- c_flags = cptr->flags & SEND_UMODES; /* cleaning up the original code */
+ c_flags = cptr->flags & SEND_UMODES; /* cleaning up the original code */
- for (s = user_modes; (flag = *s); s += 2)
- if ((c_flags & flag))
- *m++ = *(s + 1);
+ for (i = 0; i < USERMODELIST_SIZE; ++i) {
+ if ( (c_flags & userModeList[i].flag))
+ *m++ = userModeList[i].c;
+ }
*m = '\0';
- return umode_buf; /* Note: static buffer, gets
- overwritten by send_umode() */
+ return umodeBuf; /* Note: static buffer, gets
+ overwritten by send_umode() */
}
/*
* Send the MODE string for user (user) to connection cptr
* -avalon
*/
-void send_umode(aClient *cptr, aClient *sptr, int old, int sendmask)
+void send_umode(struct Client *cptr, struct Client *sptr, int old, int sendmask)
{
- Reg1 int *s, flag;
- Reg2 char *m;
+ int i;
+ int flag;
+ char *m;
int what = MODE_NULL;
/*
- * Build a string in umode_buf to represent the change in the user's
+ * Build a string in umodeBuf to represent the change in the user's
* mode between the new (sptr->flag) and 'old'.
*/
- m = umode_buf;
+ m = umodeBuf;
*m = '\0';
- for (s = user_modes; (flag = *s); s += 2)
- {
+ for (i = 0; i < USERMODELIST_SIZE; ++i) {
+ flag = userModeList[i].flag;
if (MyUser(sptr) && !(flag & sendmask))
continue;
- if ((flag & old) && !(sptr->flags & flag))
+ if ( (flag & old) && !(sptr->flags & flag))
{
if (what == MODE_DEL)
- *m++ = *(s + 1);
+ *m++ = userModeList[i].c;
else
{
- what = MODE_DEL;
- *m++ = '-';
- *m++ = *(s + 1);
+ what = MODE_DEL;
+ *m++ = '-';
+ *m++ = userModeList[i].c;
}
}
else if (!(flag & old) && (sptr->flags & flag))
{
if (what == MODE_ADD)
- *m++ = *(s + 1);
+ *m++ = userModeList[i].c;
else
{
- what = MODE_ADD;
- *m++ = '+';
- *m++ = *(s + 1);
+ what = MODE_ADD;
+ *m++ = '+';
+ *m++ = userModeList[i].c;
}
}
}
*m = '\0';
- if (*umode_buf && cptr)
- sendto_one(cptr, ":%s MODE %s :%s", sptr->name, sptr->name, umode_buf);
+ if (*umodeBuf && cptr)
+ sendto_one(cptr, ":%s MODE %s :%s", sptr->name, sptr->name, umodeBuf);
}
/*
if (word)
{
for (; *word; word++)
- if (isDigit(*word))
- return 1;
- else if (isAlpha(*word))
- return 0;
+ if (IsDigit(*word))
+ return 1;
+ else if (IsAlpha(*word))
+ return 0;
}
return 0;
}
* If it begins with a +, count this as an additive mask instead of just
* a replacement. If what == MODE_DEL, "+" has no special effect.
*/
-snomask_t umode_make_snomask(snomask_t oldmask, char *arg, int what)
+unsigned int umode_make_snomask(unsigned int oldmask, char *arg, int what)
{
- snomask_t sno_what;
- snomask_t newmask;
+ unsigned int sno_what;
+ unsigned int newmask;
if (*arg == '+')
{
arg++;
else
sno_what = (what == MODE_ADD) ? SNO_SET : SNO_DEL;
/* pity we don't have strtoul everywhere */
- newmask = (snomask_t)atoi(arg);
+ newmask = (unsigned int)atoi(arg);
if (sno_what == SNO_DEL)
newmask = oldmask & ~newmask;
else if (sno_what == SNO_ADD)
return newmask;
}
+static void delfrom_list(struct Client *cptr, struct SLink **list)
+{
+ struct SLink* tmp;
+ struct SLink* prv = NULL;
+
+ for (tmp = *list; tmp; tmp = tmp->next) {
+ if (tmp->value.cptr == cptr) {
+ if (prv)
+ prv->next = tmp->next;
+ else
+ *list = tmp->next;
+ free_link(tmp);
+ break;
+ }
+ prv = tmp;
+ }
+}
+
/*
* This function sets a Client's server notices mask, according to
* the parameter 'what'. This could be even faster, but the code
* gets mighty hard to read :)
*/
-void delfrom_list(aClient *, Link **);
-void set_snomask(aClient *cptr, snomask_t newmask, int what)
+void set_snomask(struct Client *cptr, unsigned int newmask, int what)
{
- snomask_t oldmask, diffmask; /* unsigned please */
+ unsigned int oldmask, diffmask; /* unsigned please */
int i;
- Link *tmp;
+ struct SLink *tmp;
oldmask = cptr->snomask;
newmask |= oldmask;
else if (what == SNO_DEL)
newmask = oldmask & ~newmask;
- else if (what != SNO_SET) /* absolute set, no math needed */
+ else if (what != SNO_SET) /* absolute set, no math needed */
sendto_ops("setsnomask called with %d ?!", what);
newmask &= (IsAnOper(cptr) ? SNO_ALL : SNO_USER);
diffmask = oldmask ^ newmask;
- for (i = 0; diffmask >> i; i++)
+ for (i = 0; diffmask >> i; i++) {
if (((diffmask >> i) & 1))
{
if (((newmask >> i) & 1))
{
- tmp = make_link();
- tmp->next = opsarray[i];
- tmp->value.cptr = cptr;
- opsarray[i] = tmp;
+ tmp = make_link();
+ tmp->next = opsarray[i];
+ tmp->value.cptr = cptr;
+ opsarray[i] = tmp;
}
else
- /* not real portable :( */
- delfrom_list(cptr, &opsarray[i]);
+ /* not real portable :( */
+ delfrom_list(cptr, &opsarray[i]);
}
- cptr->snomask = newmask;
-}
-
-void delfrom_list(aClient *cptr, Link **list)
-{
- Link *tmp, *prv = NULL;
- for (tmp = *list; tmp; tmp = tmp->next)
- {
- if (tmp->value.cptr == cptr)
- {
- if (prv)
- prv->next = tmp->next;
- else
- *list = tmp->next;
- free_link(tmp);
- break;
- }
- prv = tmp;
}
+ cptr->snomask = newmask;
}
/*
* but more over, if this is detected on a server not local to sptr
* the SILENCE mask is sent upstream.
*/
-int is_silenced(aClient *sptr, aClient *acptr)
+int is_silenced(struct Client *sptr, struct Client *acptr)
{
- Reg1 Link *lp;
- Reg2 anUser *user;
+ struct SLink *lp;
+ struct User *user;
static char sender[HOSTLEN + NICKLEN + USERLEN + 5];
static char senderip[16 + NICKLEN + USERLEN + 5];
return 0;
sprintf_irc(sender, "%s!%s@%s", sptr->name, user->username, user->host);
sprintf_irc(senderip, "%s!%s@%s", sptr->name, user->username,
- inetntoa(sptr->ip));
+ ircd_ntoa((const char*) &sptr->ip));
for (; lp; lp = lp->next)
{
if ((!(lp->flags & CHFL_SILENCE_IPMASK) && !match(lp->value.cp, sender)) ||
- ((lp->flags & CHFL_SILENCE_IPMASK) && !match(lp->value.cp, senderip)))
+ ((lp->flags & CHFL_SILENCE_IPMASK) && !match(lp->value.cp, senderip)))
{
if (!MyConnect(sptr))
{
- if (Protocol(sptr->from) < 10)
- sendto_one(sptr->from, ":%s SILENCE %s %s", acptr->name,
- sptr->name, lp->value.cp);
- else
- sendto_one(sptr->from, ":%s SILENCE %s%s %s", acptr->name,
- NumNick(sptr), lp->value.cp);
+ if (Protocol(sptr->from) < 10)
+ sendto_one(sptr->from, ":%s SILENCE %s %s", acptr->name,
+ sptr->name, lp->value.cp);
+ else
+ sendto_one(sptr->from, ":%s SILENCE %s%s %s", acptr->name,
+ NumNick(sptr), lp->value.cp);
}
return 1;
}
* Removes all silence masks from the list of sptr that fall within `mask'
* Returns -1 if none where found, 0 otherwise.
*/
-int del_silence(aClient *sptr, char *mask)
+int del_silence(struct Client *sptr, char *mask)
{
- Reg1 Link **lp;
- Reg2 Link *tmp;
+ struct SLink **lp;
+ struct SLink *tmp;
int ret = -1;
- for (lp = &sptr->user->silence; *lp;)
+ for (lp = &sptr->user->silence; *lp;) {
if (!mmatch(mask, (*lp)->value.cp))
{
tmp = *lp;
*lp = tmp->next;
- RunFree(tmp->value.cp);
+ MyFree(tmp->value.cp);
free_link(tmp);
ret = 0;
}
else
lp = &(*lp)->next;
-
+ }
return ret;
}
-static int add_silence(aClient *sptr, char *mask)
+int add_silence(struct Client* sptr, const char* mask)
{
- Reg1 Link *lp, **lpp;
- Reg3 int cnt = 0, len = strlen(mask);
+ struct SLink *lp, **lpp;
+ int cnt = 0, len = strlen(mask);
char *ip_start;
for (lpp = &sptr->user->silence, lp = *lpp; lp;)
{
- if (!strCasediff(mask, lp->value.cp))
+ if (0 == ircd_strcmp(mask, lp->value.cp))
return -1;
if (!mmatch(mask, lp->value.cp))
{
- Link *tmp = lp;
+ struct SLink *tmp = lp;
*lpp = lp = lp->next;
- RunFree(tmp->value.cp);
+ MyFree(tmp->value.cp);
free_link(tmp);
continue;
}
len += strlen(lp->value.cp);
if ((len > MAXSILELENGTH) || (++cnt >= MAXSILES))
{
- sendto_one(sptr, err_str(ERR_SILELISTFULL), me.name, sptr->name, mask);
- return -1;
+ sendto_one(sptr, err_str(ERR_SILELISTFULL), me.name, sptr->name, mask);
+ return -1;
}
else if (!mmatch(lp->value.cp, mask))
- return -1;
+ return -1;
}
lpp = &lp->next;
lp = *lpp;
}
lp = make_link();
- memset(lp, 0, sizeof(Link));
+ memset(lp, 0, sizeof(struct SLink));
lp->next = sptr->user->silence;
- lp->value.cp = (char *)RunMalloc(strlen(mask) + 1);
+ lp->value.cp = (char*) MyMalloc(strlen(mask) + 1);
+ assert(0 != lp->value.cp);
strcpy(lp->value.cp, mask);
if ((ip_start = strrchr(mask, '@')) && check_if_ipmask(ip_start + 1))
lp->flags = CHFL_SILENCE_IPMASK;
return 0;
}
-/*
- * m_silence() - Added 19 May 1994 by Run.
- *
- * parv[0] = sender prefix
- * From local client:
- * parv[1] = mask (NULL sends the list)
- * From remote client:
- * parv[1] = Numeric nick that must be silenced
- * parv[2] = mask
- */
-int m_silence(aClient *cptr, aClient *sptr, int parc, char *parv[])
-{
- Link *lp;
- aClient *acptr;
- char c, *cp;
-
- if (MyUser(sptr))
- {
- acptr = sptr;
- if (parc < 2 || *parv[1] == '\0' || (acptr = FindUser(parv[1])))
- {
- if (!(acptr->user))
- return 0;
- for (lp = acptr->user->silence; lp; lp = lp->next)
- sendto_one(sptr, rpl_str(RPL_SILELIST), me.name,
- sptr->name, acptr->name, lp->value.cp);
- sendto_one(sptr, rpl_str(RPL_ENDOFSILELIST), me.name, sptr->name,
- acptr->name);
- return 0;
- }
- cp = parv[1];
- c = *cp;
- if (c == '-' || c == '+')
- cp++;
- else if (!(strchr(cp, '@') || strchr(cp, '.') ||
- strchr(cp, '!') || strchr(cp, '*')))
- {
- sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], parv[1]);
- return -1;
- }
- else
- c = '+';
- cp = pretty_mask(cp);
- if ((c == '-' && !del_silence(sptr, cp)) ||
- (c != '-' && !add_silence(sptr, cp)))
- {
- sendto_prefix_one(sptr, sptr, ":%s SILENCE %c%s", parv[0], c, cp);
- if (c == '-')
- sendto_serv_butone(NULL, ":%s SILENCE * -%s", sptr->name, cp);
- }
- }
- else if (parc < 3 || *parv[2] == '\0')
- {
- sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "SILENCE");
- return -1;
- }
- else
- {
- if (Protocol(cptr) < 10)
- acptr = FindClient(parv[1]); /* In case of NOTE notice, parv[1] */
- else if (parv[1][1]) /* can be a server */
- acptr = findNUser(parv[1]);
- else
- acptr = FindNServer(parv[1]);
-
- if (*parv[2] == '-')
- {
- if (!del_silence(sptr, parv[2] + 1))
- sendto_serv_butone(cptr, ":%s SILENCE * %s", parv[0], parv[2]);
- }
- else
- {
- add_silence(sptr, parv[2]);
- if (acptr && IsServer(acptr->from))
- {
- if (Protocol(acptr->from) < 10)
- sendto_one(acptr, ":%s SILENCE %s %s", parv[0], acptr->name, parv[2]);
- else if (IsServer(acptr))
- sendto_one(acptr, ":%s SILENCE %s %s",
- parv[0], NumServ(acptr), parv[2]);
- else
- sendto_one(acptr, ":%s SILENCE %s%s %s",
- parv[0], NumNick(acptr), parv[2]);
- }
- }
- }
- return 0;
-}
projects / ircu2.10.12-pk.git / blobdiff