#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 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 save_user(struct Client *, struct Client *, struct Client *);
static void bad_nickname(struct Client *, 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}
};
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);
* parv[1] = nickname
*/
static int
-mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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)
{
return 0;
}
- 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;
}
- /* 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);
* parv[1] = nickname
*/
static int
-m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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;
}
- /* 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);
}
/* 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[])
+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;
}
static int
-ms_nick(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+ms_nick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
const char *nick, *server;
* parv[9] - gecos
*/
static int
-ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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);
if(!clean_uid(parv[8], source_p->id))
{
- rb_snprintf(squitreason, sizeof squitreason,
- "Invalid UID %s for nick %s on %s",
- parv[8], parv[1], source_p->name);
+ 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;
}
* parv[11] - gecos
*/
static int
-ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+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);
if(!clean_uid(parv[8], source_p->id))
{
- rb_snprintf(squitreason, sizeof squitreason,
- "Invalid UID %s for nick %s on %s",
- parv[8], parv[1], source_p->name);
+ 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;
}
* parv[2] - TS
*/
static int
-ms_save(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+ms_save(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct Client *target_p;
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
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;
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",
{
ServerStats.is_kill++;
- sendto_one_numeric(target_p, ERR_NICKCOLLISION,
- form_str(ERR_NICKCOLLISION), target_p->name);
+ sendto_one_numeric(source_p, ERR_NICKCOLLISION,
+ form_str(ERR_NICKCOLLISION), source_p->name);
/* kill the client issuing the nickchange */
kill_client_serv_butone(client_p, source_p,
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);
}
projects / solanum.git / blobdiff