Much clear maxconnections stuff - ported from ratbox3.

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

diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index bd38f0f193783ad8b725bba45ce61a3d0224120f..4608bdbf87b6e2013c02f7bd8a1d49ac19ed8553 100644 (file)
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -25,17 +25,15 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"            /* client struct */
 #include "common.h"            /* TRUE bleah */
-#include "event.h"
 #include "hash.h"              /* add_to_client_hash */
 #include "irc_string.h"
 #include "ircd.h"              /* me */
 #include "numeric.h"           /* ERR_xxx */
 #include "s_conf.h"            /* struct ConfItem */
 #include "s_newconf.h"
-#include "s_log.h"             /* log level defines */
+#include "logger.h"            /* log level defines */
 #include "s_serv.h"            /* server_estab, check_server */
 #include "s_stats.h"           /* ServerStats */
 #include "scache.h"
@@ -250,7 +248,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
        int hop;
        int hlined = 0;
        int llined = 0;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
 
        name = parv[1];
        hop = atoi(parv[2]);
@@ -333,7 +331,7 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
         * leaf. If so, close the link.
         *
         */
-       DLINK_FOREACH(ptr, hubleaf_conf_list.head)
+       RB_DLINK_FOREACH(ptr, hubleaf_conf_list.head)
        {
                hub_p = ptr->data;
 
@@ -422,10 +420,10 @@ ms_server(struct Client *client_p, struct Client *source_p, int parc, const char
 
        SetServer(target_p);
 
-       dlinkAddTail(target_p, &target_p->node, &global_client_list);
-       dlinkAddTailAlloc(target_p, &global_serv_list);
+       rb_dlinkAddTail(target_p, &target_p->node, &global_client_list);
+       rb_dlinkAddTailAlloc(target_p, &global_serv_list);
        add_to_client_hash(target_p->name, target_p);
-       dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
+       rb_dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
 
        target_p->serv->nameinfo = scache_connect(target_p->name, target_p->info, IsHidden(target_p));
 
@@ -453,7 +451,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
        struct Client *target_p;
        struct remote_conf *hub_p;
        hook_data_client hdata;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        int hop;
        int hlined = 0;
        int llined = 0;
@@ -519,7 +517,7 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
         * H: allows it to introduce a server matching that mask
         * L: disallows it introducing a server matching that mask
         */
-       DLINK_FOREACH(ptr, hubleaf_conf_list.head)
+       RB_DLINK_FOREACH(ptr, hubleaf_conf_list.head)
        {
                hub_p = ptr->data;
 
@@ -570,11 +568,11 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
        target_p->servptr = source_p;
        SetServer(target_p);
 
-       dlinkAddTail(target_p, &target_p->node, &global_client_list);
-       dlinkAddTailAlloc(target_p, &global_serv_list);
+       rb_dlinkAddTail(target_p, &target_p->node, &global_client_list);
+       rb_dlinkAddTailAlloc(target_p, &global_serv_list);
        add_to_client_hash(target_p->name, target_p);
        add_to_id_hash(target_p->id, target_p);
-       dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
+       rb_dlinkAdd(target_p, &target_p->lnode, &target_p->servptr->serv->servers);
 
        target_p->serv->nameinfo = scache_connect(target_p->name, target_p->info, IsHidden(target_p));