X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/e9b008053cd96b7893d720265d1afef0d6405945..af40e58b1f72e7ab8a8131f4ec68cae998cc57b1:/src/proto-common.c

diff --git a/src/proto-common.c b/src/proto-common.c
index 7178ea1..2d8e1f8 100644
--- a/src/proto-common.c
+++ b/src/proto-common.c
@@ -409,6 +409,7 @@ recalc_bursts(struct server *eob_server)
 static struct chanmsg_func {
     chanmsg_func_t func;
     struct userNode *service;
+    void *extra;
 } chanmsg_funcs[256]; /* indexed by trigger character */
 
 static struct allchanmsg_func {
@@ -439,7 +440,7 @@ privmsg_chan_helper(struct chanNode *cn, void *data)
     /* Never send a NOTICE to a channel to one of the services */
     cf = &chanmsg_funcs[(unsigned char)pd->text[0]];
     if (!pd->is_notice && cf->func)
-        cf->func(pd->user, cn, pd->text+1, cf->service, pd->is_notice);
+        cf->func(pd->user, cn, pd->text+1, cf->service, pd->is_notice, cf->extra);
     else
         spamserv_channel_message(cn, pd->user, pd->text);
 
@@ -449,7 +450,7 @@ privmsg_chan_helper(struct chanNode *cn, void *data)
        if (!cf->func)
          break; /* end of list */
        else
-         cf->func(pd->user, cn, pd->text, cf->service, pd->is_notice);
+         cf->func(pd->user, cn, pd->text, cf->service, pd->is_notice, cf->extra);
     }
 }
 
@@ -490,12 +491,13 @@ static CMD_FUNC(cmd_part)
 }
 
 void
-reg_chanmsg_func(unsigned char prefix, struct userNode *service, chanmsg_func_t handler)
+reg_chanmsg_func(unsigned char prefix, struct userNode *service, chanmsg_func_t handler, void *extra)
 {
     if (chanmsg_funcs[prefix].func)
 	log_module(MAIN_LOG, LOG_WARNING, "Re-registering new chanmsg handler for character `%c'.", prefix);
     chanmsg_funcs[prefix].func = handler;
     chanmsg_funcs[prefix].service = service;
+    chanmsg_funcs[prefix].extra = extra;
 }
 
 void
@@ -518,21 +520,25 @@ get_chanmsg_bot(unsigned char prefix)
 }
 
 static mode_change_func_t *mcf_list;
+static void **mcf_list_extra;
 static unsigned int mcf_size = 0, mcf_used = 0;
 
 void
-reg_mode_change_func(mode_change_func_t handler)
+reg_mode_change_func(mode_change_func_t handler, void *extra)
 {
     if (mcf_used == mcf_size) {
 	if (mcf_size) {
 		mcf_size <<= 1;
 		mcf_list = realloc(mcf_list, mcf_size*sizeof(mode_change_func_t));
+        mcf_list_extra = realloc(mcf_list_extra, mcf_size*sizeof(void*));
 	} else {
 		mcf_size = 8;
 		mcf_list = malloc(mcf_size*sizeof(mode_change_func_t));
+        mcf_list_extra = malloc(mcf_size*sizeof(void*));
 	}
     }
-    mcf_list[mcf_used++] = handler;
+    mcf_list[mcf_used] = handler;
+    mcf_list_extra[mcf_used++] = extra;
 }
 
 static oper_func_t *of_list;
@@ -747,7 +753,7 @@ mod_chanmode(struct userNode *who, struct chanNode *channel, char **modes, unsig
         mod_chanmode_apply(who, channel, change);
     if (flags & MC_NOTIFY)
         for (ii = 0; ii < mcf_used; ++ii)
-            mcf_list[ii](channel, who, change);
+            mcf_list[ii](channel, who, change, mcf_list_extra[ii]);
     mod_chanmode_free(change);
     return 1;
 }
@@ -766,21 +772,25 @@ irc_make_chanmode(struct chanNode *chan, char *out)
 }
 
 static user_mode_func_t *um_list;
+static void **um_list_extra;
 static unsigned int um_size = 0, um_used = 0;
 
 void
-reg_user_mode_func(user_mode_func_t handler)
+reg_user_mode_func(user_mode_func_t handler, void *extra)
 {
 	if (um_used == um_size) {
 		if (um_size) {
 			um_size <<= 1;
 			um_list = realloc(um_list, um_size*sizeof(user_mode_func_t));
+            um_list_extra = realloc(um_list_extra, um_size*sizeof(void*));
 		} else {
 			um_size = 8;
 			um_list = malloc(um_size*sizeof(user_mode_func_t));
+            um_list_extra = malloc(um_size*sizeof(void*));
 		}
 	}
-	um_list[um_used++] = handler;
+	um_list[um_used] = handler;
+    um_list_extra[um_used++] = extra;
 }
 
 void
@@ -800,26 +810,30 @@ call_user_mode_funcs(struct userNode *user, const char *mode_change)
 {
 	unsigned int n;
 	for (n=0; n<um_used; n++) {
-		um_list[n](user, mode_change);
+		um_list[n](user, mode_change, um_list_extra[n]);
 	}
 }
 
 static channel_mode_func_t *cm_list;
+static void **cm_list_extra;
 static unsigned int cm_size = 0, cm_used = 0;
 
 void
-reg_channel_mode_func(channel_mode_func_t handler)
+reg_channel_mode_func(channel_mode_func_t handler, void *extra)
 {
 	if (cm_used == cm_size) {
 		if (cm_size) {
 			cm_size <<= 1;
 			cm_list = realloc(cm_list, cm_size*sizeof(channel_mode_func_t));
+            cm_list_extra = realloc(cm_list_extra, cm_size*sizeof(void*));
 		} else {
 			cm_size = 8;
 			cm_list = malloc(cm_size*sizeof(channel_mode_func_t));
+            cm_list_extra = malloc(cm_size*sizeof(void*));
 		}
 	}
-	cm_list[cm_used++] = handler;
+	cm_list[cm_used] = handler;
+    cm_list_extra[cm_used++] = extra;
 }
 
 void
@@ -839,7 +853,7 @@ call_channel_mode_funcs(struct userNode *who, struct chanNode *channel, char **m
 {
 	unsigned int n;
 	for (n=0; n<cm_used; n++) {
-		cm_list[n](who, channel, modes, argc);
+		cm_list[n](who, channel, modes, argc, cm_list_extra[n]);
 	}
 }