Fix for crash bug during burst where X3 sends a B (BURST) message with a channel...

[irc/evilnet/x3.git] / src / hash.c

diff --git a/src/hash.c b/src/hash.c
index 3a4cc1ae6b5a134f8013e6fec26f5dc359c1eee9..80ac00223cb2c1e491b96778370796f121df844a 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -39,7 +39,7 @@ unsigned int max_clients, invis_clients;
 time_t max_clients_time;
 struct userList curr_opers;
 
-static void hash_cleanup(void);
+static void hash_cleanup(void *extra);
 
 void init_structs(void)
 {
@@ -47,7 +47,7 @@ void init_structs(void)
     clients = dict_new();
     servers = dict_new();
     userList_init(&curr_opers);
-    reg_exit_func(hash_cleanup);
+    reg_exit_func(hash_cleanup, NULL);
 }
 
 int userList_contains(struct userList *list, struct userNode *user)
@@ -153,7 +153,7 @@ reg_nick_change_func(nick_change_func_t handler, void *extra)
         }
     }
     ncf2_list[ncf2_used] = handler;
-    ncf2_list[ncf2_used++] = extra;
+    ncf2_list_extra[ncf2_used++] = extra;
 }
 
 
@@ -403,21 +403,25 @@ set_geoip_info(struct userNode *user)
 }
 
 static new_channel_func_t *ncf_list;
+static void **ncf_list_extra;
 static unsigned int ncf_size = 0, ncf_used = 0;
 
 void
-reg_new_channel_func(new_channel_func_t handler)
+reg_new_channel_func(new_channel_func_t handler, void *extra)
 {
     if (ncf_used == ncf_size) {
        if (ncf_size) {
            ncf_size <<= 1;
            ncf_list = realloc(ncf_list, ncf_size*sizeof(ncf_list[0]));
+        ncf_list_extra = realloc(ncf_list_extra, ncf_size*sizeof(void*));
        } else {
            ncf_size = 8;
            ncf_list = malloc(ncf_size*sizeof(ncf_list[0]));
+        ncf_list_extra = malloc(ncf_size*sizeof(void*));
        }
     }
-    ncf_list[ncf_used++] = handler;
+    ncf_list[ncf_used] = handler;
+    ncf_list_extra[ncf_used++] = extra;
 }
 
 static join_func_t *jf_list;
