Keep propagated bans in a dictionary, not a list

(Backported from solanum)

diff --git a/include/s_conf.h b/include/s_conf.h
index 396d97d656e097d271dc37790d621cbb84c6d9b5..f3d33058becfd66f3dd968f5c54871498ef80ebe 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -153,7 +153,7 @@ struct config_file_entry
 
        char *identifyservice;
        char *identifycommand;
-       
+
        char *fname_userlog;
        char *fname_fuserlog;
        char *fname_operlog;
@@ -325,7 +325,7 @@ extern struct admin_info AdminInfo; /* defined in ircd.c */
 
 extern rb_dlink_list service_list;
 
-extern rb_dlink_list prop_bans;
+extern struct Dictionary *prop_bans_dict;
 
 typedef enum temp_list
 {
@@ -344,8 +344,11 @@ extern void init_s_conf(void);
 extern struct ConfItem *make_conf(void);
 extern void free_conf(struct ConfItem *);
 
-extern rb_dlink_node *find_prop_ban(unsigned int status, const char *user, const char *host);
-extern void deactivate_conf(struct ConfItem *, rb_dlink_node *);
+extern struct ConfItem *find_prop_ban(unsigned int status, const char *user, const char *host);
+extern void add_prop_ban(struct ConfItem *);
+extern void remove_prop_ban(struct ConfItem *);
+extern int lookup_prop_ban(struct ConfItem *);
+extern void deactivate_conf(struct ConfItem *);
 extern void replace_old_ban(struct ConfItem *);
 
 extern void read_conf_files(int cold);

diff --git a/modules/core/m_ban.c b/modules/core/m_ban.c
index 8ef1534ea27828c69e9defe52f5c71562e984261..21c07fcb2b373ddd8b97290e596a83a89d3f7705 100644 (file)
--- a/modules/core/m_ban.c
+++ b/modules/core/m_ban.c
@@ -1,7 +1,7 @@
 /*
  * charybdis: An advanced ircd.
  * m_ban.c: Propagates network bans across servers.
- * 
+ *
  *  Copyright (C) 2010 Jilles Tjoelker
  *
  * Redistribution and use in source and binary forms, with or without
@@ -82,7 +82,6 @@ m_ban(struct Client *client_p, struct Client *source_p, int parc, const char *pa
 static int
 ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-       rb_dlink_node *ptr;
        struct ConfItem *aconf;
        unsigned int ntype;
        const char *oper, *stype;
@@ -90,6 +89,7 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
        char *p;
        int act;
        int valid;
+       int new = 0;
 
        if (strlen(parv[1]) != 1)
        {
@@ -126,11 +126,10 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
                oper = IsServer(source_p) ? source_p->name : get_oper_name(source_p);
        else
                oper = parv[7];
-       ptr = find_prop_ban(ntype, parv[2], parv[3]);
-       if (ptr != NULL)
+       aconf = find_prop_ban(ntype, parv[2], parv[3]);
+       if (aconf != NULL)
        {
                /* We already know about this ban mask. */
-               aconf = ptr->data;
                if (aconf->created > created ||
                                (aconf->created == created &&
                                 aconf->lifetime >= lifetime))
@@ -157,7 +156,7 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
                if (aconf->lifetime <= rb_current_time())
                        return 0;
                /* Deactivate, it will be reactivated later if appropriate. */
-               deactivate_conf(aconf, ptr);
+               deactivate_conf(aconf);
                rb_free(aconf->user);
                aconf->user = NULL;
                rb_free(aconf->host);
@@ -175,8 +174,8 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
                aconf = make_conf();
                aconf->status = CONF_ILLEGAL | ntype;
                aconf->lifetime = lifetime;
-               rb_dlinkAddAlloc(aconf, &prop_bans);
                act = hold != created && hold > rb_current_time();
+               new = 1;
        }
        aconf->flags &= ~CONF_FLAGS_MYOPER;
        aconf->flags |= CONF_FLAGS_TEMPORARY;
