Improve server notices for servers introducing existing servers.

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

diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index dfcf18e566b38c92509f3bfbfbe4cf741bfd3ac4..d2c40a93f1a72bfc4ef73a092ef95151a5ff20bd 100644 (file)
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -28,7 +28,7 @@
 #include "client.h"            /* client struct */
 #include "common.h"            /* TRUE bleah */
 #include "hash.h"              /* add_to_client_hash */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"              /* me */
 #include "numeric.h"           /* ERR_xxx */
 #include "s_conf.h"            /* struct ConfItem */
@@ -79,13 +79,13 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
 
        name = parv[1];
        hop = atoi(parv[2]);
-       strlcpy(info, parv[3], sizeof(info));
+       rb_strlcpy(info, parv[3], sizeof(info));
 
        if (IsHandshake(client_p) && irccmp(client_p->name, name))
        {
                sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
                                "Server %s has unexpected name %s",
-                               get_server_name(client_p, HIDE_IP), name);
+                               client_p->name, name);
                ilog(L_SERVER, "Server %s has unexpected name %s",
                                log_client_name(client_p, SHOW_IP), name);
                exit_client(client_p, client_p, client_p, "Server name mismatch");
@@ -98,7 +98,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
        if(!DoesTS(client_p))
        {
                sendto_realops_snomask(SNO_GENERAL, L_ALL, "Link %s dropped, non-TS server",
-                                    get_server_name(client_p, HIDE_IP));
+                                    client_p->name);
                exit_client(client_p, client_p, client_p, "Non-TS server");
                return 0;
        }
@@ -119,7 +119,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                             "Unauthorised server connection attempt from %s: "
                                             "No entry for servername %s",
-                                            get_server_name(client_p, HIDE_IP), name);
+                                            client_p->name, name);
 
                        ilog(L_SERVER, "Access denied, no connect block for server %s%s",
                             EmptyString(client_p->name) ? name : "",
@@ -135,7 +135,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
                sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
                                     "Unauthorised server connection attempt from %s: "
                                     "Bad password for server %s",
-                                    get_server_name(client_p, HIDE_IP), name);
+                                    client_p->name, name);
 
                ilog(L_SERVER, "Access denied, invalid password for server %s%s",
                     EmptyString(client_p->name) ? name : "",
@@ -150,7 +150,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Unauthorised server connection attempt from %s: "
                                     "Invalid host for server %s",
-                                    get_server_name(client_p, HIDE_IP), name);
+                                    client_p->name, name);
 
                ilog(L_SERVER, "Access denied, invalid host for server %s%s",
                     EmptyString(client_p->name) ? name : "",
@@ -165,7 +165,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
        case -4:
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Invalid servername %s from %s",
-                                    name, get_server_name(client_p, HIDE_IP));
+                                    name, client_p->name);
                ilog(L_SERVER, "Access denied, invalid servername from %s",
                     log_client_name(client_p, SHOW_IP));
 
@@ -174,13 +174,22 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
                /* NOT REACHED */
                break;
        case -5:
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,\r
-                    "Connection from servername %s requires SSL/TLS but is plaintext",\r
-                    name);\r
-               ilog(L_SERVER, "Access denied, requires SSL/TLS but is plaintext from %s", \r
-                    log_client_name(client_p, SHOW_IP));\r
-\r
-               exit_client(client_p, client_p, client_p, "Access denied, requires SSL/TLS but is plaintext");\r
+               sendto_realops_snomask(SNO_GENERAL, L_ALL,
+                    "Connection from servername %s requires SSL/TLS but is plaintext",
+                    name);
+               ilog(L_SERVER, "Access denied, requires SSL/TLS but is plaintext from %s", 
+                    log_client_name(client_p, SHOW_IP));
+
+               exit_client(client_p, client_p, client_p, "Access denied, requires SSL/TLS but is plaintext");
+               return 0;
+       }
+
+       /* require TS6 for direct links */
+       if(!IsCapable(client_p, CAP_TS6))
+       {
+               sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
+                                       "Link %s dropped, TS6 protocol is required", name);
+               exit_client(client_p, client_p, client_p, "Incompatible TS version");
                return 0;
        }
 
@@ -199,7 +208,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
                 */
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Attempt to re-introduce server %s from %s",
-                                    name, get_server_name(client_p, HIDE_IP));
+                                    name, client_p->name);
                ilog(L_SERVER, "Attempt to re-introduce server %s from %s",
                                name, log_client_name(client_p, SHOW_IP));
 
