X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/63637aea5429a07497cdda236ac2de5e22c9d4b6..75ddd32792fd2d0bf86c6e85d360c661134a0681:/src/hash.c

diff --git a/src/hash.c b/src/hash.c
index ffacb31..9775cfe 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -38,8 +38,9 @@ dict_t servers;
 unsigned int max_clients, invis_clients;
 time_t max_clients_time;
 struct userList curr_opers;
+unsigned int count_opers;
 
-static void hash_cleanup(void);
+static void hash_cleanup(void *extra);
 
 void init_structs(void)
 {
@@ -47,7 +48,8 @@ void init_structs(void)
     clients = dict_new();
     servers = dict_new();
     userList_init(&curr_opers);
-    reg_exit_func(hash_cleanup);
+    count_opers = 0;
+    reg_exit_func(hash_cleanup, NULL);
 }
 
 int userList_contains(struct userList *list, struct userNode *user)
@@ -101,6 +103,52 @@ GetServerH(const char *name)
     return dict_find(servers, name, NULL);
 }
 
+sasl_input_func_t *sif_list;
+void **sif_list_extra;
+unsigned int sif_size = 0, sif_used = 0;
+
+void
+reg_sasl_input_func(sasl_input_func_t handler, void *extra)
+{
+    if (sif_used == sif_size) {
+        if (sif_size) {
+            sif_size <<= 1;
+            sif_list = realloc(sif_list, sif_size*sizeof(new_user_func_t));
+            sif_list_extra = realloc(sif_list_extra, sif_size*sizeof(void*));
+        } else {
+            sif_size = 8;
+            sif_list = malloc(sif_size*sizeof(new_user_func_t));
+            sif_list_extra = malloc(sif_size*sizeof(void*));
+        }
+    }
+    sif_list[sif_used] = handler;
+    sif_list_extra[sif_used++] = extra;
+}
+
+void
+call_sasl_input_func(struct server* source ,const char *identifier, const char *subcmd, const char *data, const char *ext)
+{
+    unsigned int i;
+
+    for (i = 0; i < sif_used; ++i)
+    {
+        sif_list[i](source, identifier, subcmd, data, ext, sif_list_extra[i]);
+    }
+}
+
+void
+unreg_sasl_input_func(sasl_input_func_t handler, void *extra)
+{
+    unsigned int i;
+    for (i=0; i<sif_used; i++) {
+        if (sif_list[i] == handler && sif_list_extra[i] == extra) break;
+    }
+    if (i == sif_used) return;
+    memmove(sif_list+i, sif_list+i+1, (sif_used-i-1)*sizeof(sif_list[0]));
+    memmove(sif_list_extra+i, sif_list_extra+i+1, (sif_used-i-1)*sizeof(sif_list_extra[0]));
+    sif_used--;
+}
+
 new_user_func_t *nuf_list;
 void **nuf_list_extra;
 unsigned int nuf_size = 0, nuf_used = 0;
@@ -683,7 +731,6 @@ AddChannelUser(struct userNode *user, struct chanNode* channel)
             && !(channel->modes & MODE_REGISTERED)
             && !(channel->modes & MODE_APASS)) {
             mNode->modes |= MODE_CHANOP;
-            log_module(MAIN_LOG, LOG_DEBUG, "setting op");
         }
 
         if (IsLocal(user)) {
@@ -785,6 +832,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
@@ -797,7 +845,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);
@@ -811,18 +859,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
@@ -839,7 +890,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);
 
@@ -993,7 +1044,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;
 
@@ -1006,6 +1057,7 @@ hash_cleanup(void)
     dict_delete(clients);
     dict_delete(servers);
     userList_clean(&curr_opers);
+    count_opers = 0;
 
     free(slf_list);
     free(slf_list_extra);
@@ -1024,6 +1076,7 @@ hash_cleanup(void)
     free(pf_list);
     free(pf_list_extra);
     free(kf_list);
+    free(kf_list_extra);
     free(tf_list);
     free(tf_list_extra);
 }