@@ -185,6 +184,8 @@ ms_ban(struct Client *client_p, struct Client *source_p, int parc, const char *p
        aconf->info.oper = operhash_add(oper);
        aconf->created = created;
        aconf->hold = hold;
+       if (new)
+               add_prop_ban(aconf);
        if (ntype != CONF_KILL || (p = strchr(parv[parc - 1], '|')) == NULL)
                aconf->passwd = rb_strdup(parv[parc - 1]);
        else

diff --git a/modules/m_kline.c b/modules/m_kline.c
index 36cebbb699290b9d4d172290d2f57ec591491131..621b38538c801a57dd76cee96f26e5b43f4c7e91 100644 (file)
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -419,7 +419,7 @@ mo_unkline(struct Client *client_p, struct Client *source_p, int parc, const cha
                sendto_one_notice(source_p, ":No K-Line for %s@%s", user, host);
                return 0;
        }
-       
+
        if(aconf->lifetime)
        {
                if(propagated)
@@ -500,7 +500,7 @@ handle_remote_unkline(struct Client *source_p, const char *user, const char *hos
 
 /* apply_kline()
  *
- * inputs      - 
+ * inputs      -
  * output      - NONE
  * side effects        - kline as given, is added to the hashtable
  *               and conf file
@@ -584,7 +584,7 @@ apply_prop_kline(struct Client *source_p, struct ConfItem *aconf,
 
        replace_old_ban(aconf);
 
-       rb_dlinkAddAlloc(aconf, &prop_bans);
+       add_prop_ban(aconf);
        add_conf_by_address(aconf->host, CONF_KILL, aconf->user, NULL, aconf);
 
        /* no oper reason.. */
@@ -623,7 +623,7 @@ apply_prop_kline(struct Client *source_p, struct ConfItem *aconf,
 }
 
 /* find_user_host()
- * 
+ *
  * inputs      - client placing kline, user@host, user buffer, host buffer
  * output      - 0 if not ok to kline, 1 to kline i.e. if valid user host
  * side effects -
@@ -839,10 +839,7 @@ remove_temp_kline(struct Client *source_p, struct ConfItem *aconf)
 static void
 remove_prop_kline(struct Client *source_p, struct ConfItem *aconf)
 {
-       rb_dlink_node *ptr;
-
-       ptr = rb_dlinkFind(aconf, &prop_bans);
-       if (!ptr)
+       if (!lookup_prop_ban(aconf))
                return;
        sendto_one_notice(source_p,
                          ":Un-klined [%s@%s] from global k-lines",
@@ -869,5 +866,5 @@ remove_prop_kline(struct Client *source_p, struct ConfItem *aconf)
                        0,
                        (int)(aconf->lifetime - aconf->created));
        remove_reject_mask(aconf->user, aconf->host);
-       deactivate_conf(aconf, ptr);
+       deactivate_conf(aconf);
 }

diff --git a/modules/m_resv.c b/modules/m_resv.c
index e2fe39e79e3b5efac6d7636ec38395da6d478ffa..a1053ae86bf66a827124459d93070df6af57af73 100644 (file)
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -246,7 +246,7 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
                        aconf->hold = rb_current_time() + temp_time;
                        aconf->lifetime = aconf->hold;
                        replace_old_ban(aconf);
-                       rb_dlinkAddAlloc(aconf, &prop_bans);
+                       add_prop_ban(aconf);
 
                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                               "%s added global %d min. RESV for [%s] [%s]",
@@ -336,7 +336,7 @@ parse_resv(struct Client *source_p, const char *name, const char *reason, int te
                        aconf->hold = rb_current_time() + temp_time;
                        aconf->lifetime = aconf->hold;
                        replace_old_ban(aconf);
-                       rb_dlinkAddAlloc(aconf, &prop_bans);
+                       add_prop_ban(aconf);
 
                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                               "%s added global %d min. RESV for [%s] [%s]",
@@ -550,8 +550,7 @@ remove_resv(struct Client *source_p, const char *name, int propagated)
                                sendto_one_notice(source_p, ":Cannot remove global RESV %s on specific servers", name);
                                return;
                        }
-                       ptr = rb_dlinkFind(aconf, &prop_bans);
-                       if(ptr == NULL)
+                       if (!lookup_prop_ban(aconf))
                                return;
                        sendto_one_notice(source_p, ":RESV for [%s] is removed", name);
                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -572,7 +571,7 @@ remove_resv(struct Client *source_p, const char *name, int propagated)
                                        (unsigned long)aconf->created,
                                        0,
                                        (int)(aconf->lifetime - aconf->created));
-                       deactivate_conf(aconf, ptr);
+                       deactivate_conf(aconf);
                        return;
                }
                else if(propagated && rb_dlink_list_length(&cluster_conf_list) > 0)
@@ -623,8 +622,7 @@ remove_resv(struct Client *source_p, const char *name, int propagated)
                                sendto_one_notice(source_p, ":Cannot remove global RESV %s on specific servers", name);
                                return;
                        }
-                       ptr = rb_dlinkFind(aconf, &prop_bans);
-                       if(ptr == NULL)
+                       if (!lookup_prop_ban(aconf))
                                return;
                        sendto_one_notice(source_p, ":RESV for [%s] is removed", name);
                        sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -645,7 +643,7 @@ remove_resv(struct Client *source_p, const char *name, int propagated)
                                        (unsigned long)aconf->created,
                                        0,
                                        (int)(aconf->lifetime - aconf->created));
-                       deactivate_conf(aconf, ptr);
+                       deactivate_conf(aconf);
                        return;
                }
                else if(propagated && rb_dlink_list_length(&cluster_conf_list) > 0)

diff --git a/modules/m_stats.c b/modules/m_stats.c
index 5220bc6b4cfa7d5aa0688e5b9958dea2396b884e..f2750f22ad4a5f69a59cca7d683f4cb57d9c387d 100644 (file)
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -456,15 +456,13 @@ static void
 stats_prop_klines(struct Client *source_p)
 {
        struct ConfItem *aconf;
-       rb_dlink_node *ptr;
        char *user, *host, *pass, *oper_reason;
+       struct DictionaryIter state;
 
-       RB_DLINK_FOREACH(ptr, prop_bans.head)
+       DICTIONARY_FOREACH(aconf, &state, prop_bans_dict)
        {
-               aconf = ptr->data;
-
                /* Skip non-klines and deactivated klines. */
-               if(aconf->status != CONF_KILL)
+               if (aconf->status != CONF_KILL)
                        continue;
 
                get_printable_kline(source_p, aconf, &host, &pass, 

diff --git a/modules/m_xline.c b/modules/m_xline.c
index 0e358df220805e9ec3bc4506b54b873fd5cc69df..622d0e5ff518318cff125cd25be0348891bafbb1 100644 (file)
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -1,5 +1,5 @@
 /* modules/m_xline.c
- * 
+ *
  *  Copyright (C) 2002-2003 Lee Hardy <lee@leeh.co.uk>
  *  Copyright (C) 2002-2005 ircd-ratbox development team
  *
@@ -307,7 +307,7 @@ apply_xline(struct Client *source_p, const char *name, const char *reason, int t
                aconf->lifetime = aconf->hold;
 
                replace_old_ban(aconf);
-               rb_dlinkAddAlloc(aconf, &prop_bans);
+               add_prop_ban(aconf);
 
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                       "%s added global %d min. X-Line for [%s] [%s]",
@@ -506,8 +506,7 @@ remove_xline(struct Client *source_p, const char *name, int propagated)
                                        sendto_one_notice(source_p, ":Cannot remove global X-Line %s on specific servers", name);
                                        return;
                                }
-                               ptr = rb_dlinkFind(aconf, &prop_bans);
-                               if(ptr == NULL)
+                               if (!lookup_prop_ban(aconf))
                                        return;
                                sendto_one_notice(source_p, ":X-Line for [%s] is removed", name);
                                sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -529,7 +528,7 @@ remove_xline(struct Client *source_p, const char *name, int propagated)
                                                0,
                                                (int)(aconf->lifetime - aconf->created));
                                remove_reject_mask(aconf->host, NULL);
-                               deactivate_conf(aconf, ptr);
+                               deactivate_conf(aconf);
                                return;
                        }
                        else if(propagated && rb_dlink_list_length(&cluster_conf_list))

diff --git a/src/s_conf.c b/src/s_conf.c
index 3c9f121b3ca094cec3e71c03ad5ae0b8a5a2f19d..598b388f754ac8cd39b86008a4b932fccb80330d 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -63,22 +63,24 @@ extern char linebuf[];
 
 static rb_bh *confitem_heap = NULL;
 
-rb_dlink_list prop_bans;
-
 rb_dlink_list temp_klines[LAST_TEMP_TYPE];
 rb_dlink_list temp_dlines[LAST_TEMP_TYPE];
 rb_dlink_list service_list;
 
+struct Dictionary *prop_bans_dict;
+
 /* internally defined functions */
 static void set_default_conf(void);
 static void validate_conf(void);
 static void read_conf(FILE *);
 static void clear_out_old_conf(void);
 
-static void expire_prop_bans(void *list);
+static void expire_prop_bans(void *);
 static void expire_temp_kd(void *list);
 static void reorganise_temp_kd(void *list);
 
+static int cmp_prop_ban(const void *, const void *);
+
 FILE *conf_fbfile_in;
 extern char yytext[];
 
@@ -89,8 +91,9 @@ void
 init_s_conf(void)
 {
        confitem_heap = rb_bh_create(sizeof(struct ConfItem), CONFITEM_HEAP_SIZE, "confitem_heap");
+       prop_bans_dict = irc_dictionary_create(cmp_prop_ban);
 
-       rb_event_addish("expire_prop_bans", expire_prop_bans, &prop_bans, 60);
+       rb_event_addish("expire_prop_bans", expire_prop_bans, NULL, 60);
 
        rb_event_addish("expire_temp_klines", expire_temp_kd, &temp_klines[TEMP_MIN], 60);
        rb_event_addish("expire_temp_dlines", expire_temp_kd, &temp_dlines[TEMP_MIN], 60);
@@ -181,10 +184,10 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 
        if((i = verify_access(source_p, username)))
        {
-               ilog(L_FUSER, "Access denied: %s[%s]", 
+               ilog(L_FUSER, "Access denied: %s[%s]",
                     source_p->name, source_p->sockhost);
        }
-       
+
        switch (i)
        {
        case SOCKET_ERROR:
@@ -204,7 +207,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 
                ilog(L_FUSER, "Too many local connections from %s!%s%s@%s",
                        source_p->name, IsGotId(source_p) ? "" : "~",
-                       source_p->username, source_p->sockhost);        
+                       source_p->username, source_p->sockhost);
 
                ServerStats.is_ref++;
                exit_client(client_p, source_p, &me, "Too many host connections (local)");
@@ -245,7 +248,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
                                source_p->username, source_p->host,
                                show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : "255.255.255.255");
 
-               ilog(L_FUSER, "Too many connections from %s!%s%s@%s.", 
+               ilog(L_FUSER, "Too many connections from %s!%s%s@%s.",
                        source_p->name, IsGotId(source_p) ? "" : "~",
                        source_p->username, source_p->sockhost);
 
@@ -263,7 +266,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
                        else
 #endif
                                port = ntohs(((struct sockaddr_in *)&source_p->localClient->listener->addr)->sin_port);
-                       
+
                        ServerStats.is_ref++;
                        /* jdc - lists server name & port connections are on */
                        /*       a purely cosmetical change */
@@ -318,7 +321,7 @@ verify_access(struct Client *client_p, const char *username)
 
        if(IsGotId(client_p))
        {
-               aconf = find_address_conf(client_p->host, client_p->sockhost, 
+               aconf = find_address_conf(client_p->host, client_p->sockhost,
                                        client_p->username, client_p->username,
                                        (struct sockaddr *) &client_p->localClient->ip,
                                        client_p->localClient->ip.ss_family,
@@ -398,7 +401,7 @@ verify_access(struct Client *client_p, const char *username)
 
 /*
  * add_ip_limit
- * 
+ *
  * Returns 1 if successful 0 if not
  *
  * This checks if the user has exceed the limits for their class
@@ -569,7 +572,7 @@ detach_conf(struct Client *client_p)
 
 /*
  * attach_conf
- * 
+ *
  * inputs      - client pointer
  *             - conf pointer
  * output      -
@@ -691,7 +694,7 @@ set_default_conf(void)
        ConfigFileEntry.default_adminstring = rb_strdup("is a Server Administrator");
        ConfigFileEntry.servicestring = rb_strdup("is a Network Service");
 
-       ConfigFileEntry.default_umodes = UMODE_INVISIBLE;       
+       ConfigFileEntry.default_umodes = UMODE_INVISIBLE;
        ConfigFileEntry.failed_oper_notice = YES;
        ConfigFileEntry.anti_nick_flood = NO;
        ConfigFileEntry.disable_fake_channels = NO;
@@ -788,7 +791,7 @@ set_default_conf(void)
        ConfigFileEntry.tkline_expire_notices = 0;
 
         ConfigFileEntry.reject_after_count = 5;
-       ConfigFileEntry.reject_ban_time = 300;  
+       ConfigFileEntry.reject_ban_time = 300;
        ConfigFileEntry.reject_duration = 120;
        ConfigFileEntry.throttle_count = 4;
        ConfigFileEntry.throttle_duration = 60;
@@ -811,7 +814,7 @@ set_default_conf(void)
 #undef NO
 
 /*
- * read_conf() 
+ * read_conf()
  *
  *
  * inputs       - file descriptor pointing to config file to use
@@ -863,7 +866,7 @@ validate_conf(void)
                int start = ServerInfo.ssld_count - get_ssld_count();
                /* start up additional ssld if needed */
                start_ssldaemon(start, ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params);
-                               
+
        }
 
        if((ConfigFileEntry.client_flood_max_lines < CLIENT_FLOOD_MIN) ||
@@ -884,7 +887,7 @@ validate_conf(void)
  *
  * inputs        - pointer to struct ConfItem
  * output        - none
- * Side effects  - links in given struct ConfItem into 
+ * Side effects  - links in given struct ConfItem into
  *                 temporary kline link list
  */
 void
@@ -950,7 +953,7 @@ add_temp_dline(struct ConfItem *aconf)
 }
 
 /* valid_wild_card()
- * 
+ *
  * input        - user buffer, host buffer
  * output       - 0 if invalid, 1 if valid
  * side effects -
@@ -1005,31 +1008,53 @@ valid_wild_card(const char *luser, const char *lhost)
        return 0;
 }
 
-rb_dlink_node *
-find_prop_ban(unsigned int status, const char *user, const char *host)
+
+int cmp_prop_ban(const void *a_, const void *b_)
 {
-       rb_dlink_node *ptr;
-       struct ConfItem *aconf;
+       const struct ConfItem *a = a_, *b = b_;
+       int r;
 
-       RB_DLINK_FOREACH(ptr, prop_bans.head)
-       {
-               aconf = ptr->data;
+       if ((a->status & ~CONF_ILLEGAL) > (int)(b->status & ~CONF_ILLEGAL)) return 1;
+       if ((a->status & ~CONF_ILLEGAL) < (int)(b->status & ~CONF_ILLEGAL)) return -1;
 
-               if((aconf->status & ~CONF_ILLEGAL) == status &&
-                               (!user || !aconf->user ||
-                                !irccmp(aconf->user, user)) &&
-                               !irccmp(aconf->host, host))
-                       return ptr;
-       }
-       return NULL;
+       r = irccmp(a->host, b->host);
+       if (r) return r;
+
+       if (a->user && b->user)
+               return irccmp(a->user, b->user);
+
+       return 0;
 }
 
 void
-deactivate_conf(struct ConfItem *aconf, rb_dlink_node *ptr)
+add_prop_ban(struct ConfItem *aconf)
 {
-       int i;
+       irc_dictionary_add(prop_bans_dict, (const char *)aconf, aconf);
+}
 
-       s_assert(ptr->data == aconf);
+struct ConfItem *
+find_prop_ban(unsigned status, const char *user, const char *host)
+{
+       struct ConfItem key = {.status = status, .user = (char *)user, .host = (char *)host};
+       return irc_dictionary_retrieve(prop_bans_dict, (const char *)&key);
+}
+
+void
+remove_prop_ban(struct ConfItem *aconf)
+{
+       irc_dictionary_delete(prop_bans_dict, (const char *)aconf);
+}
+
+int
+lookup_prop_ban(struct ConfItem *aconf)
+{
+       return irc_dictionary_retrieve(prop_bans_dict, (const char *)aconf) == aconf;
+}
+
+void
+deactivate_conf(struct ConfItem *aconf)
+{
+       int i;
 
        switch (aconf->status)
        {
@@ -1069,7 +1094,7 @@ deactivate_conf(struct ConfItem *aconf, rb_dlink_node *ptr)
        else
        {
                if (aconf->lifetime != 0)
-                       rb_dlinkDestroy(ptr, &prop_bans);
+                       remove_prop_ban(aconf);
                free_conf(aconf);
        }
 }
@@ -1080,13 +1105,11 @@ deactivate_conf(struct ConfItem *aconf, rb_dlink_node *ptr)
 void
 replace_old_ban(struct ConfItem *aconf)
 {
-       rb_dlink_node *ptr;
        struct ConfItem *oldconf;
 
-       ptr = find_prop_ban(aconf->status, aconf->user, aconf->host);
-       if(ptr != NULL)
+       oldconf = find_prop_ban(aconf->status, aconf->user, aconf->host);
+       if (oldconf != NULL)
        {
-               oldconf = ptr->data;
                /* Remember at least as long as the old one. */
                if(oldconf->lifetime > aconf->lifetime)
                        aconf->lifetime = oldconf->lifetime;
@@ -1100,23 +1123,23 @@ replace_old_ban(struct ConfItem *aconf)
                        aconf->lifetime = aconf->hold;
                /* Tell deactivate_conf() to destroy it. */
                oldconf->lifetime = rb_current_time();
-               deactivate_conf(oldconf, ptr);
+               deactivate_conf(oldconf);
        }
 }
 
 static void
-expire_prop_bans(void *list)
+expire_prop_bans(void *unused)
 {
-       rb_dlink_node *ptr;
-       rb_dlink_node *next_ptr;
        struct ConfItem *aconf;
+       time_t now;
+       struct DictionaryIter state;
 
-       RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head)
-       {
-               aconf = ptr->data;
+       now = rb_current_time();
 
-               if(aconf->lifetime <= rb_current_time() ||
-                               (aconf->hold <= rb_current_time() &&
+       DICTIONARY_FOREACH(aconf, &state, prop_bans_dict)
+       {
+               if(aconf->lifetime <= now ||
+                               (aconf->hold <= now &&
                                 !(aconf->status & CONF_ILLEGAL)))
                {
                        /* Alert opers that a TKline expired - Hwy */
@@ -1130,7 +1153,7 @@ expire_prop_bans(void *list)
                                                     aconf->host ? aconf->host : "*");
 
                        /* will destroy or mark illegal */
-                       deactivate_conf(aconf, ptr);
+                       deactivate_conf(aconf);
                }
        }
 }
@@ -1180,7 +1203,7 @@ reorganise_temp_kd(void *list)
 
                if(aconf->hold < (rb_current_time() + (60 * 60)))
                {
-                       rb_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;
                }
@@ -1188,14 +1211,14 @@ reorganise_temp_kd(void *list)
                {
                        if(aconf->hold < (rb_current_time() + (1440 * 60)))
                        {
-                               rb_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 && 
+                       else if(aconf->port > TEMP_DAY &&
                                (aconf->hold < (rb_current_time() + (10080 * 60))))
                        {
-                               rb_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;
                        }
@@ -1225,7 +1248,7 @@ get_oper_name(struct Client *client_p)
        }
 
        rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}",
-                  client_p->name, client_p->username, 
+                  client_p->name, client_p->username,
                   client_p->host, client_p->servptr->name);
        return buffer;
 }
@@ -1235,7 +1258,7 @@ get_oper_name(struct Client *client_p)
  *
  * inputs        - struct ConfItem
  *
- * output         - name 
+ * output         - name
  *                - host
  *                - pass
  *                - user
@@ -1282,7 +1305,7 @@ get_user_ban_reason(struct ConfItem *aconf)
 }
 
 void
-get_printable_kline(struct Client *source_p, struct ConfItem *aconf, 
+get_printable_kline(struct Client *source_p, struct ConfItem *aconf,
                    char **host, char **reason,
                    char **user, char **oper_reason)
 {
@@ -1339,7 +1362,7 @@ read_conf_files(int cold)
           FIXME: The full path is in conffilenamebuf first time since we
           dont know anything else
 
-          - Gozem 2002-07-21 
+          - Gozem 2002-07-21
         */
        rb_strlcpy(conffilebuf, filename, sizeof(conffilebuf));
 
@@ -1469,7 +1492,7 @@ clear_out_old_conf(void)
  * conf_add_class_to_conf
  * inputs       - pointer to config item
  * output       - NONE
- * side effects - Add a class pointer to a conf 
+ * side effects - Add a class pointer to a conf
  */
 
 void

diff --git a/src/s_serv.c b/src/s_serv.c
index e24f5cce1e8e90f44a447a5a68adf02d0cb33279..8d8029c29866e6ebe5dc1ada91cfa815bc9612dd 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -54,6 +54,7 @@
 #include "msg.h"
 #include "reject.h"
 #include "sslproc.h"
+#include "irc_dictionary.h"
 
 #ifndef INADDR_NONE
 #define INADDR_NONE ((unsigned int) 0xffffffff)
@@ -408,19 +409,18 @@ send_capabilities(struct Client *client_p, int cap_can_send)
 static void
 burst_ban(struct Client *client_p)
 {
-       rb_dlink_node *ptr;
        struct ConfItem *aconf;
        const char *type, *oper;
        /* +5 for !,@,{,} and null */
        char operbuf[NICKLEN + USERLEN + HOSTLEN + HOSTLEN + 5];
        char *p;
        size_t melen;
+       struct DictionaryIter state;
 
        melen = strlen(me.name);
-       RB_DLINK_FOREACH(ptr, prop_bans.head)
-       {
-               aconf = ptr->data;
 
+       DICTIONARY_FOREACH(aconf, &state, prop_bans_dict)
+       {
                /* Skip expired stuff. */
                if(aconf->lifetime < rb_current_time())
                        continue;