@@ -211,14 +220,15 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
        if(has_id(client_p) && (target_p = find_id(client_p->id)) != NULL)
        {
                sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
-                                    "Attempt to re-introduce SID %s from %s%s",
+                                    "Attempt to re-introduce SID %s from %s%s (already in use by %s)",
                                     client_p->id,
                                     EmptyString(client_p->name) ? name : "",
-                                    get_server_name(client_p, HIDE_IP));
-               ilog(L_SERVER, "Attempt to re-introduce SID %s from %s%s",
+                                    client_p->name, target_p->name);
+               ilog(L_SERVER, "Attempt to re-introduce SID %s from %s%s (already in use by %s)",
                                client_p->id,
                                EmptyString(client_p->name) ? name : "",
-                               log_client_name(client_p, SHOW_IP));
+                               log_client_name(client_p, SHOW_IP),
+                               target_p->name);
 
                sendto_one(client_p, "ERROR :SID already exists.");
                exit_client(client_p, client_p, client_p, "SID Exists");
@@ -230,7 +240,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
         * C:line in client_p->name
         */
 
-       strlcpy(client_p->name, name, sizeof(client_p->name));
+       rb_strlcpy(client_p->name, name, sizeof(client_p->name));
        set_server_gecos(client_p, info);
        client_p->hopcount = hop;
        server_estab(client_p);
@@ -258,10 +268,11 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
        int hlined = 0;
        int llined = 0;
        rb_dlink_node *ptr;
+       char squitreason[160];
 
        name = parv[1];
        hop = atoi(parv[2]);
-       strlcpy(info, parv[3], sizeof(info));
+       rb_strlcpy(info, parv[3], sizeof(info));
 
        if((target_p = find_server(NULL, name)))
        {
@@ -283,21 +294,13 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
                 * doesnt exist, although ircd can handle it, its not a realistic
                 * solution.. --fl_ 
                 */
-               /* It is behind a host-masked server. Completely ignore the
-                * server message(don't propagate or we will delink from whoever
-                * we propagate to). -A1kmm */
-               if(irccmp(target_p->name, name) && target_p->from == client_p)
-                       return 0;
-
-               sendto_one(client_p, "ERROR :Server %s already exists", name);
-
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                    "Link %s cancelled, server %s already exists",
-                                    get_server_name(client_p, SHOW_IP), name);
                ilog(L_SERVER, "Link %s cancelled, server %s already exists",
                        client_p->name, name);
 
-               exit_client(client_p, client_p, &me, "Server Exists");
+               snprintf(squitreason, sizeof squitreason,
+                               "Server %s already exists",
+                               name);
+               exit_client(client_p, client_p, &me, squitreason);
                return 0;
        }
 
@@ -315,7 +318,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
                sendto_one(client_p, "ERROR :Nickname %s already exists!", name);
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Link %s cancelled: Server/nick collision on %s",
-                                    get_server_name(client_p, HIDE_IP), name);
+                                    client_p->name, name);
                ilog(L_SERVER, "Link %s cancelled: Server/nick collision on %s",
                        client_p->name, name);
 
@@ -381,7 +384,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
        {
                /* OOOPs nope can't HUB */
                sendto_realops_snomask(SNO_GENERAL, L_ALL, "Non-Hub link %s introduced %s.",
-                                    get_server_name(client_p, HIDE_IP), name);
+                                    client_p->name, name);
                ilog(L_SERVER, "Non-Hub link %s introduced %s.",
                        client_p->name, name);
 
@@ -395,7 +398,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
                /* OOOPs nope can't HUB this leaf */
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Link %s introduced leafed server %s.",
-                                    get_server_name(client_p, HIDE_IP), name);
+                                    client_p->name, name);
                ilog(L_SERVER, "Link %s introduced leafed server %s.",
                        client_p->name, name);  
 
@@ -409,7 +412,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
        {
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Link %s introduced server with invalid servername %s",
-                                    get_server_name(client_p, HIDE_IP), name);
+                                    client_p->name, name);
                ilog(L_SERVER, "Link %s introduced server with invalid servername %s",
                        client_p->name, name);
 
@@ -421,7 +424,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
        make_server(target_p);
        target_p->hopcount = hop;
 
-       strlcpy(target_p->name, name, sizeof(target_p->name));
+       rb_strlcpy(target_p->name, name, sizeof(target_p->name));
 
        set_server_gecos(target_p, info);
 
@@ -464,34 +467,39 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
        int hop;
        int hlined = 0;
        int llined = 0;
+       char squitreason[160];
 
        hop = atoi(parv[2]);
 
        /* collision on the name? */
        if((target_p = find_server(NULL, parv[1])) != NULL)
        {
-               sendto_one(client_p, "ERROR :Server %s already exists", parv[1]);
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                    "Link %s cancelled, server %s already exists",
-                                    get_server_name(client_p, SHOW_IP), parv[1]);
                ilog(L_SERVER, "Link %s cancelled, server %s already exists",
                        client_p->name, parv[1]);
 
