macro replacement

[irc/rqf/shadowircd.git] / src / s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index 68ab882ef201454a938215e12c02824870739077..4694d4b06809b0b668184725ae23202093b07a5f 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -66,9 +66,9 @@ extern char linebuf[];
 
 static BlockHeap *confitem_heap = NULL;
 
-dlink_list temp_klines[LAST_TEMP_TYPE];
-dlink_list temp_dlines[LAST_TEMP_TYPE];
-dlink_list service_list;
+rb_dlink_list temp_klines[LAST_TEMP_TYPE];
+rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
+rb_dlink_list service_list;
 
 /* internally defined functions */
 static void set_default_conf(void);
@@ -173,8 +173,6 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 {
        int i;
 
-       ClearAccess(source_p);
-
        if((i = verify_access(source_p, username)))
        {
                ilog(L_FUSER, "Access denied: %s[%s]", 
@@ -341,10 +339,6 @@ verify_access(struct Client *client_p, const char *username)
                        return (NOT_AUTHORISED);
                }
 
-
-               if(IsConfDoIdentd(aconf))
-                       SetNeedId(client_p);
-
                /* Thanks for spoof idea amm */
                if(IsConfDoSpoofIp(aconf))
                {
@@ -483,7 +477,7 @@ static int
 attach_iline(struct Client *client_p, struct ConfItem *aconf)
 {
        struct Client *target_p;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
        int local_count = 0;
        int global_count = 0;
        int ident_count = 0;
@@ -497,7 +491,7 @@ attach_iline(struct Client *client_p, struct ConfItem *aconf)
 
 
        /* find_hostname() returns the head of the list to search */
-       DLINK_FOREACH(ptr, find_hostname(client_p->host))
+       RB_DLINK_FOREACH(ptr, find_hostname(client_p->host))
        {
                target_p = ptr->data;
 
@@ -605,7 +599,6 @@ attach_conf(struct Client *client_p, struct ConfItem *aconf)
                else
                {
                        sendto_one_notice(client_p, ":*** I: line is full, but you have an >I: line!");
-                       SetExemptLimits(client_p);
                }
 
        }
@@ -799,7 +792,6 @@ set_default_conf(void)
        ConfigFileEntry.gline_min_cidr6 = 48;
        ConfigFileEntry.hide_spoof_ips = YES;
        ConfigFileEntry.hide_error_messages = 1;
-       ConfigFileEntry.idletime = 0;
        ConfigFileEntry.dots_in_ident = 0;
        ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
        DupString(ConfigFileEntry.servlink_path, SLPATH);
@@ -852,7 +844,7 @@ set_default_conf(void)
        ConfigFileEntry.reject_duration = 120;
        ConfigFileEntry.max_unknown_ip = 2;
 
-       ServerInfo.max_clients = comm_get_maxconnections() - MAX_BUFFER;
+       ServerInfo.max_clients = rb_get_maxconnections() - MAX_BUFFER;
 }
 
 #undef YES
@@ -900,8 +892,6 @@ validate_conf(void)
           (ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX))
                ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX;
 
-       GlobalSetOptions.idletime = (ConfigFileEntry.idletime * 60);
-
        if(!split_users || !split_servers ||
           (!ConfigChannel.no_create_on_split && !ConfigChannel.no_join_on_split))
        {
@@ -952,22 +942,22 @@ add_temp_kline(struct ConfItem *aconf)
 {
        if(aconf->hold >= CurrentTime + (10080 * 60))
        {
-               dlinkAddAlloc(aconf, &temp_klines[TEMP_WEEK]);
+               rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_WEEK]);
                aconf->port = TEMP_WEEK;
        }
        else if(aconf->hold >= CurrentTime + (1440 * 60))
        {
-               dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]);
+               rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]);
                aconf->port = TEMP_DAY;
        }
        else if(aconf->hold >= CurrentTime + (60 * 60))
        {
-               dlinkAddAlloc(aconf, &temp_klines[TEMP_HOUR]);
+               rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_HOUR]);
                aconf->port = TEMP_HOUR;
        }
        else
        {
-               dlinkAddAlloc(aconf, &temp_klines[TEMP_MIN]);
+               rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_MIN]);
                aconf->port = TEMP_MIN;
        }
 
@@ -986,22 +976,22 @@ add_temp_dline(struct ConfItem *aconf)
 {
        if(aconf->hold >= CurrentTime + (10080 * 60))
        {
-               dlinkAddAlloc(aconf, &temp_dlines[TEMP_WEEK]);
+               rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_WEEK]);
                aconf->port = TEMP_WEEK;
        }
        else if(aconf->hold >= CurrentTime + (1440 * 60))
        {
-               dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]);
+               rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]);
                aconf->port = TEMP_DAY;
        }
        else if(aconf->hold >= CurrentTime + (60 * 60))
        {
-               dlinkAddAlloc(aconf, &temp_dlines[TEMP_HOUR]);
+               rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_HOUR]);
                aconf->port = TEMP_HOUR;
        }
        else
        {
-               dlinkAddAlloc(aconf, &temp_dlines[TEMP_MIN]);
+               rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_MIN]);
                aconf->port = TEMP_MIN;
        }
 
