X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fs_user.c;h=1f0e0d92ddd990ff543c0445af741d7d72464555;hb=c3e49ba3f999d28a480f8f66cc633d9ea968099f;hp=2aefc68517d0aa7fd112a98ffe30df147434e5b6;hpb=141e9484fbf4e609601b69f4c0e48d1b1595d361;p=ircu2.10.12-pk.git diff --git a/ircd/s_user.c b/ircd/s_user.c index 2aefc68..1f0e0d9 100644 --- a/ircd/s_user.c +++ b/ircd/s_user.c @@ -19,8 +19,10 @@ * 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$ + */ +/** @file + * @brief Miscellaneous user-related helper functions. + * @version $Id$ */ #include "config.h" @@ -32,7 +34,6 @@ #include "hash.h" #include "ircd.h" #include "ircd_alloc.h" -#include "ircd_auth.h" #include "ircd_chattr.h" #include "ircd_features.h" #include "ircd_log.h" @@ -49,6 +50,7 @@ #include "parse.h" #include "querycmds.h" #include "random.h" +#include "s_auth.h" #include "s_bsd.h" #include "s_conf.h" #include "s_debug.h" @@ -56,7 +58,6 @@ #include "s_serv.h" /* max_client_count */ #include "send.h" #include "struct.h" -#include "support.h" #include "supported.h" #include "sys.h" #include "userload.h" @@ -65,19 +66,20 @@ #include "handlers.h" /* m_motd and m_lusers */ -#include +/* #include -- Now using assert in ircd_log.h */ #include #include #include #include #include - +/** Count of allocated User structures. */ static int userCount = 0; -/* - * 'make_user' add's an User information block to a client - * if it was not previously allocated. +/** Makes sure that \a cptr has a User information block. + * If cli_user(cptr) != NULL, does nothing. + * @param[in] cptr Client to attach User struct to. + * @return User struct associated with \a cptr. */ struct User *make_user(struct Client *cptr) { @@ -89,18 +91,16 @@ struct User *make_user(struct Client *cptr) /* All variables are 0 by default */ memset(cli_user(cptr), 0, sizeof(struct User)); -#ifdef DEBUGMODE ++userCount; -#endif cli_user(cptr)->refcnt = 1; } return cli_user(cptr); } -/* - * free_user - * - * Decrease user reference count by one and release block, if count reaches 0. +/** Dereference \a user. + * User structures are reference-counted; if the refcount of \a user + * becomes zero, free it. + * @param[in] user User to dereference. */ void free_user(struct User* user) { @@ -118,12 +118,15 @@ void free_user(struct User* user) assert(0 == user->channel); MyFree(user); -#ifdef DEBUGMODE + assert(userCount>0); --userCount; -#endif } } +/** Find number of User structs allocated and memory used by them. + * @param[out] count_out Receives number of User structs allocated. + * @param[out] bytes_out Receives number of bytes used by User structs. + */ void user_count_memory(size_t* count_out, size_t* bytes_out) { assert(0 != count_out); @@ -133,16 +136,14 @@ void user_count_memory(size_t* count_out, size_t* bytes_out) } -/* - * next_client - * - * Local function to find the next matching client. The search - * can be continued from the specified client entry. Normal - * usage loop is: - * +/** Find the next client (starting at \a next) with a name that matches \a ch. + * Normal usage loop is: * for (x = client; x = next_client(x,mask); x = x->next) * HandleMatchingClient; * + * @param[in] next First client to check. + * @param[in] ch Name mask to check against. + * @return Next matching client found, or NULL if none. */ struct Client *next_client(struct Client *next, const char* ch) { @@ -163,28 +164,22 @@ struct Client *next_client(struct Client *next, const char* ch) return next; } -/* - * hunt_server - * - * Do the basic thing in delivering the message (command) - * across the relays to the specific server (server) for - * actions. - * - * Note: The command is a format string and *MUST* be - * of prefixed style (e.g. ":%s COMMAND %s ..."). - * Command can have only max 8 parameters. - * - * server parv[server] is the parameter identifying the - * target server. It can be a nickname, servername, - * or server mask (from a local user) or a server - * numeric (from a remote server). +/** Find the destination server for a command, and forward it if that is not us. * - * *WARNING* - * parv[server] is replaced with the pointer to the - * real servername from the matched client (I'm lazy - * now --msa). + * \a server may be a nickname, server name, server mask (if \a from + * is a local user) or server numnick (if \a is a server or remote + * user). * - * returns: (see #defines) + * @param[in] from Client that sent the command to us. + * @param[in] cmd Long-form command text. + * @param[in] tok Token-form command text. + * @param[in] one Client that originated the command (ignored). + * @param[in] MustBeOper If non-zero and \a from is not an operator, return HUNTED_NOSUCH. + * @param[in] pattern Format string of arguments to command. + * @param[in] server Index of target name or mask in \a parv. + * @param[in] parc Number of valid elements in \a parv (must be less than 9). + * @param[in] parv Array of arguments to command. + * @return One of HUNTED_ISME, HUNTED_NOSUCH or HUNTED_PASS. */ int hunt_server_cmd(struct Client *from, const char *cmd, const char *tok, struct Client *one, int MustBeOper, const char *pattern, @@ -218,8 +213,10 @@ int hunt_server_cmd(struct Client *from, const char *cmd, const char *tok, send_reply(from, ERR_NOSUCHSERVER, to); return (HUNTED_NOSUCH); } - } else if (!(acptr = FindNServer(to))) + } else if (!(acptr = FindNServer(to))) { + send_reply(from, SND_EXPLICIT | ERR_NOSUCHSERVER, "* :Server has disconnected"); return (HUNTED_NOSUCH); /* Server broke off in the meantime */ + } if (IsMe(acptr)) return (HUNTED_ISME); @@ -239,6 +236,26 @@ int hunt_server_cmd(struct Client *from, const char *cmd, const char *tok, return (HUNTED_PASS); } +/** Find the destination server for a command, and forward it (as a + * high-priority command) if that is not us. + * + * \a server may be a nickname, server name, server mask (if \a from + * is a local user) or server numnick (if \a is a server or remote + * user). + * Unlike hunt_server_cmd(), this appends the message to the + * high-priority message queue for the destination server. + * + * @param[in] from Client that sent the command to us. + * @param[in] cmd Long-form command text. + * @param[in] tok Token-form command text. + * @param[in] one Client that originated the command (ignored). + * @param[in] MustBeOper If non-zero and \a from is not an operator, return HUNTED_NOSUCH. + * @param[in] pattern Format string of arguments to command. + * @param[in] server Index of target name or mask in \a parv. + * @param[in] parc Number of valid elements in \a parv (must be less than 9). + * @param[in] parv Array of arguments to command. + * @return One of HUNTED_ISME, HUNTED_NOSUCH or HUNTED_PASS. + */ int hunt_server_prio_cmd(struct Client *from, const char *cmd, const char *tok, struct Client *one, int MustBeOper, const char *pattern, int server, int parc, @@ -288,42 +305,6 @@ int hunt_server_prio_cmd(struct Client *from, const char *cmd, const char *tok, } -/* - * clean_user_id - * - * Copy `source' to `dest', replacing all occurances of '~' and characters that - * are not `isIrcUi' by an underscore. - * Copies at most USERLEN - 1 characters or up till the first control character. - * If `tilde' is true, then a tilde is prepended to `dest'. - * 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) -{ - char ch; - char *d = dest; - char *s = source; - int rlen = USERLEN; - - ch = *s++; /* Store first character to copy: */ - if (tilde) - { - *d++ = '~'; /* If `dest' == `source', then this overwrites `ch' */ - --rlen; - } - while (ch && !IsCntrl(ch) && rlen--) - { - char nch = *s++; /* Store next character to copy */ - *d++ = IsUserChar(ch) ? ch : '_'; /* This possibly overwrites it */ - if (nch == '~') - ch = '_'; - else - ch = nch; - } - *d = 0; - return dest; -} - /* * register_user * @@ -345,26 +326,24 @@ static char *clean_user_id(char *dest, char *source, int tilde) * this is not fair. It should actually request another * nick from local user or kill him/her... */ -int register_user(struct Client *cptr, struct Client *sptr, - const char *nick, char *username) +/** Finish registering a user who has sent both NICK and USER. + * For local connections, possibly check IAuth; make sure there is a + * matching Client config block; clean the username field; check + * K/k-lines; check for "hacked" looking usernames; assign a numnick; + * and send greeting (WELCOME, ISUPPORT, MOTD, etc). + * For all connections, update the invisible user and operator counts; + * run IPcheck against their address; and forward the NICK. + * + * @param[in] cptr Client who introduced the user. + * @param[in,out] sptr Client who has been fully introduced. + * @return Zero or CPTR_KILLED. + */ +int register_user(struct Client *cptr, struct Client *sptr) { - struct ConfItem* aconf; char* parv[4]; 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 = cli_user(sptr); - int killreason; - char ip_base64[8]; + char ip_base64[25]; user->last = CurrentTime; parv[0] = cli_name(sptr); @@ -372,226 +351,54 @@ int register_user(struct Client *cptr, struct Client *sptr, if (MyConnect(sptr)) { - static time_t last_too_many1; - static time_t last_too_many2; - assert(cptr == sptr); - if (!IsIAuthed(sptr)) { - if (iauth_active) - return iauth_start_client(iauth_active, sptr); - else - SetIAuthed(sptr); - } - switch (conf_check_client(sptr)) - { - case ACR_OK: - break; - case ACR_NO_AUTHORIZATION: - sendto_opmask_butone(0, 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 (CurrentTime - last_too_many1 >= (time_t) 60) - { - last_too_many1 = CurrentTime; - sendto_opmask_butone(0, SNO_TOOMANY, "Too many connections in " - "class %i for %s.", get_client_class(sptr), - get_client_name(sptr, SHOW_IP)); - } - ++ServerStats->is_ref; - IPcheck_connect_fail(cli_ip(sptr)); - 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 (CurrentTime - last_too_many2 >= (time_t) 60) - { - last_too_many2 = CurrentTime; - sendto_opmask_butone(0, SNO_TOOMANY, "Too many connections from " - "same IP for %s.", - get_client_name(sptr, SHOW_IP)); - } - ++ServerStats->is_ref; - return exit_client(cptr, sptr, &me, - "Too many connections from your host"); - case ACR_ALREADY_AUTHORIZED: - /* Can this ever happen? */ - case ACR_BAD_SOCKET: - ++ServerStats->is_ref; - IPcheck_connect_fail(cli_ip(sptr)); - return exit_client(cptr, sptr, &me, "Unknown error -- Try again"); - } - ircd_strncpy(user->host, cli_sockhost(sptr), HOSTLEN); - ircd_strncpy(user->realhost, cli_sockhost(sptr), HOSTLEN); - aconf = cli_confs(sptr)->value.aconf; - - clean_user_id(user->username, - HasFlag(sptr, FLAG_GOTID) ? cli_username(sptr) : username, - HasFlag(sptr, FLAG_DOID) && !HasFlag(sptr, FLAG_GOTID)); - if ((user->username[0] == '\0') - || ((user->username[0] == '~') && (user->username[1] == '\000'))) - return exit_client(cptr, sptr, &me, "USER: Bogus userid."); + Count_unknownbecomesclient(sptr, UserStats); - if (!EmptyString(aconf->passwd) - && !(IsDigit(*aconf->passwd) && !aconf->passwd[1]) - && strcmp(cli_passwd(sptr), aconf->passwd)) - { - ServerStats->is_ref++; - send_reply(sptr, ERR_PASSWDMISMATCH); - return exit_client(cptr, sptr, &me, "Bad Password"); - } - memset(cli_passwd(sptr), 0, sizeof(cli_passwd(sptr))); /* - * following block for the benefit of time-dependent K:-lines + * Set user's initial modes */ - killreason = find_kill(sptr); - if (killreason) { - ServerStats->is_ref++; - return exit_client(cptr, sptr, &me, - (killreason == -1 ? "K-lined" : "G-lined")); + tmpstr = (char*)client_get_default_umode(sptr); + if (tmpstr) { + char *umodev[] = { NULL, NULL, NULL, NULL }; + umodev[2] = tmpstr; + set_user_mode(cptr, sptr, 3, umodev, ALLOWMODES_ANY); } - /* - * Check for mixed case usernames, meaning probably hacked. Jon2 3-94 - * Summary of rules now implemented in this patch: Ensor 11-94 - * In a mixed-case name, if first char is upper, one more upper may - * appear anywhere. (A mixed-case name *must* have an upper first - * char, and may have one other upper.) - * A third upper may appear if all 3 appear at the beginning of the - * name, separated only by "others" (-/_/.). - * A single group of digits is allowed anywhere. - * Two groups of digits are allowed if at least one of the groups is - * at the beginning or the end. - * Only one '-', '_', or '.' is allowed (or two, if not consecutive). - * But not as the first or last char. - * No other special characters are allowed. - * Name must contain at least one letter. - */ - tmpstr2 = tmpstr = (username[0] == '~' ? &username[1] : username); - while (*tmpstr && !badid) - { - pos++; - c = *tmpstr; - tmpstr++; - if (IsLower(c)) - { - lower++; - } - else if (IsUpper(c)) - { - upper++; - if ((leadcaps || pos == 1) && !lower && !digits) - leadcaps++; - } - else if (IsDigit(c)) - { - 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; - } - else - 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; - } - if (badid && (!HasFlag(sptr, FLAG_GOTID) || - strcmp(cli_username(sptr), username) != 0)) - { - ServerStats->is_ref++; - - send_reply(cptr, SND_EXPLICIT | ERR_INVALIDUSERNAME, - ":Your username is invalid."); - send_reply(cptr, SND_EXPLICIT | ERR_INVALIDUSERNAME, - ":Connect with your real username, in lowercase."); - send_reply(cptr, SND_EXPLICIT | ERR_INVALIDUSERNAME, - ":If your mail address were foo@bar.com, your username " - "would be foo."); - return exit_client(cptr, sptr, &me, "USER: Bad username"); - } - Count_unknownbecomesclient(sptr, UserStats); - } - else { - ircd_strncpy(user->username, username, USERLEN); - Count_newremoteclient(UserStats, user->server); - } - SetUser(sptr); - if (IsInvisible(sptr)) - ++UserStats.inv_clients; - if (IsOper(sptr)) - ++UserStats.opers; - - if (MyConnect(sptr)) { + SetUser(sptr); cli_handler(sptr) = CLIENT_HANDLER; - release_dns_reply(sptr); SetLocalNumNick(sptr); send_reply(sptr, RPL_WELCOME, feature_str(FEAT_NETWORK), feature_str(FEAT_PROVIDER) ? " via " : "", feature_str(FEAT_PROVIDER) ? feature_str(FEAT_PROVIDER) : "", - nick); + cli_name(sptr)); /* * This is a duplicate of the NOTICE but see below... */ send_reply(sptr, RPL_YOURHOST, cli_name(&me), version); send_reply(sptr, RPL_CREATED, creation); - send_reply(sptr, RPL_MYINFO, cli_name(&me), infousermodes, infochanmodes, - infochanmodeswithparams, version); + send_reply(sptr, RPL_MYINFO, cli_name(&me), version, infousermodes, + infochanmodes, infochanmodeswithparams); send_supported(sptr); m_lusers(sptr, sptr, 1, parv); update_load(); motd_signon(sptr); -/* nextping = CurrentTime; */ if (cli_snomask(sptr) & SNO_NOISY) set_snomask(sptr, cli_snomask(sptr) & SNO_NOISY, SNO_ADD); if (feature_bool(FEAT_CONNEXIT_NOTICES)) sendto_opmask_butone(0, SNO_CONNEXIT, - "Client connecting: %s (%s@%s) [%s] {%d} [%s] <%s%s>", + "Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s%s>", cli_name(sptr), user->username, user->host, cli_sock_ip(sptr), get_client_class(sptr), cli_info(sptr), NumNick(cptr) /* two %s's */); IPcheck_connect_succeeded(sptr); - /* - * Set user's initial modes - */ - parv[0] = (char*)nick; - parv[1] = (char*)nick; - parv[2] = (char*)client_get_default_umode(sptr); - parv[3] = NULL; /* needed in case of +s */ - set_user_mode(sptr, sptr, 3, parv); - ClearHiddenHost(sptr); /* just in case somebody stuck +x in there */ } - else - /* if (IsServer(cptr)) */ - { - struct Client *acptr; + else { + struct Client *acptr = user->server; - acptr = user->server; if (cli_from(acptr) != cli_from(sptr)) { sendcmdto_one(&me, CMD_KILL, cptr, "%C :%s (%s != %s[%s])", @@ -604,12 +411,12 @@ int register_user(struct Client *cptr, struct Client *sptr, SetFlag(sptr, FLAG_TS8); /* - * Check to see if this user is being propogated + * Check to see if this user is being propagated * as part of a net.burst, or is using protocol 9. - * FIXME: This can be speeded up - its stupid to check it for + * FIXME: This can be sped up - its stupid to check it for * every NICK message in a burst again --Run. */ - for (acptr = user->server; acptr != &me; acptr = cli_serv(acptr)->up) + for (; acptr != &me; acptr = cli_serv(acptr)->up) { if (IsBurst(acptr) || Protocol(acptr) < 10) break; @@ -623,27 +430,65 @@ int register_user(struct Client *cptr, struct Client *sptr, sptr, cli_name(&me)); return exit_client(cptr, sptr, &me,"Too many connections from your host -- throttled"); } + SetUser(sptr); } - tmpstr = umode_str(sptr); - sendcmdto_serv_butone(user->server, CMD_NICK, cptr, - "%s %d %Tu %s %s %s%s%s%s %s%s :%s", - nick, cli_hopcount(sptr) + 1, cli_lastnick(sptr), - user->username, user->realhost, - *tmpstr ? "+" : "", tmpstr, *tmpstr ? " " : "", - inttobase64(ip_base64, ntohl(cli_ip(sptr).s_addr), 6), - NumNick(sptr), cli_info(sptr)); - - /* Send server notice mask to client */ - if (MyUser(sptr) && (cli_snomask(sptr) != SNO_DEFAULT) && HasFlag(sptr, FLAG_SERVNOTICE)) - send_reply(sptr, RPL_SNOMASK, cli_snomask(sptr), cli_snomask(sptr)); + /* If they get both +x and an account during registration, hide + * their hostmask here. Calling hide_hostmask() from IAuth's + * account assignment causes a numeric reply during registration. + */ + if (HasHiddenHost(sptr)) + hide_hostmask(sptr, FLAG_HIDDENHOST); + if (IsInvisible(sptr)) + ++UserStats.inv_clients; + if (IsOper(sptr)) + ++UserStats.opers; + + tmpstr = umode_str(sptr); + /* Send full IP address to IPv6-grokking servers. */ + sendcmdto_flag_serv_butone(user->server, CMD_NICK, cptr, + FLAG_IPV6, FLAG_LAST_FLAG, + "%s %d %Tu %s %s %s%s%s%s %s%s :%s", + cli_name(sptr), cli_hopcount(sptr) + 1, + cli_lastnick(sptr), + user->username, user->realhost, + *tmpstr ? "+" : "", tmpstr, *tmpstr ? " " : "", + iptobase64(ip_base64, &cli_ip(sptr), sizeof(ip_base64), 1), + NumNick(sptr), cli_info(sptr)); + /* Send fake IPv6 addresses to pre-IPv6 servers. */ + sendcmdto_flag_serv_butone(user->server, CMD_NICK, cptr, + FLAG_LAST_FLAG, FLAG_IPV6, + "%s %d %Tu %s %s %s%s%s%s %s%s :%s", + cli_name(sptr), cli_hopcount(sptr) + 1, + cli_lastnick(sptr), + user->username, user->realhost, + *tmpstr ? "+" : "", tmpstr, *tmpstr ? " " : "", + iptobase64(ip_base64, &cli_ip(sptr), sizeof(ip_base64), 0), + NumNick(sptr), cli_info(sptr)); + + /* Send user mode to client */ + if (MyUser(sptr)) + { + static struct Flags flags; /* automatically initialized to zeros */ + /* To avoid sending +r to the client due to auth-on-connect, set + * the "old" FLAG_ACCOUNT bit to match the client's value. + */ + if (IsAccount(cptr)) + FlagSet(&flags, FLAG_ACCOUNT); + else + FlagClr(&flags, FLAG_ACCOUNT); + client_set_privs(sptr, NULL); + send_umode(cptr, sptr, &flags, ALL_UMODES); + if ((cli_snomask(sptr) != SNO_DEFAULT) && HasFlag(sptr, FLAG_SERVNOTICE)) + send_reply(sptr, RPL_SNOMASK, cli_snomask(sptr), cli_snomask(sptr)); + } return 0; } - +/** List of user mode characters. */ static const struct UserMode { - unsigned int flag; - char c; + unsigned int flag; /**< User mode constant. */ + char c; /**< Character corresponding to the mode. */ } userModeList[] = { { FLAG_OPER, 'o' }, { FLAG_LOCOP, 'O' }, @@ -657,20 +502,28 @@ static const struct UserMode { { FLAG_HIDDENHOST, 'x' } }; +/** Length of #userModeList. */ #define USERMODELIST_SIZE sizeof(userModeList) / sizeof(struct UserMode) /* * XXX - find a way to get rid of this */ +/** Nasty global buffer used for communications with umode_str() and others. */ static char umodeBuf[BUFSIZE]; +/** Try to set a user's nickname. + * If \a sptr is a server, the client is being introduced for the first time. + * @param[in] cptr Client to set nickname. + * @param[in] sptr Client sending the NICK. + * @param[in] nick New nickname. + * @param[in] parc Number of arguments to NICK. + * @param[in] parv Argument list to NICK. + * @return CPTR_KILLED if \a cptr was killed, else 0. + */ int set_nick_name(struct Client* cptr, struct Client* sptr, const char* nick, int parc, char* parv[]) { if (IsServer(sptr)) { - int i; - const char* account = 0; - const char* p; /* * A server introducing a new client, change source @@ -680,23 +533,7 @@ int set_nick_name(struct Client* cptr, struct Client* sptr, cli_hopcount(new_client) = atoi(parv[2]); cli_lastnick(new_client) = 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) - { - SetFlag(new_client, userModeList[i].flag); - if (userModeList[i].flag == FLAG_ACCOUNT) - account = parv[7]; - break; - } - } - } - } - client_set_privs(new_client, NULL); /* set privs on user */ + /* * Set new nick name. */ @@ -707,32 +544,26 @@ int set_nick_name(struct Client* cptr, struct Client* sptr, /* * IP# of remote client */ - cli_ip(new_client).s_addr = htonl(base64toint(parv[parc - 3])); + base64toip(parv[parc - 3], &cli_ip(new_client)); add_client_to_list(new_client); hAddClient(new_client); cli_serv(sptr)->ghost = 0; /* :server NICK means end of net.burst */ ircd_strncpy(cli_username(new_client), parv[4], USERLEN); + ircd_strncpy(cli_user(new_client)->username, parv[4], USERLEN); ircd_strncpy(cli_user(new_client)->host, parv[5], HOSTLEN); ircd_strncpy(cli_user(new_client)->realhost, parv[5], HOSTLEN); ircd_strncpy(cli_info(new_client), parv[parc - 1], REALLEN); - if (account) { - int len = ACCOUNTLEN; - if ((p = strchr(account, ':'))) { - len = (p++) - account; - cli_user(new_client)->acc_create = atoi(p); - Debug((DEBUG_DEBUG, "Received timestamped account in user mode; " - "account \"%s\", timestamp %Tu", account, - cli_user(new_client)->acc_create)); - } - ircd_strncpy(cli_user(new_client)->account, account, len); + + Count_newremoteclient(UserStats, sptr); + + if (parc > 7 && *parv[6] == '+') { + /* (parc-4) -3 for the ip, numeric nick, realname */ + set_user_mode(cptr, new_client, parc-7, parv+4, ALLOWMODES_ANY); } - if (HasHiddenHost(new_client)) - ircd_snprintf(0, cli_user(new_client)->host, HOSTLEN, "%s.%s", - account, feature_str(FEAT_HIDDEN_HOST)); - return register_user(cptr, new_client, cli_name(new_client), parv[4]); + return register_user(cptr, new_client); } else if ((cli_name(sptr))[0]) { /* @@ -805,49 +636,25 @@ int set_nick_name(struct Client* cptr, struct Client* sptr, } else { /* Local client setting NICK the first time */ - strcpy(cli_name(sptr), nick); - if (!cli_user(sptr)) { - cli_user(sptr) = make_user(sptr); - cli_user(sptr)->server = &me; - } hAddClient(sptr); - - /* - * If the client hasn't gotten a cookie-ping yet, - * choose a cookie and send it. -record!jegelhof@cloud9.net - */ - if (!cli_cookie(sptr)) { - do { - cli_cookie(sptr) = (ircrandom() & 0x7fffffff); - } while (!cli_cookie(sptr)); - sendrawto_one(cptr, MSG_PING " :%u", cli_cookie(sptr)); - } - else if (*(cli_user(sptr))->host && cli_cookie(sptr) == 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 ! - */ - cli_lastnick(sptr) = TStime(); /* Always local client */ - if (register_user(cptr, sptr, nick, cli_user(sptr)->username) == CPTR_KILLED) - return CPTR_KILLED; - } + return auth_set_nick(cli_auth(sptr), nick); } return 0; } +/** Calculate the hash value for a target. + * @param[in] target Pointer to target, cast to unsigned int. + * @return Hash value constructed from the pointer. + */ static unsigned char hash_target(unsigned int target) { return (unsigned char) (target >> 16) ^ (target >> 8); } -/* - * add_target - * - * sptr must be a local client! - * - * Cannonifies target for client `sptr'. +/** Records \a target as a recent target for \a sptr. + * @param[in] sptr User who has sent to a new target. + * @param[in] target Target to add. */ void add_target(struct Client *sptr, void *target) @@ -877,13 +684,12 @@ add_target(struct Client *sptr, void *target) targets[RESERVEDTARGETS] = hash; } -/* - * 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. +/** Check whether \a sptr can send to or join \a target yet. + * @param[in] sptr User trying to join a channel or send a message. + * @param[in] target Target of the join or message. + * @param[in] name Name of the target. + * @param[in] created If non-zero, trying to join a new channel. + * @return Non-zero if too many target changes; zero if okay to send. */ int check_target_limit(struct Client *sptr, void *target, const char *name, int created) @@ -896,10 +702,6 @@ int check_target_limit(struct Client *sptr, void *target, const char *name, assert(cli_local(sptr)); targets = cli_targets(sptr); - /* If user is invited to channel, give him/her a free target */ - if (IsChannelName(name) && IsInvited(sptr, target)) - return 0; - /* * Same target as last time? */ @@ -917,6 +719,10 @@ int check_target_limit(struct Client *sptr, void *target, const char *name, */ if (!created) { if (CurrentTime < cli_nexttarget(sptr)) { + /* If user is invited to channel, give him/her a free target */ + if (IsChannelName(name) && IsInvited(sptr, target)) + return 0; + if (cli_nexttarget(sptr) - CurrentTime < TARGET_DELAY + 8) { /* * No server flooding @@ -938,23 +744,15 @@ int check_target_limit(struct Client *sptr, void *target, const char *name, return 0; } -/* - * 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. - * +/** Allows a channel operator to avoid target change checks when + * sending messages to users on their channel. + * @param[in] source User sending the message. + * @param[in] nick Destination of the message. + * @param[in] channel Name of channel being sent to. + * @param[in] text Message to send. + * @param[in] is_notice If non-zero, use CNOTICE instead of CPRIVMSG. */ +/* Added 971023 by Run. */ int whisper(struct Client* source, const char* nick, const char* channel, const char* text, int is_notice) { @@ -1002,18 +800,23 @@ int whisper(struct Client* source, const char* nick, const char* channel, if (is_silenced(source, dest)) return 0; - if (cli_user(dest)->away) - send_reply(source, RPL_AWAY, cli_name(dest), cli_user(dest)->away); if (is_notice) sendcmdto_one(source, CMD_NOTICE, dest, "%C :%s", dest, text); else + { + if (cli_user(dest)->away) + send_reply(source, RPL_AWAY, cli_name(dest), cli_user(dest)->away); sendcmdto_one(source, CMD_PRIVATE, dest, "%C :%s", dest, text); + } return 0; } -/* - * added Sat Jul 25 07:30:42 EST 1992 +/** Send a user mode change for \a cptr to neighboring servers. + * @param[in] cptr User whose mode is changing. + * @param[in] sptr Client who sent us the mode change message. + * @param[in] old Prior set of user flags. + * @param[in] prop If non-zero, also include FLAG_OPER. */ void send_umode_out(struct Client *cptr, struct Client *sptr, struct Flags *old, int prop) @@ -1034,10 +837,11 @@ void send_umode_out(struct Client *cptr, struct Client *sptr, } -/* - * 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. +/** Call \a fmt for each Client named in \a names. + * @param[in] sptr Client requesting information. + * @param[in] names Space-delimited list of nicknames. + * @param[in] rpl Base reply string for messages. + * @param[in] fmt Formatting callback function. */ void send_user_info(struct Client* sptr, char* names, int rpl, InfoFormatter fmt) { @@ -1067,25 +871,31 @@ void send_user_info(struct Client* sptr, char* names, int rpl, InfoFormatter fmt msgq_clean(mb); } -/* - * hide_hostmask() - * - * If, after setting the flags, the user has both HiddenHost and Account - * set, its hostmask is changed. +/** Set \a flag on \a cptr and possibly hide the client's hostmask. + * @param[in,out] cptr User who is getting a new flag. + * @param[in] flag Some flag that affects host-hiding (FLAG_HIDDENHOST, FLAG_ACCOUNT). + * @return Zero. */ int hide_hostmask(struct Client *cptr, unsigned int flag) { struct Membership *chan; - if (MyConnect(cptr) && !feature_bool(FEAT_HOST_HIDING) && - flag == FLAG_HIDDENHOST) + switch (flag) { + case FLAG_HIDDENHOST: + /* Local users cannot set +x unless FEAT_HOST_HIDING is true. */ + if (MyConnect(cptr) && !feature_bool(FEAT_HOST_HIDING)) + return 0; + break; + case FLAG_ACCOUNT: + /* Invalidate all bans against the user so we check them again */ + for (chan = (cli_user(cptr))->channel; chan; + chan = chan->next_channel) + ClearBanValid(chan); + break; + default: return 0; - -/* Invalidate all bans against the user so we check them again */ - for (chan = (cli_user(cptr))->channel; chan; - chan = chan->next_channel) - ClearBanValid(chan); + } SetFlag(cptr, flag); if (!HasFlag(cptr, FLAG_HIDDENHOST) || !HasFlag(cptr, FLAG_ACCOUNT)) @@ -1107,37 +917,39 @@ hide_hostmask(struct Client *cptr, unsigned int flag) { if (IsZombie(chan)) continue; - /* For a user with no modes in a join-delayed channel, do not show - * the rejoin. */ - if (!IsChanOp(chan) && !HasVoice(chan) - && (chan->channel->mode.mode & MODE_DELJOINS)) - SetDelayedJoin(chan); - else + /* Send a JOIN unless the user's join has been delayed. */ + if (!IsDelayedJoin(chan)) sendcmdto_channel_butserv_butone(cptr, CMD_JOIN, chan->channel, cptr, 0, "%H", chan->channel); if (IsChanOp(chan) && HasVoice(chan)) - sendcmdto_channel_butserv_butone(&me, CMD_MODE, chan->channel, cptr, 0, + sendcmdto_channel_butserv_butone(&his, CMD_MODE, chan->channel, cptr, 0, "%H +ov %C %C", chan->channel, cptr, cptr); else if (IsChanOp(chan) || HasVoice(chan)) - sendcmdto_channel_butserv_butone(&me, CMD_MODE, chan->channel, cptr, 0, + sendcmdto_channel_butserv_butone(&his, CMD_MODE, chan->channel, cptr, 0, "%H +%c %C", chan->channel, IsChanOp(chan) ? 'o' : 'v', cptr); } return 0; } -/* - * set_user_mode() added 15/10/91 By Darren Reed. +/** Set a user's mode. This function checks that \a cptr is trying to + * set his own mode, prevents local users from setting inappropriate + * modes through this function, and applies any other side effects of + * a successful mode change. * - * parv[0] - sender - * parv[1] - username to change mode for - * parv[2] - modes to change + * @param[in,out] cptr User setting someone's mode. + * @param[in] sptr Client who sent the mode change message. + * @param[in] parc Number of parameters in \a parv. + * @param[in] parv Parameters to MODE. + * @param[in] allow_modes ALLOWMODES_ANY for any mode, ALLOWMODES_DEFAULT for + * only permitting legitimate default user modes. + * @return Zero. */ -int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) +int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, + char *parv[], int allow_modes) { char** p; char* m; - struct Client *acptr; int what; int i; struct Flags setflags; @@ -1146,30 +958,10 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv char buf[BUFSIZE]; int prop = 0; int do_host_hiding = 0; + char* account = NULL; what = MODE_ADD; - if (parc < 2) - return need_more_params(sptr, "MODE"); - - if (!(acptr = FindUser(parv[1]))) - { - if (MyConnect(sptr)) - send_reply(sptr, ERR_NOSUCHCHANNEL, parv[1]); - return 0; - } - - if (IsServer(sptr) || sptr != acptr) - { - if (IsServer(cptr)) - sendwallto_group_butone(&me, WALL_WALLOPS, 0, - "MODE for User %s from %s!%s", parv[1], - cli_name(cptr), cli_name(sptr)); - else - send_reply(sptr, ERR_USERSDONTMATCH); - return 0; - } - if (parc < 3) { m = buf; @@ -1201,7 +993,7 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv /* * parse mode change string(s) */ - for (p = &parv[2]; *p; p++) { /* p is changed in loop too */ + for (p = &parv[2]; *p && p<&parv[parc]; p++) { /* p is changed in loop too */ for (m = *p; *m; m++) { switch (*m) { case '+': @@ -1285,6 +1077,13 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv if (what == MODE_ADD) do_host_hiding = 1; break; + case 'r': + if (*(p + 1) && (what == MODE_ADD)) { + account = *(++p); + SetAccount(sptr); + } + /* There is no -r */ + break; default: send_reply(sptr, ERR_UMODEUNKNOWNFLAG, *m); break; @@ -1301,6 +1100,8 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv ClearOper(sptr); if (!FlagHas(&setflags, FLAG_LOCOP) && IsLocOp(sptr)) ClearLocOp(sptr); + if (!FlagHas(&setflags, FLAG_ACCOUNT) && IsAccount(sptr)) + ClrFlag(sptr, FLAG_ACCOUNT); /* * new umode; servers can set it, local users cannot; * prevents users from /kick'ing or /mode -o'ing @@ -1327,7 +1128,10 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv { if ((FlagHas(&setflags, FLAG_OPER) || FlagHas(&setflags, FLAG_LOCOP)) && !IsAnOper(sptr)) + { det_confs_butmask(sptr, CONF_CLIENT & ~CONF_OPERATOR); + client_set_privs(sptr, NULL); + } if (SendServNotice(sptr)) { @@ -1343,35 +1147,55 @@ int set_user_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv * Compare new flags with old flags and send string which * will cause servers to update correctly. */ - if (!FlagHas(&setflags, FLAG_OPER) && IsOper(sptr)) - { - /* user now oper */ - ++UserStats.opers; - client_set_privs(sptr, NULL); /* may set propagate privilege */ - } - /* remember propagate privilege setting */ - if (HasPriv(sptr, PRIV_PROPAGATE)) - prop = 1; - if (FlagHas(&setflags, FLAG_OPER) && !IsOper(sptr)) - { - /* user no longer oper */ - --UserStats.opers; - client_set_privs(sptr, NULL); /* will clear propagate privilege */ + if (!FlagHas(&setflags, FLAG_ACCOUNT) && IsAccount(sptr)) { + int len = ACCOUNTLEN; + char *ts; + if ((ts = strchr(account, ':'))) { + len = (ts++) - account; + cli_user(sptr)->acc_create = atoi(ts); + Debug((DEBUG_DEBUG, "Received timestamped account in user mode; " + "account \"%s\", timestamp %Tu", account, + cli_user(sptr)->acc_create)); + } + ircd_strncpy(cli_user(sptr)->account, account, len); } - if (FlagHas(&setflags, FLAG_INVISIBLE) && !IsInvisible(sptr)) - --UserStats.inv_clients; - if (!FlagHas(&setflags, FLAG_INVISIBLE) && IsInvisible(sptr)) - ++UserStats.inv_clients; - if (!FlagHas(&setflags, FLAG_HIDDENHOST) && do_host_hiding) + if (!FlagHas(&setflags, FLAG_HIDDENHOST) && do_host_hiding && allow_modes != ALLOWMODES_DEFAULT) hide_hostmask(sptr, FLAG_HIDDENHOST); - send_umode_out(cptr, sptr, &setflags, prop); + + if (IsRegistered(sptr)) { + if (!FlagHas(&setflags, FLAG_OPER) && IsOper(sptr)) { + /* user now oper */ + ++UserStats.opers; + client_set_privs(sptr, NULL); /* may set propagate privilege */ + } + /* remember propagate privilege setting */ + if (HasPriv(sptr, PRIV_PROPAGATE)) { + prop = 1; + } + if (FlagHas(&setflags, FLAG_OPER) && !IsOper(sptr)) { + /* user no longer oper */ + assert(UserStats.opers > 0); + --UserStats.opers; + client_set_privs(sptr, NULL); /* will clear propagate privilege */ + } + if (FlagHas(&setflags, FLAG_INVISIBLE) && !IsInvisible(sptr)) { + assert(UserStats.inv_clients > 0); + --UserStats.inv_clients; + } + if (!FlagHas(&setflags, FLAG_INVISIBLE) && IsInvisible(sptr)) { + ++UserStats.inv_clients; + } + assert(UserStats.opers <= UserStats.clients + UserStats.unknowns); + assert(UserStats.inv_clients <= UserStats.clients + UserStats.unknowns); + send_umode_out(cptr, sptr, &setflags, prop); + } return 0; } -/* - * Build umode string for BURST command - * --Run +/** Build a mode string to describe modes for \a cptr. + * @param[in] cptr Some user. + * @return Pointer to a static buffer. */ char *umode_str(struct Client *cptr) { @@ -1380,9 +1204,7 @@ char *umode_str(struct Client *cptr) int i; struct Flags c_flags = cli_flags(cptr); - if (HasPriv(cptr, PRIV_PROPAGATE)) - FlagSet(&c_flags, FLAG_OPER); - else + if (!HasPriv(cptr, PRIV_PROPAGATE)) FlagClr(&c_flags, FLAG_OPER); for (i = 0; i < USERMODELIST_SIZE; ++i) @@ -1419,9 +1241,12 @@ char *umode_str(struct Client *cptr) overwritten by send_umode() */ } -/* - * Send the MODE string for user (user) to connection cptr - * -avalon +/** Send a mode change string for \a sptr to \a cptr. + * @param[in] cptr Destination of mode change message. + * @param[in] sptr User whose mode has changed. + * @param[in] old Pre-change set of modes for \a sptr. + * @param[in] sendset One of ALL_UMODES, SEND_UMODES_BUT_OPER, + * SEND_UMODES, to select which changed user modes to send. */ void send_umode(struct Client *cptr, struct Client *sptr, struct Flags *old, int sendset) @@ -1485,10 +1310,12 @@ void send_umode(struct Client *cptr, struct Client *sptr, struct Flags *old, sendcmdto_one(sptr, CMD_MODE, cptr, "%s :%s", cli_name(sptr), umodeBuf); } -/* +/** * Check to see if this resembles a sno_mask. It is if 1) there is * at least one digit and 2) The first digit occurs before the first * alphabetic character. + * @param[in] word Word to check for sno_mask-ness. + * @return Non-zero if \a word looks like a server notice mask; zero if not. */ int is_snomask(char *word) { @@ -1503,9 +1330,11 @@ int is_snomask(char *word) 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. +/** Update snomask \a oldmask according to \a arg and \a what. + * @param[in] oldmask Original user mask. + * @param[in] arg Update string (either a number or '+'/'-' followed by a number). + * @param[in] what MODE_ADD if adding the mask. + * @return New value of service notice mask. */ unsigned int umode_make_snomask(unsigned int oldmask, char *arg, int what) { @@ -1538,6 +1367,10 @@ unsigned int umode_make_snomask(unsigned int oldmask, char *arg, int what) return newmask; } +/** Remove \a cptr from the singly linked list \a list. + * @param[in] cptr Client to remove from list. + * @param[in,out] list Pointer to head of list containing \a cptr. + */ static void delfrom_list(struct Client *cptr, struct SLink **list) { struct SLink* tmp; @@ -1556,10 +1389,10 @@ static void delfrom_list(struct Client *cptr, struct SLink **list) } } -/* - * 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 :) +/** Set \a cptr's server notice mask, according to \a what. + * @param[in,out] cptr Client whose snomask is updating. + * @param[in] newmask Base value for new snomask. + * @param[in] what One of SNO_ADD, SNO_DEL, SNO_SET, to choose operation. */ void set_snomask(struct Client *cptr, unsigned int newmask, int what) { @@ -1598,120 +1431,60 @@ void set_snomask(struct Client *cptr, unsigned int newmask, int what) cli_snomask(cptr) = newmask; } -/* - * is_silenced : Does the actual check wether sptr is allowed - * to send a message to acptr. - * Both must be registered persons. - * If sptr is silenced by acptr, his message should not be propagated, - * but more over, if this is detected on a server not local to sptr - * the SILENCE mask is sent upstream. +/** Check whether \a sptr is allowed to send a message to \a acptr. + * If \a sptr is a remote user, it means some server has an outdated + * SILENCE list for \a acptr, so send the missing SILENCE mask(s) back + * in the direction of \a sptr. Skip the check if \a sptr is a server. + * @param[in] sptr Client trying to send a message. + * @param[in] acptr Destination of message. + * @return Non-zero if \a sptr is SILENCEd by \a acptr, zero if not. */ int is_silenced(struct Client *sptr, struct Client *acptr) { - struct SLink *lp; + struct Ban *found; struct User *user; - static char sender[HOSTLEN + NICKLEN + USERLEN + 5]; - static char senderip[16 + NICKLEN + USERLEN + 5]; - static char senderh[HOSTLEN + ACCOUNTLEN + USERLEN + 6]; + size_t buf_used, slen; + char buf[BUFSIZE]; - if (!cli_user(acptr) || !(lp = cli_user(acptr)->silence) || !(user = cli_user(sptr))) + if (IsServer(sptr) || !(user = cli_user(acptr)) + || !(found = find_ban(sptr, user->silence))) return 0; - ircd_snprintf(0, sender, sizeof(sender), "%s!%s@%s", cli_name(sptr), - user->username, user->host); - ircd_snprintf(0, senderip, sizeof(senderip), "%s!%s@%s", cli_name(sptr), - user->username, ircd_ntoa((const char*) &(cli_ip(sptr)))); - if (HasHiddenHost(sptr)) - ircd_snprintf(0, senderh, sizeof(senderh), "%s!%s@%s", cli_name(sptr), - user->username, user->realhost); - for (; lp; lp = lp->next) - { - if ((!(lp->flags & CHFL_SILENCE_IPMASK) && (!match(lp->value.cp, sender) || - (HasHiddenHost(sptr) && !match(lp->value.cp, senderh)))) || - ((lp->flags & CHFL_SILENCE_IPMASK) && !match(lp->value.cp, senderip))) - { - if (!MyConnect(sptr)) - { - sendcmdto_one(acptr, CMD_SILENCE, cli_from(sptr), "%C %s", sptr, - lp->value.cp); + assert(!(found->flags & BAN_EXCEPTION)); + if (!MyConnect(sptr)) { + /* Buffer positive silence to send back. */ + buf_used = strlen(found->banstr); + memcpy(buf, found->banstr, buf_used); + /* Add exceptions to buffer. */ + for (found = user->silence; found; found = found->next) { + if (!(found->flags & BAN_EXCEPTION)) + continue; + slen = strlen(found->banstr); + if (buf_used + slen + 4 > 400) { + buf[buf_used] = '\0'; + sendcmdto_one(acptr, CMD_SILENCE, cli_from(sptr), "%C %s", sptr, buf); + buf_used = 0; } - return 1; - } - } - return 0; -} - -/* - * del_silence - * - * Removes all silence masks from the list of sptr that fall within `mask' - * Returns -1 if none where found, 0 otherwise. - */ -int del_silence(struct Client *sptr, char *mask) -{ - struct SLink **lp; - struct SLink *tmp; - int ret = -1; - - for (lp = &(cli_user(sptr))->silence; *lp;) { - if (!mmatch(mask, (*lp)->value.cp)) - { - tmp = *lp; - *lp = tmp->next; - MyFree(tmp->value.cp); - free_link(tmp); - ret = 0; + if (buf_used) + buf[buf_used++] = ','; + buf[buf_used++] = '+'; + buf[buf_used++] = '~'; + memcpy(buf + buf_used, found->banstr, slen); + buf_used += slen; } - else - lp = &(*lp)->next; - } - return ret; -} - -int add_silence(struct Client* sptr, const char* mask) -{ - struct SLink *lp, **lpp; - int cnt = 0, len = strlen(mask); - char *ip_start; - - for (lpp = &(cli_user(sptr))->silence, lp = *lpp; lp;) - { - if (0 == ircd_strcmp(mask, lp->value.cp)) - return -1; - if (!mmatch(mask, lp->value.cp)) - { - struct SLink *tmp = lp; - *lpp = lp = lp->next; - MyFree(tmp->value.cp); - free_link(tmp); - continue; + /* Flush silence buffer. */ + if (buf_used) { + buf[buf_used] = '\0'; + sendcmdto_one(acptr, CMD_SILENCE, cli_from(sptr), "%C %s", sptr, buf); + buf_used = 0; } - if (MyUser(sptr)) - { - len += strlen(lp->value.cp); - if ((len > (feature_int(FEAT_AVBANLEN) * feature_int(FEAT_MAXSILES))) || - (++cnt >= feature_int(FEAT_MAXSILES))) - { - send_reply(sptr, ERR_SILELISTFULL, mask); - return -1; - } - else if (!mmatch(lp->value.cp, mask)) - return -1; - } - lpp = &lp->next; - lp = *lpp; } - lp = make_link(); - memset(lp, 0, sizeof(struct SLink)); - lp->next = cli_user(sptr)->silence; - 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; - cli_user(sptr)->silence = lp; - return 0; + return 1; } +/** Send RPL_ISUPPORT lines to \a cptr. + * @param[in] cptr Client to send ISUPPORT to. + * @return Zero. + */ int send_supported(struct Client *cptr) { @@ -1724,3 +1497,6 @@ send_supported(struct Client *cptr) return 0; /* convenience return, if it's ever needed */ } + +/* vim: shiftwidth=2 + */