* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
- *
- * $Id: m_nick.c 3518 2007-06-22 21:59:09Z jilles $
*/
#include "stdinc.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
-#include "common.h"
#include "packet.h"
#include "scache.h"
#include "s_newconf.h"
#include "monitor.h"
+#include "s_assert.h"
/* Give all UID nicks the same TS. This ensures nick TS is always the same on
* all servers for each nick-user pair, also if a user with a UID nick changes
*/
#define SAVE_NICKTS 100
-static int mr_nick(struct Client *, struct Client *, int, const char **);
-static int m_nick(struct Client *, struct Client *, int, const char **);
-static int mc_nick(struct Client *, struct Client *, int, const char **);
-static int ms_nick(struct Client *, struct Client *, int, const char **);
-static int ms_uid(struct Client *, struct Client *, int, const char **);
-static int ms_euid(struct Client *, struct Client *, int, const char **);
-static int ms_save(struct Client *, struct Client *, int, const char **);
-static int can_save(struct Client *);
+static void mr_nick(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_nick(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mc_nick(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_nick(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_uid(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_euid(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void ms_save(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static bool can_save(struct Client *);
static void save_user(struct Client *, struct Client *, struct Client *);
static void bad_nickname(struct Client *, const char *);
+static void change_remote_nick(struct Client *, struct Client *, time_t,
+ const char *, int);
+static bool clean_username(const char *);
+static bool clean_host(const char *);
+static bool clean_uid(const char *uid, const char *sid);
+
+static void set_initial_nick(struct Client *client_p, struct Client *source_p, char *nick);
+static void change_local_nick(struct Client *client_p, struct Client *source_p, char *nick, int);
+static void register_client(struct Client *client_p, struct Client *server,
+ const char *nick, time_t newts, int parc, const char *parv[]);
+static void perform_nick_collides(struct Client *, struct Client *,
+ struct Client *, int, const char **,
+ time_t, const char *, const char *);
+static void perform_nickchange_collides(struct Client *, struct Client *,
+ struct Client *, int, const char **, time_t, const char *);
struct Message nick_msgtab = {
- "NICK", 0, 0, 0, MFLG_SLOW,
+ "NICK", 0, 0, 0, 0,
{{mr_nick, 0}, {m_nick, 0}, {mc_nick, 3}, {ms_nick, 0}, mg_ignore, {m_nick, 0}}
};
struct Message uid_msgtab = {
- "UID", 0, 0, 0, MFLG_SLOW,
+ "UID", 0, 0, 0, 0,
{mg_ignore, mg_ignore, mg_ignore, {ms_uid, 9}, mg_ignore, mg_ignore}
};
struct Message euid_msgtab = {
- "EUID", 0, 0, 0, MFLG_SLOW,
+ "EUID", 0, 0, 0, 0,
{mg_ignore, mg_ignore, mg_ignore, {ms_euid, 12}, mg_ignore, mg_ignore}
};
struct Message save_msgtab = {
- "SAVE", 0, 0, 0, MFLG_SLOW,
+ "SAVE", 0, 0, 0, 0,
{mg_ignore, mg_ignore, mg_ignore, {ms_save, 3}, mg_ignore, mg_ignore}
};
mapi_clist_av1 nick_clist[] = { &nick_msgtab, &uid_msgtab, &euid_msgtab,
&save_msgtab, NULL };
-DECLARE_MODULE_AV1(nick, NULL, NULL, nick_clist, NULL, NULL, "$Revision: 3518 $");
-
-static int change_remote_nick(struct Client *, struct Client *, time_t,
- const char *, int);
-
-static int clean_nick(const char *, int loc_client);
-static int clean_username(const char *);
-static int clean_host(const char *);
-static int clean_uid(const char *uid, const char *sid);
-
-static void set_initial_nick(struct Client *client_p, struct Client *source_p, char *nick);
-static void change_local_nick(struct Client *client_p, struct Client *source_p, char *nick, int);
-static int register_client(struct Client *client_p, struct Client *server,
- const char *nick, time_t newts, int parc, const char *parv[]);
+static const char nick_desc[] =
+ "Provides the NICK client and server commands as well as the UID, EUID, and SAVE TS6 server commands";
-static int perform_nick_collides(struct Client *, struct Client *,
- struct Client *, int, const char **,
- time_t, const char *, const char *);
-static int perform_nickchange_collides(struct Client *, struct Client *,
- struct Client *, int, const char **, time_t, const char *);
+DECLARE_MODULE_AV2(nick, NULL, NULL, nick_clist, NULL, NULL, NULL, NULL, nick_desc);
/* mr_nick()
* parv[1] = nickname
*/
-static int
-mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mr_nick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct Client *target_p;
char nick[NICKLEN];
- char *s;
if (strlen(client_p->id) == 3)
{
exit_client(client_p, client_p, client_p, "Mixing client and server protocol");
- return 0;
+ return;
}
- if(parc < 2 || EmptyString(parv[1]) || (parv[1][0] == '~'))
+ if(parc < 2 || EmptyString(parv[1]))
{
sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN),
me.name, EmptyString(source_p->name) ? "*" : source_p->name);
- return 0;
+ return;
}
- /* due to the scandinavian origins, (~ being uppercase of ^) and ~
- * being disallowed as a nick char, we need to chop the first ~
- * instead of just erroring.
- */
- if((s = strchr(parv[1], '~')))
- *s = '\0';
-
/* copy the nick and terminate it */
rb_strlcpy(nick, parv[1], ConfigFileEntry.nicklen);
{
sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME),
me.name, EmptyString(source_p->name) ? "*" : source_p->name, parv[1]);
- return 0;
+ return;
}
/* check if the nick is resv'd */
{
sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME),
me.name, EmptyString(source_p->name) ? "*" : source_p->name, nick);
- return 0;
+ return;
}
- if(irc_dictionary_find(nd_dict, nick))
+ if(rb_dictionary_find(nd_dict, nick))
{
sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
me.name, EmptyString(source_p->name) ? "*" : source_p->name, nick);
- return 0;
+ return;
}
if((target_p = find_named_client(nick)) == NULL)
strcpy(source_p->name, nick);
else
sendto_one(source_p, form_str(ERR_NICKNAMEINUSE), me.name, "*", nick);
-
- return 0;
}
/* m_nick()
* parv[1] = nickname
*/
-static int
-m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_nick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct Client *target_p;
char nick[NICKLEN];
- char *s;
- if(parc < 2 || EmptyString(parv[1]) || (parv[1][0] == '~'))
+ if(parc < 2 || EmptyString(parv[1]))
{
sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN), me.name, source_p->name);
- return 0;
+ return;
}
- /* due to the scandinavian origins, (~ being uppercase of ^) and ~
- * being disallowed as a nick char, we need to chop the first ~
- * instead of just erroring.
- */
- if((s = strchr(parv[1], '~')))
- *s = '\0';
-
/* mark end of grace period, to prevent nickflooding */
if(!IsFloodDone(source_p))
flood_endgrace(source_p);
if(!clean_nick(nick, 1))
{
sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME), me.name, source_p->name, nick);
- return 0;
+ return;
}
if(!IsExemptResv(source_p) && find_nick_resv(nick))
{
sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME), me.name, source_p->name, nick);
- return 0;
+ return;
}
- if(irc_dictionary_find(nd_dict, nick))
+ if(rb_dictionary_find(nd_dict, nick))
{
sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
me.name, EmptyString(source_p->name) ? "*" : source_p->name, nick);
- return 0;
+ return;
}
if((target_p = find_named_client(nick)))
else
sendto_one(source_p, form_str(ERR_NICKNAMEINUSE), me.name, source_p->name, nick);
- return 0;
+ return;
}
else
change_local_nick(client_p, source_p, nick, 1);
-
- return 0;
}
/* mc_nick()
- *
+ *
* server -> server nick change
* parv[1] = nickname
* parv[2] = TS when nick change
*/
-static int
-mc_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mc_nick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct Client *target_p;
time_t newts = 0;
if(!clean_nick(parv[1], 0))
{
bad_nickname(client_p, parv[1]);
- return 0;
+ return;
}
newts = atol(parv[2]);
else
perform_nickchange_collides(source_p, client_p, target_p,
parc, parv, newts, parv[1]);
-
- return 0;
}
-static int
-ms_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_nick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
const char *nick, *server;
client_p->name, nick, server);
exit_client(client_p, client_p, &me, "TS5 nickname introduced");
-
- return 0;
}
/* ms_uid()
* parv[8] - UID
* parv[9] - gecos
*/
-static int
-ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_uid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct Client *target_p;
time_t newts = 0;
"with %d arguments (expecting 10)", client_p->name, parc);
ilog(L_SERVER, "Excess parameters (%d) for command 'UID' from %s.",
parc, client_p->name);
- rb_snprintf(squitreason, sizeof squitreason,
+ snprintf(squitreason, sizeof squitreason,
"Excess parameters (%d) to %s command, expecting %d",
parc, "UID", 10);
exit_client(client_p, client_p, client_p, squitreason);
- return 0;
+ return;
}
/* if nicks erroneous, or too long, kill */
if(!clean_nick(parv[1], 0))
{
bad_nickname(client_p, parv[1]);
- return 0;
+ return;
}
if(!clean_uid(parv[8], source_p->id))
{
- rb_snprintf(squitreason, sizeof squitreason,
+ snprintf(squitreason, sizeof squitreason,
"Invalid UID %s for nick %s on %s/%s",
parv[8], parv[1], source_p->name, source_p->id);
exit_client(client_p, client_p, client_p, squitreason);
- return 0;
+ return;
}
if(!clean_username(parv[5]) || !clean_host(parv[6]))
"Bad user@host: %s@%s From: %s(via %s)",
parv[5], parv[6], source_p->name, client_p->name);
sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name);
- return 0;
+ return;
}
/* check length of clients gecos */
else
perform_nick_collides(source_p, client_p, target_p, parc, parv,
newts, parv[1], parv[8]);
-
- return 0;
}
/* ms_euid()
* parv[10] - account
* parv[11] - gecos
*/
-static int
-ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_euid(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct Client *target_p;
time_t newts = 0;
"with %d arguments (expecting 12)", client_p->name, parc);
ilog(L_SERVER, "Excess parameters (%d) for command 'EUID' from %s.",
parc, client_p->name);
- rb_snprintf(squitreason, sizeof squitreason,
+ snprintf(squitreason, sizeof squitreason,
"Excess parameters (%d) to %s command, expecting %d",
parc, "EUID", 12);
exit_client(client_p, client_p, client_p, squitreason);
- return 0;
+ return;
}
/* if nicks erroneous, or too long, kill */
if(!clean_nick(parv[1], 0))
{
bad_nickname(client_p, parv[1]);
- return 0;
+ return;
}
if(!clean_uid(parv[8], source_p->id))
{
- rb_snprintf(squitreason, sizeof squitreason,
+ snprintf(squitreason, sizeof squitreason,
"Invalid UID %s for nick %s on %s/%s",
parv[8], parv[1], source_p->name, source_p->id);
exit_client(client_p, client_p, client_p, squitreason);
- return 0;
+ return;
}
if(!clean_username(parv[5]) || !clean_host(parv[6]))
"Bad user@host: %s@%s From: %s(via %s)",
parv[5], parv[6], source_p->name, client_p->name);
sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name);
- return 0;
+ return;
}
if(strcmp(parv[9], "*") && !clean_host(parv[9]))
"Bad realhost: %s From: %s(via %s)",
parv[9], source_p->name, client_p->name);
sendto_one(client_p, ":%s KILL %s :%s (Bad user@host)", me.id, parv[8], me.name);
- return 0;
+ return;
}
/* check length of clients gecos */
else
perform_nick_collides(source_p, client_p, target_p, parc, parv,
newts, parv[1], parv[8]);
-
- return 0;
}
/* ms_save()
* parv[1] - UID
* parv[2] - TS
*/
-static int
-ms_save(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_save(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct Client *target_p;
target_p = find_id(parv[1]);
if (target_p == NULL)
- return 0;
+ return;
if (!IsPerson(target_p))
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Ignored SAVE message for non-person %s from %s",
sendto_realops_snomask(SNO_SKILL, L_ALL,
"Ignored SAVE message for %s from %s",
target_p->name, source_p->name);
- return 0;
-}
-
-/* clean_nick()
- *
- * input - nickname to check
- * output - 0 if erroneous, else 1
- * side effects -
- */
-static int
-clean_nick(const char *nick, int loc_client)
-{
- int len = 0;
-
- /* nicks cant start with a digit or -, and must have a length */
- if(*nick == '-' || *nick == '\0')
- return 0;
-
- if(loc_client && IsDigit(*nick))
- return 0;
-
- for(; *nick; nick++)
- {
- len++;
- if(!IsNickChar(*nick))
- return 0;
- }
-
- /* nicklen is +1 */
- if(len >= NICKLEN && len >= ConfigFileEntry.nicklen)
- return 0;
-
- return 1;
}
/* clean_username()
*
* input - username to check
- * output - 0 if erroneous, else 0
+ * output - false if erroneous, else true
* side effects -
*/
-static int
+static bool
clean_username(const char *username)
{
int len = 0;
len++;
if(!IsUserChar(*username))
- return 0;
+ return false;
}
if(len > USERLEN)
- return 0;
+ return false;
- return 1;
+ return true;
}
/* clean_host()
*
* input - host to check
- * output - 0 if erroneous, else 0
+ * output - false if erroneous, else true
* side effects -
*/
-static int
+static bool
clean_host(const char *host)
{
int len = 0;
len++;
if(!IsHostChar(*host))
- return 0;
+ return false;
}
if(len > HOSTLEN)
- return 0;
+ return false;
- return 1;
+ return true;
}
-static int
+static bool
clean_uid(const char *uid, const char *sid)
{
int len = 1;
if(strncmp(uid, sid, strlen(sid)))
- return 0;
+ return false;
if(!IsDigit(*uid++))
- return 0;
+ return false;
for(; *uid; uid++)
{
len++;
if(!IsIdChar(*uid))
- return 0;
+ return false;
}
if(len != IDLEN - 1)
- return 0;
+ return false;
- return 1;
+ return true;
}
static void
set_initial_nick(struct Client *client_p, struct Client *source_p, char *nick)
{
- char buf[USERLEN + 1];
char note[NICKLEN + 10];
/* This had to be copied here to avoid problems.. */
strcpy(source_p->name, nick);
add_to_client_hash(nick, source_p);
- rb_snprintf(note, sizeof(note), "Nick: %s", nick);
+ snprintf(note, sizeof(note), "Nick: %s", nick);
rb_note(client_p->localClient->F, note);
if(source_p->flags & FLAGS_SENTUSER)
{
- rb_strlcpy(buf, source_p->username, sizeof(buf));
-
/* got user, heres nick. */
- register_local_user(client_p, source_p, buf);
-
+ register_local_user(client_p, source_p);
}
}
source_p->name, nick, source_p->username, source_p->host);
/* send the nick change to the users channels */
- sendto_common_channels_local(source_p, NOCAPS, ":%s!%s@%s NICK :%s",
+ sendto_common_channels_local(source_p, NOCAPS, NOCAPS, ":%s!%s@%s NICK :%s",
source_p->name, source_p->username, source_p->host, nick);
/* send the nick change to servers.. */
if(source_p->user)
{
- add_history(source_p, 1);
+ whowas_add_history(source_p, 1);
if (dosend)
{
monitor_signon(source_p);
/* Make sure everyone that has this client on its accept list
- * loses that reference.
+ * loses that reference.
*/
/* we used to call del_all_accepts() here, but theres no real reason
* to clear a clients own list of accepted clients. So just remove
rb_dlinkDestroy(ptr, &source_p->on_allow_list);
}
- rb_snprintf(note, sizeof(note), "Nick: %s", nick);
+ snprintf(note, sizeof(note), "Nick: %s", nick);
rb_note(client_p->localClient->F, note);
return;
/*
* change_remote_nick()
*/
-static int
+static void
change_remote_nick(struct Client *client_p, struct Client *source_p,
time_t newts, const char *nick, int dosend)
{
monitor_signoff(source_p);
}
- sendto_common_channels_local(source_p, NOCAPS, ":%s!%s@%s NICK :%s",
+ sendto_common_channels_local(source_p, NOCAPS, NOCAPS, ":%s!%s@%s NICK :%s",
source_p->name, source_p->username, source_p->host, nick);
if(source_p->user)
{
- add_history(source_p, 1);
+ whowas_add_history(source_p, 1);
if (dosend)
{
sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
del_from_client_hash(source_p->name, source_p);
/* invalidate nick delay when a remote client uses the nick.. */
- if((nd = irc_dictionary_retrieve(nd_dict, nick)))
+ if((nd = rb_dictionary_retrieve(nd_dict, nick)))
free_nd_entry(nd);
strcpy(source_p->name, nick);
/* remove all accepts pointing to the client */
del_all_accepts(source_p);
-
- return 0;
}
-static int
+static void
perform_nick_collides(struct Client *source_p, struct Client *client_p,
struct Client *target_p, int parc, const char *parv[],
time_t newts, const char *nick, const char *uid)
target_p->flags |= FLAGS_KILLED;
exit_client(client_p, target_p, &me, "Nick collision (new)");
}
- return 0;
+ return;
}
/* the timestamps are different */
else
sendto_one(client_p,
":%s KILL %s :%s (Nick collision (new))",
me.id, uid, me.name);
- return 0;
+ return;
}
else
{
register_client(client_p, source_p,
nick, newts, parc, parv);
-
- return 0;
}
}
}
-static int
+static void
perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
struct Client *target_p, int parc,
const char *parv[], time_t newts, const char *nick)
source_p->flags |= FLAGS_KILLED;
exit_client(client_p, source_p, &me, "Nick collision(old)");
}
- return 0;
+ return;
}
else
{
else
exit_client(client_p, source_p, &me, "Nick collision(new)");
}
- return 0;
+ return;
}
else
{
}
change_remote_nick(client_p, source_p, newts, nick, 1);
-
- return 0;
}
-static int
+static void
register_client(struct Client *client_p, struct Client *server,
const char *nick, time_t newts, int parc, const char *parv[])
{
}
/* remove any nd entries for this nick */
- if((nd = irc_dictionary_retrieve(nd_dict, nick)))
+ if((nd = rb_dictionary_retrieve(nd_dict, nick)))
free_nd_entry(nd);
add_to_client_hash(nick, source_p);
call_hook(h_new_remote_user, source_p);
- return (introduce_client(client_p, source_p, user, nick, parc == 12));
+ introduce_client(client_p, source_p, user, nick, parc == 12);
}
/* Check if we can do SAVE. target_p can be a client to save or a
* server introducing a client -- jilles */
-static int
+static bool
can_save(struct Client *target_p)
{
struct Client *serv_p;
if (MyClient(target_p))
- return 1;
+ return true;
if (!has_id(target_p))
- return 0;
+ return false;
serv_p = IsServer(target_p) ? target_p : target_p->servptr;
while (serv_p != NULL && serv_p != &me)
{
if (!(serv_p->serv->caps & CAP_SAVE))
- return 0;
+ return false;
serv_p = serv_p->servptr;
}
return serv_p == &me;
ilog(L_SERVER, "Link %s cancelled, bad nickname %s sent (NICKLEN mismatch?)",
client_p->name, nick);
- rb_snprintf(squitreason, sizeof squitreason,
+ snprintf(squitreason, sizeof squitreason,
"Bad nickname introduced [%s]", nick);
exit_client(client_p, client_p, &me, squitreason);
}