@@ -553,7 +557,7 @@ AddChannel(const char *name, time_t time_, const char *modes, char *banlist, cha
     /* if it's a new or updated channel, make callbacks */
     if (rel_age > 0)
         for (nn=0; nn<ncf_used; nn++)
-            ncf_list[nn](cNode);
+            ncf_list[nn](cNode, ncf_list_extra[nn]);
 
     /* go through list of bans and add each one */
     if (banlist && (rel_age >= 0)) {
@@ -593,21 +597,25 @@ AddChannel(const char *name, time_t time_, const char *modes, char *banlist, cha
 }
 
 static del_channel_func_t *dcf_list;
+static void **dcf_list_extra;
 static unsigned int dcf_size = 0, dcf_used = 0;
 
 void
-reg_del_channel_func(del_channel_func_t handler)
+reg_del_channel_func(del_channel_func_t handler, void *extra)
 {
     if (dcf_used == dcf_size) {
        if (dcf_size) {
            dcf_size <<= 1;
            dcf_list = realloc(dcf_list, dcf_size*sizeof(dcf_list[0]));
+        dcf_list_extra = realloc(dcf_list_extra, dcf_size*sizeof(void*));
        } else {
            dcf_size = 8;
            dcf_list = malloc(dcf_size*sizeof(dcf_list[0]));
+        dcf_list_extra = malloc(dcf_size*sizeof(dcf_list_extra[0]));
        }
     }
-    dcf_list[dcf_used++] = handler;
+    dcf_list[dcf_used] = handler;
+    dcf_list_extra[dcf_used++] = extra;
 }
 
 static void
@@ -637,7 +645,7 @@ DelChannel(struct chanNode *channel)
     channel->exemptlist.used = 0;
 
     for (n=0; n<dcf_used; n++)
-        dcf_list[n](channel);
+        dcf_list[n](channel, dcf_list_extra[n]);
 
     modeList_clean(&channel->members);
     banList_clean(&channel->banlist);
@@ -693,33 +701,38 @@ AddChannelUser(struct userNode *user, struct chanNode* channel)
 }
 
 static part_func_t *pf_list;
+static void **pf_list_extra;
 static unsigned int pf_size = 0, pf_used = 0;
 
 void
-reg_part_func(part_func_t handler)
+reg_part_func(part_func_t handler, void *extra)
 {
     if (pf_used == pf_size) {
        if (pf_size) {
            pf_size <<= 1;
            pf_list = realloc(pf_list, pf_size*sizeof(part_func_t));
+        pf_list_extra = realloc(pf_list_extra, pf_size*sizeof(void*));
        } else {
            pf_size = 8;
            pf_list = malloc(pf_size*sizeof(part_func_t));
+        pf_list_extra = malloc(pf_size*sizeof(void*));
        }
     }
-    pf_list[pf_used++] = handler;
+    pf_list[pf_used] = handler;
+    pf_list_extra[pf_used++] = extra;
 }
 
 void
-unreg_part_func(part_func_t handler)
+unreg_part_func(part_func_t handler, void *extra)
 {
     unsigned int i;
     for (i=0; i<pf_used; i++)
-        if (pf_list[i] == handler)
+        if (pf_list[i] == handler && pf_list_extra[i] == extra)
             break;
     if (i == pf_used)
         return;
     memmove(pf_list+i, pf_list+i+1, (pf_used-i-1)*sizeof(pf_list[0]));
+    memmove(pf_list_extra+i, pf_list_extra+i+1, (pf_used-i-1)*sizeof(pf_list_extra[0]));
     pf_used--;
 }
 
@@ -760,7 +773,7 @@ DelChannelUser(struct userNode* user, struct chanNode* channel, const char *reas
 
     /* make callbacks */
     for (n=0; n<pf_used; n++)
-       pf_list[n](mNode, reason);
+       pf_list[n](mNode, reason, pf_list_extra[n]);
 
     /* free memory */
     free(mNode);
@@ -772,6 +785,7 @@ DelChannelUser(struct userNode* user, struct chanNode* channel, const char *reas
 }
 
 static kick_func_t *kf_list;
+static void **kf_list_extra;
 static unsigned int kf_size = 0, kf_used = 0;
 
 void
@@ -784,7 +798,7 @@ KickChannelUser(struct userNode* target, struct chanNode* channel, struct userNo
 
     /* This may break things, but lets see.. -Rubin */
     for (n=0; n<kf_used; n++)
-        kf_list[n](kicker, target, channel);
+        kf_list[n](kicker, target, channel, kf_list_extra[n]);
 
     /* don't remove them from the channel, since the server will send a PART */
     irc_kick(kicker, target, channel, why);
@@ -798,18 +812,21 @@ KickChannelUser(struct userNode* target, struct chanNode* channel, struct userNo
 }
 
 void
-reg_kick_func(kick_func_t handler)
+reg_kick_func(kick_func_t handler, void *extra)
 {
     if (kf_used == kf_size) {
        if (kf_size) {
            kf_size <<= 1;
            kf_list = realloc(kf_list, kf_size*sizeof(kick_func_t));
+        kf_list_extra = realloc(kf_list_extra, kf_size*sizeof(void*));
        } else {
            kf_size = 8;
            kf_list = malloc(kf_size*sizeof(kick_func_t));
+        kf_list_extra = malloc(kf_size*sizeof(void*));
        }
     }
-    kf_list[kf_used++] = handler;
+    kf_list[kf_used] = handler;
+    kf_list_extra[kf_used++] = extra;
 }
 
 void
@@ -826,7 +843,7 @@ ChannelUserKicked(struct userNode* kicker, struct userNode* victim, struct chanN
         mn->idle_since = now;
 
     for (n=0; n<kf_used; n++)
-       kf_list[n](kicker, victim, channel);
+       kf_list[n](kicker, victim, channel, kf_list_extra[n]);
 
     DelChannelUser(victim, channel, 0, 0);
 
@@ -855,21 +872,25 @@ int ChannelExemptExists(struct chanNode *channel, const char *exempt)
 }
 
 static topic_func_t *tf_list;
+static void **tf_list_extra;
 static unsigned int tf_size = 0, tf_used = 0;
 
 void
-reg_topic_func(topic_func_t handler)
+reg_topic_func(topic_func_t handler, void *extra)
 {
     if (tf_used == tf_size) {
        if (tf_size) {
            tf_size <<= 1;
            tf_list = realloc(tf_list, tf_size*sizeof(topic_func_t));
+        tf_list_extra = realloc(tf_list_extra, tf_size*sizeof(void*));
        } else {
            tf_size = 8;
            tf_list = malloc(tf_size*sizeof(topic_func_t));
+        tf_list_extra = malloc(tf_size*sizeof(void*));
        }
     }
-    tf_list[tf_used++] = handler;
+    tf_list[tf_used] = handler;
+    tf_list_extra[tf_used++] = extra;
 }
 
 void
@@ -901,7 +922,7 @@ SetChannelTopic(struct chanNode *channel, struct userNode *service, struct userN
              * that it has reverted the topic change, and that further
              * hooks should not be called.
              */
-           if (tf_list[n](user, channel, old_topic))
+           if (tf_list[n](user, channel, old_topic, tf_list_extra[n]))
                 break;
     }
 }
@@ -976,7 +997,7 @@ DEFINE_LIST(channelList, struct chanNode*)
 DEFINE_LIST(serverList, struct server*)
 
 static void
-hash_cleanup(void)
+hash_cleanup(UNUSED_ARG(void *extra))
 {
     dict_iterator_t it, next;
 
@@ -999,10 +1020,15 @@ hash_cleanup(void)
     free(duf_list);
     free(duf_list_extra);
     free(ncf_list);
+    free(ncf_list_extra);
     free(jf_list);
     free(jf_list_extra);
     free(dcf_list);
+    free(dcf_list_extra);
     free(pf_list);
+    free(pf_list_extra);
     free(kf_list);
+    free(kf_list_extra);
     free(tf_list);
+    free(tf_list_extra);
 }