X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fmodcmd.c;h=f53a3c22a93bfa88dafc2820c288c7f80599f053;hp=629435d9a672e2f64e359bd9164fe2fbdd7d0265;hb=8a1a716ef73af7b5288f7b5f8ab1b37be80f1247;hpb=77b1c3e45f25e5a000b06a551e3b2329ad2db8a0 diff --git a/src/modcmd.c b/src/modcmd.c index 629435d..f53a3c2 100644 --- a/src/modcmd.c +++ b/src/modcmd.c @@ -1,4 +1,4 @@ -/* modcmd.c - NeonServ v5.3 +/* modcmd.c - NeonServ v5.6 * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -30,6 +30,7 @@ struct trigger_callback { int botid; + int module_id; trigger_callback_t *func; struct trigger_callback *next; @@ -56,7 +57,6 @@ static struct cmd_binding **cmd_binds; static struct cmd_function *cmd_functions = NULL; static struct trigger_callback *trigger_callbacks = NULL; static struct cmd_bot_alias *bot_aliases = NULL; -static struct ClientSocket *tmp_text_client; static int total_triggered = 0; int statistics_commands = 0; @@ -123,12 +123,12 @@ static char* get_channel_trigger(int botid, int clientid, struct ChanNode *chan) return trigger->trigger; } -static void handle_command_async(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct ChanNode *sent_chan, struct cmd_binding *cbind, char **argv, int argc); +static void handle_command_async(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct ChanNode *sent_chan, struct cmd_binding *cbind, char **argv, int argc); static USERAUTH_CALLBACK(command_checked_auth) { struct command_check_user_cache *cache = data; - tmp_text_client = cache->textclient; - handle_command_async(cache->client, user, cache->chan, cache->sent_chan, cache->cbind, cache->argv, cache->argc); + if(user) + handle_command_async(cache->client, cache->textclient, user, cache->chan, cache->sent_chan, cache->cbind, cache->argv, cache->argc); free(cache->message); if(cache->args_buffer) free(cache->args_buffer); @@ -141,7 +141,7 @@ static CMD_BIND(modcmd_linker) { //just empty } -static struct cmd_binding *modcmd_linker_command(struct ClientSocket *client, struct UserNode *user, struct cmd_binding *cbind, int bind_index, char **args_ptr) { +static struct cmd_binding *modcmd_linker_command(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct cmd_binding *cbind, int bind_index, char **args_ptr) { //links subcommands char command[MAXLEN]; struct cmd_binding *parent_bind = cbind; @@ -160,7 +160,7 @@ static struct cmd_binding *modcmd_linker_command(struct ClientSocket *client, st } *args_ptr = args; if(cbind && cbind->func->func == modcmd_linker) { - return modcmd_linker_command(client, user, cbind, bind_index, args_ptr); + return modcmd_linker_command(client, textclient, user, cbind, bind_index, args_ptr); } return cbind; } else { @@ -174,7 +174,7 @@ static struct cmd_binding *modcmd_linker_command(struct ClientSocket *client, st subcompos += sprintf(subcommands + subcompos, (subcompos ? ", %s" : "%s"), cbind->cmd + commandlen); } } - reply(tmp_text_client, user, "MODCMD_SUBCOMMANDS", parent_bind->cmd, (subcompos ? subcommands : "none")); + reply(textclient, user, "MODCMD_SUBCOMMANDS", parent_bind->cmd, (subcompos ? subcommands : "none")); return NULL; } } @@ -205,9 +205,9 @@ static void handle_command(struct ClientSocket *client, struct UserNode *user, s if(cbind->botid == client->botid && (cbind->botid || cbind->clientid == client->clientid) && stricmp(cbind->cmd, message) == 0) { found_cmd = 1; //get a text bot - tmp_text_client = get_botwise_prefered_bot(client->botid, (client->botid == 0 ? client->clientid : 0)); + struct ClientSocket *textclient = get_botwise_prefered_bot(client->botid, (client->botid == 0 ? client->clientid : 0)); if(cbind->func->func == modcmd_linker) { - cbind = modcmd_linker_command(client, user, cbind, bind_index, &args); + cbind = modcmd_linker_command(client, textclient, user, cbind, bind_index, &args); if(cbind == NULL) break; } if(statistics_enabled) @@ -341,11 +341,11 @@ static void handle_command(struct ClientSocket *client, struct UserNode *user, s } } if(argc < cbind->func->paramcount) { - reply(tmp_text_client, user, "MODCMD_LESS_PARAM_COUNT"); + reply(textclient, user, "MODCMD_LESS_PARAM_COUNT"); break; } if((BIND_FLAGS(cbind) & CMDFLAG_REQUIRE_CHAN) && !chan) { - reply(tmp_text_client, user, "MODCMD_CHAN_REQUIRED"); + reply(textclient, user, "MODCMD_CHAN_REQUIRED"); break; } if(((BIND_FLAGS(cbind) & CMDFLAG_CHECK_AUTH) || (chan && chan != sent_chan && !isUserOnChan(user, chan))) && !(user->flags & USERFLAG_ISAUTHED)) { @@ -366,11 +366,11 @@ static void handle_command(struct ClientSocket *client, struct UserNode *user, s data->message = message; data->args_buffer = args_buffer; data->cbind = cbind; - data->textclient = tmp_text_client; - get_userauth(user, command_checked_auth, data); + data->textclient = textclient; + get_userauth(user, 0, command_checked_auth, data); return; } else - handle_command_async(client, user, chan, sent_chan, cbind, argv, argc); + handle_command_async(client, textclient, user, chan, sent_chan, cbind, argv, argc); break; } } @@ -381,17 +381,17 @@ static void handle_command(struct ClientSocket *client, struct UserNode *user, s free(args_buffer); } -static void handle_command_async(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct ChanNode *sent_chan, struct cmd_binding *cbind, char **argv, int argc) { +static void handle_command_async(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct ChanNode *sent_chan, struct cmd_binding *cbind, char **argv, int argc) { MYSQL_RES *res; MYSQL_ROW row; int uaccess; char requested_uaccess = 0; int eventflags = (BIND_FLAGS(cbind) & (CMDFLAG_LOG | CMDFLAG_OPLOG)); if((BIND_FLAGS(cbind) & CMDFLAG_REQUIRE_AUTH) && !(user->flags & USERFLAG_ISAUTHED)) { - reply(tmp_text_client, user, "MODCMD_AUTH_REQUIRED"); + reply(textclient, user, "MODCMD_AUTH_REQUIRED"); return; } - if(chan && sent_chan != chan && !isUserOnChan(user, chan)) { + if(chan && sent_chan != chan && (BIND_FLAGS(cbind) & CMDFLAG_NO_CROSSCHAN) && !isUserOnChan(user, chan)) { char user_in_chan = 0; if((user->flags & USERFLAG_ISAUTHED)) { //maybe there's another user authed to user->auth on the channel... @@ -411,7 +411,7 @@ static void handle_command_async(struct ClientSocket *client, struct UserNode *u if(isGodMode(user)) { eventflags |= CMDFLAG_OPLOG; } else { - reply(tmp_text_client, user, "MODCMD_CROSSCHAN", chan->name); + reply(textclient, user, "MODCMD_CROSSCHAN", chan->name); return; } } @@ -424,7 +424,7 @@ static void handle_command_async(struct ClientSocket *client, struct UserNode *u if ((row = mysql_fetch_row(res)) != NULL) { int saccess = getChannelAccess(user, sent_chan); if(row[0] && saccess < atoi(row[0]) && !isGodMode(user)) { //NOTE: HARDCODED DEFAULT: pubcmd = 0 - reply(tmp_text_client, user, "MODCMD_PUBCMD", sent_chan->name); + reply(textclient, user, "MODCMD_PUBCMD", sent_chan->name); return; } } @@ -439,9 +439,9 @@ static void handle_command_async(struct ClientSocket *client, struct UserNode *u } if(user_global_access < global_access) { if(!user_global_access) - reply(tmp_text_client, user, "MODCMD_PRIVILEGED", cbind->cmd); + reply(textclient, user, "MODCMD_PRIVILEGED", cbind->cmd); else - reply(tmp_text_client, user, "MODCMD_ACCESS_DENIED"); + reply(textclient, user, "MODCMD_ACCESS_DENIED"); return; } } @@ -497,7 +497,7 @@ static void handle_command_async(struct ClientSocket *client, struct UserNode *u eventflags |= CMDFLAG_OPLOG; } else if(uaccess < minaccess) { //ACCESS DENIED - reply(tmp_text_client, user, "MODCMD_ACCESS_DENIED"); + reply(textclient, user, "MODCMD_ACCESS_DENIED"); return; } if(!row[1] && !defaults) { @@ -509,7 +509,7 @@ static void handle_command_async(struct ClientSocket *client, struct UserNode *u eventflags |= CMDFLAG_OPLOG; } else { //PUBCMD - reply(tmp_text_client, user, "MODCMD_PUBCMD", chan->name); + reply(textclient, user, "MODCMD_PUBCMD", chan->name); return; } } @@ -523,7 +523,7 @@ static void handle_command_async(struct ClientSocket *client, struct UserNode *u if(isGodMode(user)) { eventflags |= CMDFLAG_OPLOG; } else { - reply(tmp_text_client, user, "MODCMD_ACCESS_DENIED"); + reply(textclient, user, "MODCMD_ACCESS_DENIED"); return; } } @@ -533,25 +533,25 @@ static void handle_command_async(struct ClientSocket *client, struct UserNode *u chan->flags |= CHANFLAG_REQUESTED_CHANINFO; } if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) { - reply(tmp_text_client, user, "MODCMD_CHAN_REQUIRED"); + reply(textclient, user, "MODCMD_CHAN_REQUIRED"); return; } printf_mysql_query("SELECT `botid`, `suspended` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, client->botid); res = mysql_use(); if ((row = mysql_fetch_row(res)) == NULL) { - reply(tmp_text_client, user, "MODCMD_CHAN_REQUIRED"); + reply(textclient, user, "MODCMD_CHAN_REQUIRED"); return; } else if(!strcmp(row[1], "1")) { - reply(tmp_text_client, user, "MODCMD_CHAN_SUSPENDED"); + reply(textclient, user, "MODCMD_CHAN_SUSPENDED"); return; } } if((BIND_FLAGS(cbind) & CMDFLAG_REQUIRE_GOD) && !isGodMode(user)) { - reply(tmp_text_client, user, "MODCMD_PRIVILEGED", cbind->cmd); + reply(textclient, user, "MODCMD_PRIVILEGED", cbind->cmd); return; } struct Event *event = createEvent(client, user, chan, cbind, argv, argc, eventflags); - cbind->func->func(client, user, chan, argv, argc, event); + cbind->func->func(client, textclient, user, chan, argv, argc, event); } static void got_chanmsg(struct UserNode *user, struct ChanNode *chan, char *message) { @@ -595,10 +595,10 @@ static void got_privmsg(struct UserNode *user, struct UserNode *target, char *me } } -int register_command(int botid, char *name, cmd_bind_t *func, int paramcount, char *channel_access, int global_access, unsigned int flags) { +int register_command(int botid, char *name, int module_id, cmd_bind_t *func, int paramcount, char *channel_access, int global_access, unsigned int flags) { struct cmd_function *cmdfunc; for(cmdfunc = cmd_functions; cmdfunc; cmdfunc = cmdfunc->next) { - if((cmdfunc->botid == botid || cmdfunc->botid == 0) && strcmp(cmdfunc->name, name) == 0) + if((cmdfunc->botid == botid || cmdfunc->botid == 0) && !stricmp(cmdfunc->name, name)) return 0; } cmdfunc = malloc(sizeof(*cmdfunc)); @@ -608,6 +608,7 @@ int register_command(int botid, char *name, cmd_bind_t *func, int paramcount, ch } cmdfunc->botid = botid; cmdfunc->name = strdup(name); + cmdfunc->module_id = module_id; cmdfunc->func = func; cmdfunc->flags = flags; cmdfunc->paramcount = paramcount; @@ -618,7 +619,7 @@ int register_command(int botid, char *name, cmd_bind_t *func, int paramcount, ch return 1; } -int set_trigger_callback(int botid, trigger_callback_t *func) { +int set_trigger_callback(int botid, int module_id, trigger_callback_t *func) { static struct trigger_callback *cb = NULL; for(cb = trigger_callbacks; cb; cb = cb->next) { if(cb->botid == botid) @@ -634,6 +635,7 @@ int set_trigger_callback(int botid, trigger_callback_t *func) { cb->next = trigger_callbacks; trigger_callbacks = cb; } + cb->module_id = module_id; cb->func = func; return 1; } @@ -675,7 +677,7 @@ int bind_botwise_cmd_to_function(int botid, int clientid, char *cmd, struct cmd_ int bind_index = get_binds_index(cmd[0]); struct cmd_binding *cbind; for(cbind = cmd_binds[bind_index]; cbind; cbind = cbind->next) { - if(((botid && cbind->botid == botid) || (botid == 0 && clientid == cbind->clientid)) && strcmp(cbind->cmd, cmd) == 0) + if(((botid && cbind->botid == botid) || (botid == 0 && clientid == cbind->clientid)) && !stricmp(cbind->cmd, cmd)) return 0; } cbind = malloc(sizeof(*cbind)); @@ -714,14 +716,14 @@ int bind_botwise_cmd_to_command(int botid, int clientid, char *cmd, char *func) func = c+1; } for(cmdfunc = cmd_functions; cmdfunc; cmdfunc = cmdfunc->next) { - if((cmdfunc->botid == fbotid || cmdfunc->botid == 0) && strcmp(cmdfunc->name, func) == 0) + if((cmdfunc->botid == fbotid || cmdfunc->botid == 0) && !stricmp(cmdfunc->name, func)) break; } if(!cmdfunc) return 0; int bind_index = get_binds_index(cmd[0]); struct cmd_binding *cbind; for(cbind = cmd_binds[bind_index]; cbind; cbind = cbind->next) { - if(((botid && cbind->botid == botid) || (botid == 0 && clientid == cbind->clientid)) && strcmp(cbind->cmd, cmd) == 0) + if(((botid && cbind->botid == botid) || (botid == 0 && clientid == cbind->clientid)) && !stricmp(cbind->cmd, cmd)) return 0; } cbind = malloc(sizeof(*cbind)); @@ -747,7 +749,7 @@ int unbind_botwise_cmd(int botid, int clientid, char *cmd) { int bind_index = get_binds_index(cmd[0]); struct cmd_binding *cbind, *last = NULL; for(cbind = cmd_binds[bind_index]; cbind; cbind = cbind->next) { - if(cbind->botid == botid && (botid || clientid == cbind->clientid) && strcmp(cbind->cmd, cmd) == 0) { + if(cbind->botid == botid && (botid || clientid == cbind->clientid) && !stricmp(cbind->cmd, cmd)) { if(last) last->next = cbind->next; else @@ -768,13 +770,13 @@ int unbind_botwise_cmd(int botid, int clientid, char *cmd) { return 0; } -int unbind_botwise_allcmd(int clientid) { +int unbind_botwise_allcmd(int botid, int clientid) { int i; for(i = 0; i < 27; i++) { struct cmd_binding *cbind, *next, *last = NULL; for(cbind = cmd_binds[i]; cbind; cbind = next) { next = cbind->next; - if(clientid == cbind->clientid) { + if((botid == 0 && clientid == cbind->clientid) || (botid && botid == cbind->botid)) { if(last) last->next = cbind->next; else @@ -817,16 +819,12 @@ struct cmd_function *find_cmd_function(int botid, char *name) { return cmdfunc; } -struct ClientSocket *getTextBot() { - return tmp_text_client; -} - void init_modcmd() { cmd_binds = calloc(27, sizeof(*cmd_binds)); - bind_chanmsg(got_chanmsg); - bind_privmsg(got_privmsg); + bind_chanmsg(got_chanmsg, 0); + bind_privmsg(got_privmsg, 0); register_default_language_table(msgtab); - register_command(0, "linker", modcmd_linker, 0, 0, 0, 0); //fake command for subcommands + register_command(0, "linker", 0, modcmd_linker, 0, 0, 0, 0); //fake command for subcommands } void free_modcmd() { @@ -873,7 +871,7 @@ void bind_botwise_set_parameters(int botid, int clientid, char *cmd, char *param int bind_index = get_binds_index(cmd[0]); struct cmd_binding *cbind; for(cbind = cmd_binds[bind_index]; cbind; cbind = cbind->next) { - if(cbind->botid == botid && (botid || clientid == cbind->clientid) && strcmp(cbind->cmd, cmd) == 0) { + if(cbind->botid == botid && (botid || clientid == cbind->clientid) && !stricmp(cbind->cmd, cmd)) { if(cbind->paramcount) { int i; for(i = 0; i < cbind->paramcount; i++) @@ -898,7 +896,7 @@ void bind_botwise_set_global_access(int botid, int clientid, char *cmd, int gacc int bind_index = get_binds_index(cmd[0]); struct cmd_binding *cbind; for(cbind = cmd_binds[bind_index]; cbind; cbind = cbind->next) { - if(cbind->botid == botid && (botid || clientid == cbind->clientid) && strcmp(cbind->cmd, cmd) == 0) { + if(cbind->botid == botid && (botid || clientid == cbind->clientid) && !stricmp(cbind->cmd, cmd)) { if(gaccess > -1) { cbind->global_access = gaccess; cbind->flags |= CMDFLAG_OVERRIDE_GLOBAL_ACCESS; @@ -914,7 +912,7 @@ void bind_botwise_set_channel_access(int botid, int clientid, char *cmd, char *c int bind_index = get_binds_index(cmd[0]); struct cmd_binding *cbind; for(cbind = cmd_binds[bind_index]; cbind; cbind = cbind->next) { - if(cbind->botid == botid && (botid || clientid == cbind->clientid) && strcmp(cbind->cmd, cmd) == 0) { + if(cbind->botid == botid && (botid || clientid == cbind->clientid) && !stricmp(cbind->cmd, cmd)) { if(cbind->channel_access) free(cbind->channel_access); if(chanaccess) { @@ -933,7 +931,7 @@ void bind_botwise_set_bind_flags(int botid, int clientid, char *cmd, unsigned in int bind_index = get_binds_index(cmd[0]); struct cmd_binding *cbind; for(cbind = cmd_binds[bind_index]; cbind; cbind = cbind->next) { - if(cbind->botid == botid && (botid || clientid == cbind->clientid) && strcmp(cbind->cmd, cmd) == 0) { + if(cbind->botid == botid && (botid || clientid == cbind->clientid) && !stricmp(cbind->cmd, cmd)) { cbind->flags |= flags; return; } @@ -944,7 +942,7 @@ struct cmd_binding *find_botwise_cmd_binding(int botid, int clientid, char *cmd) int bind_index = get_binds_index(cmd[0]); struct cmd_binding *cbind; for(cbind = cmd_binds[bind_index]; cbind; cbind = cbind->next) { - if(cbind->botid == botid && (botid || clientid == cbind->clientid) && strcmp(cbind->cmd, cmd) == 0) { + if(cbind->botid == botid && (botid || clientid == cbind->clientid) && !stricmp(cbind->cmd, cmd)) { return cbind; } } @@ -1010,3 +1008,54 @@ struct cmd_binding *getAllBinds(struct cmd_binding *last) { } while(bind_index < 27); return NULL; } + +void unregister_module_commands(int module_id) { + struct cmd_function *cmdfunct, *nextfunct, *prevfunct = NULL; + int i; + for(cmdfunct = cmd_functions; cmdfunct; cmdfunct = nextfunct) { + nextfunct = cmdfunct->next; + if(cmdfunct->module_id == module_id) { + for(i = 0; i < 27; i++) { + struct cmd_binding *cbind, *next, *last = NULL; + for(cbind = cmd_binds[i]; cbind; cbind = next) { + next = cbind->next; + if(cmdfunct == cbind->func) { + if(last) + last->next = cbind->next; + else + cmd_binds[i] = cbind->next; + free(cbind->cmd); + if(cbind->paramcount) { + int j; + for(j = 0; j < cbind->paramcount; j++) + free(cbind->parameters[j]); + } + if(cbind->channel_access) + free(cbind->channel_access); + free(cbind); + } else + last = cbind; + } + } + if(prevfunct) + prevfunct->next = nextfunct; + else + cmd_functions = nextfunct; + free(cmdfunct->name); + free(cmdfunct); + } else + prevfunct = cmdfunct; + } + struct trigger_callback *cb, *prevcb = NULL, *nextcb; + for(cb = trigger_callbacks; cb; cb = nextcb) { + nextcb = cb->next; + if(cb->module_id == module_id) { + if(prevcb) + prevcb->next = nextcb; + else + trigger_callbacks = nextcb; + free(cb); + } else + prevcb = cb; + } +}