@@ -1019,11 +1009,11 @@ add_temp_dline(struct ConfItem *aconf)
 static void
 expire_temp_kd(void *list)
 {
-       dlink_node *ptr;
-       dlink_node *next_ptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
        struct ConfItem *aconf;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, ((dlink_list *) list)->head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
        {
                aconf = ptr->data;
 
@@ -1037,7 +1027,7 @@ expire_temp_kd(void *list)
                                                     user : "*", (aconf->host) ? aconf->host : "*");
 
                        delete_one_address_conf(aconf->host, aconf);
-                       dlinkDestroy(ptr, list);
+                       rb_dlinkDestroy(ptr, list);
                }
        }
 }
@@ -1046,15 +1036,15 @@ static void
 reorganise_temp_kd(void *list)
 {
        struct ConfItem *aconf;
-       dlink_node *ptr, *next_ptr;
+       rb_dlink_node *ptr, *next_ptr;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, ((dlink_list *) list)->head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
        {
                aconf = ptr->data;
 
                if(aconf->hold < (CurrentTime + (60 * 60)))
                {
-                       dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
+                       rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
                                        &temp_klines[TEMP_MIN] : &temp_dlines[TEMP_MIN]);
                        aconf->port = TEMP_MIN;
                }
@@ -1062,14 +1052,14 @@ reorganise_temp_kd(void *list)
                {
                        if(aconf->hold < (CurrentTime + (1440 * 60)))
                        {
-                               dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
+                               rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
                                                &temp_klines[TEMP_HOUR] : &temp_dlines[TEMP_HOUR]);
                                aconf->port = TEMP_HOUR;
                        }
                        else if(aconf->port > TEMP_DAY && 
                                (aconf->hold < (CurrentTime + (10080 * 60))))
                        {
-                               dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
+                               rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? 
                                                &temp_klines[TEMP_DAY] : &temp_dlines[TEMP_DAY]);
                                aconf->port = TEMP_DAY;
                        }
@@ -1092,13 +1082,13 @@ get_oper_name(struct Client *client_p)
 
        if(MyOper(client_p))
        {
-               ircsnprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
+               rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
                                client_p->name, client_p->username,
                                client_p->host, client_p->localClient->opername);
                return buffer;
        }
 
-       ircsnprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
+       rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
                   client_p->name, client_p->username, 
                   client_p->host, client_p->servptr->name);
        return buffer;
@@ -1224,14 +1214,14 @@ static void
 clear_out_old_conf(void)
 {
        struct Class *cltmp;
-       dlink_node *ptr;
-       dlink_node *next_ptr;
+       rb_dlink_node *ptr;
+       rb_dlink_node *next_ptr;
 
        /*
         * don't delete the class table, rather mark all entries
         * for deletion. The table is cleaned up by check_class. - avalon
         */
-       DLINK_FOREACH(ptr, class_list.head)
+       RB_DLINK_FOREACH(ptr, class_list.head)
        {
                cltmp = ptr->data;
                MaxUsers(cltmp) = -1;
@@ -1275,10 +1265,10 @@ clear_out_old_conf(void)
        MyFree(ConfigFileEntry.servlink_path);
        ConfigFileEntry.servlink_path = NULL;
 
-       DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head)
+       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head)
        {
                MyFree(ptr->data);
-               dlinkDestroy(ptr, &service_list);
+               rb_dlinkDestroy(ptr, &service_list);
        }
 
        /* remove any aliases... -- nenolod */
@@ -1389,20 +1379,20 @@ write_confitem(KlineType type, struct Client *source_p, char *user,
 
        if(type == KLINE_TYPE)
        {
-               ircsnprintf(buffer, sizeof(buffer),
+               rb_snprintf(buffer, sizeof(buffer),
                           "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n",
                           user, host, reason, oper_reason, current_date,
                           get_oper_name(source_p), CurrentTime);
        }
        else if(type == DLINE_TYPE)
        {
-               ircsnprintf(buffer, sizeof(buffer),
+               rb_snprintf(buffer, sizeof(buffer),
                           "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", host,
                           reason, oper_reason, current_date, get_oper_name(source_p), CurrentTime);
        }
        else if(type == RESV_TYPE)
        {
-               ircsnprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
+               rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n",
                           host, reason, get_oper_name(source_p), CurrentTime);
        }