#include "msg.h"
#include "parse.h"
#include "modules.h"
-#include "common.h"
#include "packet.h"
#include "scache.h"
#include "s_newconf.h"
*/
#define SAVE_NICKTS 100
-static int mr_nick(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int m_nick(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int mc_nick(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int ms_nick(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int ms_uid(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int ms_euid(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
-static int ms_save(struct MsgBuf *, 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 *);
+
+static int h_local_nick_change;
+static int h_remote_nick_change;
struct Message nick_msgtab = {
"NICK", 0, 0, 0, 0,
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_username(const char *);
-static int clean_host(const char *);
-static int clean_uid(const char *uid, const char *sid);
+mapi_hlist_av1 nick_hlist[] = {
+ { "local_nick_change", &h_local_nick_change },
+ { "remote_nick_change", &h_remote_nick_change },
+ { NULL, NULL }
+};
-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, nick_hlist, NULL, NULL, NULL, nick_desc);
/* mr_nick()
* parv[1] = nickname
*/
-static int
+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];
- if (strlen(client_p->id) == 3)
+ if (strlen(client_p->id) == 3 || (source_p->preClient && !EmptyString(source_p->preClient->id)))
{
exit_client(client_p, client_p, client_p, "Mixing client and server protocol");
- return 0;
+ return;
}
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;
}
/* copy the nick and terminate it */
{
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(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)
set_initial_nick(client_p, source_p, nick);
else if(source_p == target_p)
- strcpy(source_p->name, nick);
+ rb_strlcpy(source_p->name, nick, sizeof(source_p->name));
else
sendto_one(source_p, form_str(ERR_NICKNAMEINUSE), me.name, "*", nick);
-
- return 0;
}
/* m_nick()
* parv[1] = nickname
*/
-static int
+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;
if(parc < 2 || EmptyString(parv[1]))
{
sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN), me.name, source_p->name);
- return 0;
+ return;
}
/* mark end of grace period, to prevent nickflooding */
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(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()
* parv[1] = nickname
* parv[2] = TS when nick change
*/
-static int
+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;
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
+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
+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;
if(parc != 10)
{
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
"Dropping server %s due to (invalid) command 'UID' "
"with %d arguments (expecting 10)", client_p->name, parc);
ilog(L_SERVER, "Excess parameters (%d) for command 'UID' from %s.",
"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))
"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]))
{
ServerStats.is_kill++;
- sendto_realops_snomask(SNO_DEBUG, L_ALL,
+ sendto_realops_snomask(SNO_DEBUG, L_NETWIDE,
"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 */
if(strlen(parv[9]) > REALLEN)
{
char *s = LOCAL_COPY(parv[9]);
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "Long realname from server %s for %s",
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Long realname from server %s for %s",
source_p->name, parv[1]);
s[REALLEN] = '\0';
parv[9] = s;
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
+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;
if(parc != 12)
{
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
"Dropping server %s due to (invalid) command 'EUID' "
"with %d arguments (expecting 12)", client_p->name, parc);
ilog(L_SERVER, "Excess parameters (%d) for command 'EUID' from %s.",
"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))
"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]))
{
ServerStats.is_kill++;
- sendto_realops_snomask(SNO_DEBUG, L_ALL,
+ sendto_realops_snomask(SNO_DEBUG, L_NETWIDE,
"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]))
{
ServerStats.is_kill++;
- sendto_realops_snomask(SNO_DEBUG, L_ALL,
+ sendto_realops_snomask(SNO_DEBUG, L_NETWIDE,
"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 */
if(strlen(parv[11]) > REALLEN)
{
char *s = LOCAL_COPY(parv[11]);
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "Long realname from server %s for %s",
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Long realname from server %s for %s",
source_p->name, parv[1]);
s[REALLEN] = '\0';
parv[11] = s;
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
+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_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
if(source_p->name[0])
del_from_client_hash(source_p->name, source_p);
- strcpy(source_p->name, nick);
+ rb_strlcpy(source_p->name, nick, sizeof(source_p->name));
add_to_client_hash(nick, source_p);
snprintf(note, sizeof(note), "Nick: %s", nick);
struct Channel *chptr;
char note[NICKLEN + 10];
int samenick;
+ hook_cdata hook_info;
if (dosend)
{
source_p->localClient->last_nick_change = rb_current_time();
source_p->localClient->number_of_nick_changes++;
- if(ConfigFileEntry.anti_nick_flood && !IsOper(source_p) &&
+ if(ConfigFileEntry.anti_nick_flood && !IsOperGeneral(source_p) &&
source_p->localClient->number_of_nick_changes > ConfigFileEntry.max_nick_changes)
{
sendto_one(source_p, form_str(ERR_NICKTOOFAST),
invalidate_bancache_user(source_p);
}
+ hook_info.client = source_p;
+ hook_info.arg1 = source_p->name;
+ hook_info.arg2 = nick;
+ call_hook(h_local_nick_change, &hook_info);
+
sendto_realops_snomask(SNO_NCHANGE, L_ALL,
"Nick change: From %s to %s [%s@%s]",
source_p->name, nick, source_p->username, source_p->host);
/* Finally, add to hash */
del_from_client_hash(source_p->name, source_p);
- strcpy(source_p->name, nick);
+ rb_strlcpy(source_p->name, nick, sizeof(source_p->name));
add_to_client_hash(nick, source_p);
if(!samenick)
/*
* 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)
{
struct nd_entry *nd;
int samenick = irccmp(source_p->name, nick) ? 0 : 1;
+ hook_cdata hook_info;
/* client changing their nick - dont reset ts if its same */
if(!samenick)
monitor_signoff(source_p);
}
+ hook_info.client = source_p;
+ hook_info.arg1 = source_p->name;
+ hook_info.arg2 = nick;
+ call_hook(h_remote_nick_change, &hook_info);
+
sendto_common_channels_local(source_p, NOCAPS, NOCAPS, ":%s!%s@%s NICK :%s",
source_p->name, source_p->username, source_p->host, nick);
if((nd = rb_dictionary_retrieve(nd_dict, nick)))
free_nd_entry(nd);
- strcpy(source_p->name, nick);
+ rb_strlcpy(source_p->name, nick, sizeof(source_p->name));
add_to_client_hash(nick, source_p);
if(!samenick)
/* 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)
/* if we dont have a ts, or their TS's are the same, kill both */
if(!newts || !target_p->tsinfo || (newts == target_p->tsinfo))
{
- sendto_realops_snomask(SNO_SKILL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_NETWIDE,
"Nick collision on %s(%s <- %s)(both %s)",
target_p->name, target_p->from->name, client_p->name, action);
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
{
if(sameuser)
- sendto_realops_snomask(SNO_SKILL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_NETWIDE,
"Nick collision on %s(%s <- %s)(older %s)",
target_p->name, target_p->from->name,
client_p->name, action);
else
- sendto_realops_snomask(SNO_SKILL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_NETWIDE,
"Nick collision on %s(%s <- %s)(newer %s)",
target_p->name, target_p->from->name,
client_p->name, action);
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)
/* its a client changing nick and causing a collide */
if(!newts || !target_p->tsinfo || (newts == target_p->tsinfo) || !source_p->user)
{
- sendto_realops_snomask(SNO_SKILL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_NETWIDE,
"Nick change collision from %s to %s(%s <- %s)(both %s)",
source_p->name, target_p->name, target_p->from->name,
client_p->name, action);
source_p->flags |= FLAGS_KILLED;
exit_client(client_p, source_p, &me, "Nick collision(old)");
}
- return 0;
+ return;
}
else
{
(!sameuser && newts > target_p->tsinfo))
{
if(sameuser)
- sendto_realops_snomask(SNO_SKILL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_NETWIDE,
"Nick change collision from %s to %s(%s <- %s)(older %s)",
source_p->name, target_p->name,
target_p->from->name, client_p->name, action);
else
- sendto_realops_snomask(SNO_SKILL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_NETWIDE,
"Nick change collision from %s to %s(%s <- %s)(newer %s)",
source_p->name, target_p->name,
target_p->from->name, client_p->name, action);
else
exit_client(client_p, source_p, &me, "Nick collision(new)");
}
- return 0;
+ return;
}
else
{
if(sameuser)
- sendto_realops_snomask(SNO_SKILL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_NETWIDE,
"Nick collision on %s(%s <- %s)(older %s)",
target_p->name, target_p->from->name,
client_p->name, action);
else
- sendto_realops_snomask(SNO_SKILL, L_ALL,
+ sendto_realops_snomask(SNO_SKILL, L_NETWIDE,
"Nick collision on %s(%s <- %s)(newer %s)",
target_p->name, target_p->from->name,
client_p->name, action);
}
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[])
{
source_p->hopcount = atoi(parv[2]);
source_p->tsinfo = newts;
- strcpy(source_p->name, nick);
+ rb_strlcpy(source_p->name, nick, sizeof(source_p->name));
rb_strlcpy(source_p->username, parv[5], sizeof(source_p->username));
rb_strlcpy(source_p->host, parv[6], sizeof(source_p->host));
rb_strlcpy(source_p->orighost, source_p->host, sizeof(source_p->orighost));
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;
{
/* This shouldn't happen */
/* Note we only need SAVE support in this direction */
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
"Killed %s!%s@%s for nick collision detected by %s (%s does not support SAVE)",
target_p->name, target_p->username, target_p->host, source_p->name, target_p->from->name);
kill_client_serv_butone(NULL, target_p, "%s (Nick collision (no SAVE support))", me.name);
projects / solanum.git / blobdiff