[svn] Merge old trunk r2081:

[irc/rqf/shadowircd.git] / modules / core / m_server.c

diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 82f6c54aad55ce838adfe3fb7d456570b3ba96d3..bc64f3b2bf35be94bd6c1d6e1c144c98784c8eb2 100644 (file)
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_server.c 2733 2006-11-10 00:04:08Z jilles $
+ *  $Id: m_server.c 3291 2007-03-28 14:30:10Z jilles $
  */
 
 #include "stdinc.h"
@@ -59,10 +59,9 @@ struct Message sid_msgtab = {
 
 mapi_clist_av1 server_clist[] = { &server_msgtab, &sid_msgtab, NULL };
 
-DECLARE_MODULE_AV1(server, NULL, NULL, server_clist, NULL, NULL, "$Revision: 2733 $");
+DECLARE_MODULE_AV1(server, NULL, NULL, server_clist, NULL, NULL, "$Revision: 3291 $");
 
 int bogus_host(const char *host);
-struct Client *server_exists(const char *);
 static int set_server_gecos(struct Client *, const char *);
 
 /*
@@ -84,6 +83,17 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
        hop = atoi(parv[2]);
        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);
+               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");
+               return 0;
+       }
+
        /* 
         * Reject a direct nonTS server connection if we're TS_ONLY -orabidoo
         */
@@ -167,7 +177,7 @@ mr_server(struct Client *client_p, struct Client *source_p, int parc, const char
                break;
        }
 
-       if((target_p = server_exists(name)))
+       if((target_p = find_server(NULL, name)))
        {
                /*
                 * This link is trying feed me a server that I already have
@@ -246,7 +256,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
        hop = atoi(parv[2]);
        strlcpy(info, parv[3], sizeof(info));
 
-       if((target_p = server_exists(name)))
+       if((target_p = find_server(NULL, name)))
        {
                /*
                 * This link is trying feed me a server that I already have
@@ -454,7 +464,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
        hop = atoi(parv[2]);
 
        /* collision on the name? */
-       if((target_p = server_exists(parv[1])) != NULL)
+       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,
@@ -698,26 +708,3 @@ bogus_host(const char *host)
 
        return 0;
 }
-
-/*
- * server_exists()
- * 
- * inputs      - servername
- * output      - 1 if server exists, 0 if doesnt exist
- */
-struct Client *
-server_exists(const char *servername)
-{
-       struct Client *target_p;
-       dlink_node *ptr;
-
-       DLINK_FOREACH(ptr, global_serv_list.head)
-       {
-               target_p = ptr->data;
-
-               if(match(target_p->name, servername) || match(servername, target_p->name))
-                       return target_p;
-       }
-
-       return NULL;
-}