Move to ratbox3 reject and throttle code.

[solanum.git] / modules / core / m_nick.c

diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index a87b436fe4dc8a460700e1b5aa371a05d801c49d..7d0996c6587c028904c77394942fec1973e05d8d 100644 (file)
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
@@ -139,7 +139,7 @@ mr_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
                *s = '\0';
 
        /* copy the nick and terminate it */
-       strlcpy(nick, parv[1], sizeof(nick));
+       rb_strlcpy(nick, parv[1], sizeof(nick));
 
        /* check the nickname is ok */
        if(!clean_nick(nick, 1))
@@ -203,7 +203,7 @@ m_nick(struct Client *client_p, struct Client *source_p, int parc, const char *p
                flood_endgrace(source_p);
 
        /* terminate nick to NICKLEN, we dont want clean_nick() to error! */
-       strlcpy(nick, parv[1], sizeof(nick));
+       rb_strlcpy(nick, parv[1], sizeof(nick));
 
        /* check the nickname is ok */
        if(!clean_nick(nick, 1))
@@ -724,7 +724,7 @@ set_initial_nick(struct Client *client_p, struct Client *source_p, char *nick)
 
        if(source_p->flags & FLAGS_SENTUSER)
        {
-               strlcpy(buf, source_p->username, sizeof(buf));
+               rb_strlcpy(buf, source_p->username, sizeof(buf));
 
                /* got user, heres nick. */
                register_local_user(client_p, source_p, buf);
@@ -801,8 +801,6 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
                {
                        sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
                                        use_id(source_p), nick, (long) source_p->tsinfo);
-                       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-                                       source_p->name, nick, (long) source_p->tsinfo);
                }
        }
 
@@ -862,8 +860,6 @@ change_remote_nick(struct Client *client_p, struct Client *source_p,
                {
                        sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
                                        use_id(source_p), nick, (long) source_p->tsinfo);
-                       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-                                       source_p->name, nick, (long) source_p->tsinfo);
                }
        }
 
@@ -901,7 +897,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
        /* 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_GENERAL, L_ALL,
+               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                     "Nick collision on %s(%s <- %s)(both %s)",
                                     target_p->name, target_p->from->name, client_p->name, action);
 
@@ -964,12 +960,12 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
                else
                {
                        if(sameuser)
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                                     "Nick collision on %s(%s <- %s)(older %s)",
                                                     target_p->name, target_p->from->name,
                                                     client_p->name, action);
                        else
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                                     "Nick collision on %s(%s <- %s)(newer %s)",
                                                     target_p->name, target_p->from->name,
                                                     client_p->name, action);
@@ -1018,7 +1014,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
        /* 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_GENERAL, L_ALL,
+               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                     "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);
@@ -1061,12 +1057,12 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
                   (!sameuser && newts > target_p->tsinfo))
                {
                        if(sameuser)
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                                     "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_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                                     "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);
@@ -1106,12 +1102,12 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
                else
                {
                        if(sameuser)
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                                     "Nick collision on %s(%s <- %s)(older %s)",
                                                     target_p->name, target_p->from->name,
                                                     client_p->name, action);
                        else
-                               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                               sendto_realops_snomask(SNO_SKILL, L_ALL,
                                                     "Nick collision on %s(%s <- %s)(newer %s)",
                                                     target_p->name, target_p->from->name,
                                                     client_p->name, action);
@@ -1173,35 +1169,35 @@ register_client(struct Client *client_p, struct Client *server,
        source_p->tsinfo = newts;
 
        strcpy(source_p->name, nick);
-       strlcpy(source_p->username, parv[5], sizeof(source_p->username));
-       strlcpy(source_p->host, parv[6], sizeof(source_p->host));
-       strlcpy(source_p->orighost, source_p->host, sizeof(source_p->orighost));
+       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));
 
        if(parc == 12)
        {
-               strlcpy(source_p->info, parv[11], sizeof(source_p->info));
-               strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
-               strlcpy(source_p->id, parv[8], sizeof(source_p->id));
+               rb_strlcpy(source_p->info, parv[11], sizeof(source_p->info));
+               rb_strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
+               rb_strlcpy(source_p->id, parv[8], sizeof(source_p->id));
                add_to_id_hash(source_p->id, source_p);
                if (strcmp(parv[9], "*"))
                {
-                       strlcpy(source_p->orighost, parv[9], sizeof(source_p->orighost));
+                       rb_strlcpy(source_p->orighost, parv[9], sizeof(source_p->orighost));
                        if (irccmp(source_p->host, source_p->orighost))
                                SetDynSpoof(source_p);
                }
                if (strcmp(parv[10], "*"))
-                       strlcpy(source_p->user->suser, parv[10], sizeof(source_p->user->suser));
+                       rb_strlcpy(source_p->user->suser, parv[10], sizeof(source_p->user->suser));
        }
        else if(parc == 10)
        {
-               strlcpy(source_p->info, parv[9], sizeof(source_p->info));
-               strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
-               strlcpy(source_p->id, parv[8], sizeof(source_p->id));
+               rb_strlcpy(source_p->info, parv[9], sizeof(source_p->info));
+               rb_strlcpy(source_p->sockhost, parv[7], sizeof(source_p->sockhost));
+               rb_strlcpy(source_p->id, parv[8], sizeof(source_p->id));
                add_to_id_hash(source_p->id, source_p);
        }
        else
        {
-               strlcpy(source_p->info, parv[8], sizeof(source_p->info));
+               rb_strlcpy(source_p->info, parv[8], sizeof(source_p->info));
        }
 
        /* remove any nd entries for this nick */
@@ -1327,8 +1323,6 @@ save_user(struct Client *client_p, struct Client *source_p,
                        source_p->id, target_p->id, (long)target_p->tsinfo);
        sendto_server(client_p, NULL, CAP_TS6, CAP_SAVE, ":%s NICK %s :%ld",
                        target_p->id, target_p->id, (long)SAVE_NICKTS);
-       sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-                       target_p->name, target_p->id, (long)SAVE_NICKTS);
        if (!IsMe(client_p))
                sendto_realops_snomask(SNO_SKILL, L_ALL,
                                "Received SAVE message for %s from %s",
@@ -1354,9 +1348,6 @@ static void bad_nickname(struct Client *client_p, const char *nick)
        sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
                        ":%s WALLOPS :Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
                        me.id, client_p->name, nick);
-       sendto_server(NULL, NULL, NOCAPS, CAP_TS6,
-                       ":%s WALLOPS :Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
-                       me.name, client_p->name, nick);
 
        rb_snprintf(squitreason, sizeof squitreason,
                        "Bad nickname introduced [%s]", nick);