-               exit_client(NULL, client_p, &me, "Server Exists");
+               snprintf(squitreason, sizeof squitreason,
+                               "Server %s already exists",
+                               parv[1]);
+               exit_client(NULL, client_p, &me, squitreason);
                return 0;
        }
 
        /* collision on the SID? */
        if((target_p = find_id(parv[3])) != NULL)
        {
-               sendto_one(client_p, "ERROR :SID %s already exists", parv[3]);
-               sendto_realops_snomask(SNO_GENERAL, L_ALL,
-                                    "Link %s cancelled, SID %s already exists",
-                                    get_server_name(client_p, SHOW_IP), parv[3]);
-               ilog(L_SERVER, "Link %s cancelled, SID %s already exists",
-                       client_p->name, parv[3]);
-
-               exit_client(NULL, client_p, &me, "SID Exists");
+               sendto_wallops_flags(UMODE_WALLOP, &me,
+                                    "Link %s cancelled, SID %s for server %s already in use by %s",
+                                    client_p->name, parv[3], parv[1], target_p->name);
+               sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
+                                    ":%s WALLOPS :Link %s cancelled, SID %s for server %s already in use by %s",
+                                    me.id, client_p->name, parv[3], parv[1], target_p->name);
+               ilog(L_SERVER, "Link %s cancelled, SID %s for server %s already in use by %s",
+                       client_p->name, parv[3], parv[1], target_p->name);
+
+               snprintf(squitreason, sizeof squitreason,
+                               "SID %s for %s already in use by %s",
+                               parv[3], parv[1], target_p->name);
+               exit_client(NULL, client_p, &me, squitreason);
                return 0;
        }
 
@@ -500,7 +508,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
                sendto_one(client_p, "ERROR :Invalid servername");
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Link %s cancelled, servername %s invalid",
-                                    get_server_name(client_p, SHOW_IP), parv[1]);
+                                    client_p->name, parv[1]);
                ilog(L_SERVER, "Link %s cancelled, servername %s invalid",
                        client_p->name, parv[1]);
 
@@ -514,7 +522,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
                sendto_one(client_p, "ERROR :Invalid SID");
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Link %s cancelled, SID %s invalid",
-                                    get_server_name(client_p, SHOW_IP), parv[3]);
+                                    client_p->name, parv[3]);
                ilog(L_SERVER, "Link %s cancelled, SID %s invalid",
                        client_p->name, parv[3]);
 
@@ -545,7 +553,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
                sendto_one(client_p, "ERROR :No matching hub_mask");
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Non-Hub link %s introduced %s.",
-                                    get_server_name(client_p, SHOW_IP), parv[1]);
+                                    client_p->name, parv[1]);
                ilog(L_SERVER, "Non-Hub link %s introduced %s.",
                        client_p->name, parv[1]);
                exit_client(NULL, client_p, &me, "No matching hub_mask.");
@@ -558,7 +566,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
                sendto_one(client_p, "ERROR :Matching leaf_mask");
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                     "Link %s introduced leafed server %s.",
-                                    get_server_name(client_p, SHOW_IP), parv[1]);
+                                    client_p->name, parv[1]);
                ilog(L_SERVER, "Link %s introduced leafed server %s.",
                        client_p->name, parv[1]);       
                exit_client(NULL, client_p, &me, "Leafed Server.");
@@ -569,7 +577,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
        target_p = make_client(client_p);
        make_server(target_p);
 
-       strlcpy(target_p->name, parv[1], sizeof(target_p->name));
+       rb_strlcpy(target_p->name, parv[1], sizeof(target_p->name));
        target_p->hopcount = atoi(parv[2]);
        strcpy(target_p->id, parv[3]);
        set_server_gecos(target_p, parv[4]);
@@ -589,10 +597,6 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
                      ":%s SID %s %d %s :%s%s",
                      source_p->id, target_p->name, target_p->hopcount + 1,
                      target_p->id, IsHidden(target_p) ? "(H) " : "", target_p->info);
-       sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
-                     ":%s SERVER %s %d :%s%s",
-                     source_p->name, target_p->name, target_p->hopcount + 1,
-                     IsHidden(target_p) ? "(H) " : "", target_p->info);
 
        sendto_realops_snomask(SNO_EXTERNAL, L_ALL,
                             "Server %s being introduced by %s", target_p->name, source_p->name);
@@ -668,13 +672,13 @@ set_server_gecos(struct Client *client_p, const char *info)
                        /* if there was a trailing space, s could point to \0, so check */
                        if(s && (*s != '\0'))
                        {
-                               strlcpy(client_p->info, s, sizeof(client_p->info));
+                               rb_strlcpy(client_p->info, s, sizeof(client_p->info));
                                return 1;
                        }
                }
        }
 
-       strlcpy(client_p->info, "(Unknown Location)", sizeof(client_p->info));
+       rb_strlcpy(client_p->info, "(Unknown Location)", sizeof(client_p->info));
 
        return 1;
 }