]> jfr.im git - irc/rqf/shadowircd.git/blobdiff - src/s_serv.c
Argh, wrong replace caused by MS VS 2005 interface.
[irc/rqf/shadowircd.git] / src / s_serv.c
index 8b205992c05e0f68905e411d3006ff0df3454fab..72e7925e6356a2e401cfab4cc706b9144afd0f85 100644 (file)
 #include <openssl/rsa.h>
 #endif
 
-#include "tools.h"
 #include "s_serv.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
@@ -44,7 +42,6 @@
 #include "numeric.h"
 #include "packet.h"
 #include "res.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "s_log.h"
@@ -53,7 +50,6 @@
 #include "scache.h"
 #include "send.h"
 #include "client.h"
-#include "memory.h"
 #include "channel.h"           /* chcap_usage_counts stuff... */
 #include "hook.h"
 #include "msg.h"
@@ -207,10 +203,10 @@ slink_zipstats(unsigned int rpl, unsigned int len, unsigned char *data, struct C
 void
 collect_zipstats(void *unused)
 {
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        struct Client *target_p;
 
-       DLINK_FOREACH(ptr, serv_list.head)
+       RB_DLINK_FOREACH(ptr, serv_list.head)
        {
                target_p = ptr->data;
                if(IsCapable(target_p, CAP_ZIP))
@@ -253,7 +249,7 @@ hunt_server(struct Client *client_p, struct Client *source_p,
 {
        struct Client *target_p;
        int wilds;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        const char *old;
        char *new;
 
@@ -301,7 +297,7 @@ hunt_server(struct Client *client_p, struct Client *source_p,
                {
                        target_p = NULL;
 
-                       DLINK_FOREACH(ptr, global_client_list.head)
+                       RB_DLINK_FOREACH(ptr, global_client_list.head)
                        {
                                if(match(new, ((struct Client *) (ptr->data))->name))
                                {
@@ -353,12 +349,12 @@ try_connections(void *unused)
        struct server_conf *server_p = NULL;
        struct server_conf *tmp_p;
        struct Class *cltmp;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        int connecting = FALSE;
        int confrq = 0;
        time_t next = 0;
 
-       DLINK_FOREACH(ptr, server_conf_list.head)
+       RB_DLINK_FOREACH(ptr, server_conf_list.head)
        {
                tmp_p = ptr->data;
 
@@ -410,8 +406,8 @@ try_connections(void *unused)
                return;
 
        /* move this connect entry to end.. */
-       dlinkDelete(&server_p->node, &server_conf_list);
-       dlinkAddTail(server_p, &server_p->node, &server_conf_list);
+       rb_dlinkDelete(&server_p->node, &server_conf_list);
+       rb_dlinkAddTail(server_p, &server_p->node, &server_conf_list);
 
        /*
         * We used to only print this if serv_connect() actually
@@ -440,7 +436,7 @@ check_server(const char *name, struct Client *client_p)
 {
        struct server_conf *server_p = NULL;
        struct server_conf *tmp_p;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        int error = -1;
 
        s_assert(NULL != client_p);
@@ -453,7 +449,7 @@ check_server(const char *name, struct Client *client_p)
        if(strlen(name) > HOSTLEN)
                return -4;
 
-       DLINK_FOREACH(ptr, server_conf_list.head)
+       RB_DLINK_FOREACH(ptr, server_conf_list.head)
        {
                tmp_p = ptr->data;
 
@@ -547,9 +543,9 @@ send_capabilities(struct Client *client_p, int cap_can_send)
  * side effects - client is sent a list of +b, or +e, or +I modes
  */
 static void
-burst_modes_TS5(struct Client *client_p, char *chname, dlink_list *list, char flag)
+burst_modes_TS5(struct Client *client_p, char *chname, rb_dlink_list *list, char flag)
 {
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        struct Ban *banptr;
        char mbuf[MODEBUFLEN];
        char pbuf[BUFSIZE];
@@ -566,7 +562,7 @@ burst_modes_TS5(struct Client *client_p, char *chname, dlink_list *list, char fl
        mp = mbuf;
        pp = pbuf;
 
-       DLINK_FOREACH(ptr, list->head)
+       RB_DLINK_FOREACH(ptr, list->head)
        {
                banptr = ptr->data;
                tlen = strlen(banptr->banstr) + 3;
@@ -604,9 +600,9 @@ burst_modes_TS5(struct Client *client_p, char *chname, dlink_list *list, char fl
  */
 static void
 burst_modes_TS6(struct Client *client_p, struct Channel *chptr, 
-               dlink_list *list, char flag)
+               rb_dlink_list *list, char flag)
 {
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        struct Ban *banptr;
        char *t;
        int tlen;
@@ -617,7 +613,7 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr,
                                    me.id, (long) chptr->channelts, chptr->chname, flag);
        t = buf + mlen;
 
-       DLINK_FOREACH(ptr, list->head)
+       RB_DLINK_FOREACH(ptr, list->head)
        {
                banptr = ptr->data;
 
@@ -669,15 +665,15 @@ burst_TS5(struct Client *client_p)
        struct membership *msptr;
        hook_data_client hclientinfo;
        hook_data_channel hchaninfo;
-       dlink_node *ptr;
-       dlink_node *uptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *uptr;
        char *t;
        int tlen, mlen;
        int cur_len = 0;
 
        hclientinfo.client = hchaninfo.client = client_p;
 
-       DLINK_FOREACH(ptr, global_client_list.head)
+       RB_DLINK_FOREACH(ptr, global_client_list.head)
        {
                target_p = ptr->data;
 
@@ -712,7 +708,7 @@ burst_TS5(struct Client *client_p)
                call_hook(h_burst_client, &hclientinfo);
        }
 
-       DLINK_FOREACH(ptr, global_channel_list.head)
+       RB_DLINK_FOREACH(ptr, global_channel_list.head)
        {
                chptr = ptr->data;
 
@@ -725,7 +721,7 @@ burst_TS5(struct Client *client_p)
 
                t = buf + mlen;
 
-               DLINK_FOREACH(uptr, chptr->members.head)
+               RB_DLINK_FOREACH(uptr, chptr->members.head)
                {
                        msptr = uptr->data;
 
@@ -751,7 +747,7 @@ burst_TS5(struct Client *client_p)
                        t += tlen;
                }
 
-               if (dlink_list_length(&chptr->members) > 0)
+               if (rb_dlink_list_length(&chptr->members) > 0)
                {
                        /* remove trailing space */
                        t--;
@@ -801,15 +797,15 @@ burst_TS6(struct Client *client_p)
        struct membership *msptr;
        hook_data_client hclientinfo;
        hook_data_channel hchaninfo;
-       dlink_node *ptr;
-       dlink_node *uptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *uptr;
        char *t;
        int tlen, mlen;
        int cur_len = 0;
 
        hclientinfo.client = hchaninfo.client = client_p;
 
-       DLINK_FOREACH(ptr, global_client_list.head)
+       RB_DLINK_FOREACH(ptr, global_client_list.head)
        {
                target_p = ptr->data;
 
@@ -870,7 +866,7 @@ burst_TS6(struct Client *client_p)
                call_hook(h_burst_client, &hclientinfo);
        }
 
-       DLINK_FOREACH(ptr, global_channel_list.head)
+       RB_DLINK_FOREACH(ptr, global_channel_list.head)
        {
                chptr = ptr->data;
 
@@ -883,7 +879,7 @@ burst_TS6(struct Client *client_p)
 
                t = buf + mlen;
 
-               DLINK_FOREACH(uptr, chptr->members.head)
+               RB_DLINK_FOREACH(uptr, chptr->members.head)
                {
                        msptr = uptr->data;
 
@@ -908,25 +904,25 @@ burst_TS6(struct Client *client_p)
                        t += tlen;
                }
 
-               if (dlink_list_length(&chptr->members) > 0)
+               if (rb_dlink_list_length(&chptr->members) > 0)
                {
                        /* remove trailing space */
                        *(t-1) = '\0';
                }
                sendto_one(client_p, "%s", buf);
 
-               if(dlink_list_length(&chptr->banlist) > 0)
+               if(rb_dlink_list_length(&chptr->banlist) > 0)
                        burst_modes_TS6(client_p, chptr, &chptr->banlist, 'b');
 
                if(IsCapable(client_p, CAP_EX) &&
-                  dlink_list_length(&chptr->exceptlist) > 0)
+                  rb_dlink_list_length(&chptr->exceptlist) > 0)
                        burst_modes_TS6(client_p, chptr, &chptr->exceptlist, 'e');
 
                if(IsCapable(client_p, CAP_IE) &&
-                  dlink_list_length(&chptr->invexlist) > 0)
+                  rb_dlink_list_length(&chptr->invexlist) > 0)
                        burst_modes_TS6(client_p, chptr, &chptr->invexlist, 'I');
 
-               if(dlink_list_length(&chptr->quietlist) > 0)
+               if(rb_dlink_list_length(&chptr->quietlist) > 0)
                        burst_modes_TS6(client_p, chptr, &chptr->quietlist, 'q');
 
                if(IsCapable(client_p, CAP_TB) && chptr->topic != NULL)
@@ -998,7 +994,7 @@ server_estab(struct Client *client_p)
        struct server_conf *server_p;
        hook_data_client hdata;
        char *host;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
 
        s_assert(NULL != client_p);
        if(client_p == NULL)
@@ -1020,7 +1016,7 @@ server_estab(struct Client *client_p)
        if(client_p->localClient->passwd)
        {
                memset(client_p->localClient->passwd, 0, strlen(client_p->localClient->passwd));
-               MyFree(client_p->localClient->passwd);
+               rb_free(client_p->localClient->passwd);
                client_p->localClient->passwd = NULL;
        }
 
@@ -1095,10 +1091,10 @@ server_estab(struct Client *client_p)
        /* Update the capability combination usage counts */
        set_chcap_usage_counts(client_p);
 
-       dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
+       rb_dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
        del_unknown_ip(client_p);
-       dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &serv_list);
-       dlinkAddTailAlloc(client_p, &global_serv_list);
+       rb_dlinkMoveNode(&client_p->localClient->tnode, &unknown_list, &serv_list);
+       rb_dlinkAddTailAlloc(client_p, &global_serv_list);
 
        if(has_id(client_p))
                add_to_id_hash(client_p->id, client_p);
@@ -1112,7 +1108,7 @@ server_estab(struct Client *client_p)
        if(client_p->localClient->fullcaps)
        {
                DupString(client_p->serv->fullcaps, client_p->localClient->fullcaps);
-               MyFree(client_p->localClient->fullcaps);
+               rb_free(client_p->localClient->fullcaps);
                client_p->localClient->fullcaps = NULL;
        }
 
@@ -1120,10 +1116,10 @@ server_estab(struct Client *client_p)
        client_p->localClient->firsttime = CurrentTime;
        /* fixing eob timings.. -gnp */
 
-       if((dlink_list_length(&lclient_list) + dlink_list_length(&serv_list)) >
+       if((rb_dlink_list_length(&lclient_list) + rb_dlink_list_length(&serv_list)) >
           (unsigned long)MaxConnectionCount)
-               MaxConnectionCount = dlink_list_length(&lclient_list) + 
-                                       dlink_list_length(&serv_list);
+               MaxConnectionCount = rb_dlink_list_length(&lclient_list) + 
+                                       rb_dlink_list_length(&serv_list);
 
        /* Show the real host/IP to admins */
        sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -1154,7 +1150,7 @@ server_estab(struct Client *client_p)
         ** need to send different names to different servers
         ** (domain name matching) Send new server to other servers.
         */
-       DLINK_FOREACH(ptr, serv_list.head)
+       RB_DLINK_FOREACH(ptr, serv_list.head)
        {
                target_p = ptr->data;
 
@@ -1203,7 +1199,7 @@ server_estab(struct Client *client_p)
         **    see previous *WARNING*!!! (Also, original inpath
         **    is destroyed...)
         */
-       DLINK_FOREACH(ptr, global_serv_list.head)
+       RB_DLINK_FOREACH(ptr, global_serv_list.head)
        {
                target_p = ptr->data;
 
@@ -1563,7 +1559,7 @@ serv_connect(struct server_conf *server_p, struct Client *by)
                client_p->serv->user = NULL;
        }
        SetConnecting(client_p);
-       dlinkAddTail(client_p, &client_p->node, &global_client_list);
+       rb_dlinkAddTail(client_p, &client_p->node, &global_client_list);
 
        if(ServerConfVhosted(server_p))
        {