#include "UserNode.h"
#include "ChanNode.h"
#include "ChanUser.h"
+#include "WHOHandler.h"
struct trigger_callback {
int botid;
struct trigger_callback *next;
};
+struct command_check_user_cache {
+ struct ClientSocket *client;
+ struct UserNode *user;
+ struct ChanNode *chan;
+ char **argv;
+ int argc;
+ char *message;
+ struct cmd_binding *cbind;
+};
+
static struct cmd_binding **cmd_binds;
static struct cmd_function *cmd_functions = NULL;
static struct trigger_callback *trigger_callbacks = NULL;
return trigger->trigger;
}
+static USERAUTH_CALLBACK(command_checked_auth) {
+ struct command_check_user_cache *cache = data;
+ int execute_cmd = 1;
+ if((cache->cbind->func->flags & CMDFLAG_REQUIRE_AUTH) && !(user->flags & USERFLAG_ISAUTHED)) {
+ //AUTH_REQUIRED
+ execute_cmd = 0;
+ }
+ if(execute_cmd) {
+ cache->cbind->func->func(cache->client, user, cache->chan, cache->argv, cache->argc);
+ }
+ free(cache->message);
+ free(cache);
+}
+
static void handle_command(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, char *message) {
if(message[0] == '#') {
char *chanName = message;
if(chan2)
chan = chan2;
}
+ message = strdup(message);
int bind_index = get_binds_index(message[0]);
char *args = strstr(message, " ");
if(args) {
struct cmd_binding *cbind;
for(cbind = cmd_binds[bind_index]; cbind; cbind = cbind->next) {
if(cbind->botid == client->botid && strcmp(cbind->cmd, message) == 0) {
- struct cmd_function *cmdfunc = cbind->func;
//parse the arguments...
char *arga[MAXNUMPARAMS];
char **argv;
int argc = 0;
- while(*args) {
- //skip leading spaces
- while (*args == ' ')
- *args++ = 0;
- arga[argc++] = args;
- if (argc >= MAXNUMPARAMS)
- break;
- while (*args != ' ' && *args)
- args++;
+ if(args) {
+ while(*args) {
+ //skip leading spaces
+ while (*args == ' ')
+ *args++ = 0;
+ arga[argc++] = args;
+ if (argc >= MAXNUMPARAMS)
+ break;
+ while (*args != ' ' && *args)
+ args++;
+ }
}
argv = arga;
if(argc != 0 && argv[0][0] == '#') {
chan = chan2;
}
}
- cmdfunc->func(client, user, chan, argv, argc);
- return;
- }
- }
-
- if(!strcmp(message, "users")) {
- struct ChanUser *chanuser;
- putsock(client, "PRIVMSG %s :[BOT JOIN] Users on this Channel:", chan->name);
- for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
- putsock(client, "PRIVMSG %s : %s!%s@%s [%s] rights: %d", chan->name, chanuser->user->nick, chanuser->user->ident, chanuser->user->host, ((chanuser->user->flags & USERFLAG_ISAUTHED) ? chanuser->user->auth : "*"), chanuser->flags);
+ if(cbind->parameters) {
+ //userdefined parameters...
+ char *uarga[MAXNUMPARAMS];
+ char params[strlen(cbind->parameters)+1];
+ strcpy(params, cbind->parameters);
+ int uargpos = 0, argi, allargs = 0;
+ char *ppos = params;
+ char *prev_ppos = params;
+ while((ppos = strstr(ppos, " "))) {
+ *ppos = '\0';
+ if(prev_ppos[0] == '%') {
+ prev_ppos++;
+ if(prev_ppos[strlen(prev_ppos)-1] == '-') {
+ allargs = 1;
+ prev_ppos[strlen(prev_ppos)-1] = '\0';
+ } else
+ allargs = 0;
+ argi = atoi(prev_ppos);
+ if(argi > 0) {
+ if(argi <= argc) continue;
+ uarga[uargpos++] = argv[argi-1];
+ if(allargs) {
+ for(;argi < argc; argi++)
+ uarga[uargpos++] = argv[argi-1];
+ }
+ } else if(!strcmp(prev_ppos, "c"))
+ uarga[uargpos++] = (chan ? chan->name : NULL);
+ else if(!strcmp(prev_ppos, "n"))
+ uarga[uargpos++] = user->nick;
+ } else {
+ uarga[uargpos++] = prev_ppos;
+ }
+ ppos++;
+ prev_ppos = ppos;
+ }
+ argv = uarga;
+ argc = uargpos;
+ }
+ if(argc < cbind->func->paramcount) {
+ //LESS_PARAM_COUNT
+ break;
+ }
+ if((cbind->func->flags & CMDFLAG_REQUIRE_CHAN) && !chan) {
+ //CHAN_REQUIRED
+ break;
+ }
+ if((cbind->func->flags & CMDFLAG_CHECK_AUTH) && !(user->flags & USERFLAG_ISAUTHED)) {
+ //check auth...
+ struct command_check_user_cache *data = malloc(sizeof(*data));
+ char **temp_argv = malloc(argc*sizeof(*temp_argv));
+ if (!data || !temp_argv) {
+ perror("malloc() failed");
+ break;
+ }
+ memcpy(temp_argv, argv, argc*sizeof(*temp_argv));
+ data->argv = temp_argv;
+ data->argc = argc;
+ data->client = client;
+ data->user = user;
+ data->chan = chan;
+ data->message = message;
+ data->cbind = cbind;
+ get_userauth(user, command_checked_auth, data);
+ return;
+ }
+ if((cbind->func->flags & CMDFLAG_REQUIRE_AUTH) && !(user->flags & USERFLAG_ISAUTHED)) {
+ //AUTH_REQUIRED
+ break;
+ }
+ cbind->func->func(client, user, chan, argv, argc);
+ break;
}
}
- if(!strcmp(message, "modes")) {
- char modeBuf[MAXLEN];
- getModeString(chan, modeBuf);
- putsock(client, "PRIVMSG %s :Modes: %s", chan->name, modeBuf);
- }
+ free(message);
}
static void got_chanmsg(struct UserNode *user, struct ChanNode *chan, char *message) {
}
}
-int register_command(int botid, char *name, cmd_bind_t *func) {
+int register_command(int botid, char *name, cmd_bind_t *func, int paramcount, unsigned int flags) {
struct cmd_function *cmdfunc;
for(cmdfunc = cmd_functions; cmdfunc; cmdfunc = cmdfunc->next) {
if(cmdfunc->botid == botid && strcmp(cmdfunc->name, name) == 0)
cmdfunc->botid = botid;
cmdfunc->name = strdup(name);
cmdfunc->func = func;
+ cmdfunc->flags = 0;
+ cmdfunc->paramcount = paramcount;
cmdfunc->next = cmd_functions;
cmd_functions = cmdfunc;
return 1;
cbind->botid = botid;
cbind->cmd = strdup(cmd);
cbind->func = func;
+ cbind->parameters = NULL;
+ cbind->flags = 0;
cbind->next = cmd_binds[bind_index];
cmd_binds[bind_index] = cbind;
return 1;
cbind->cmd = strdup(cmd);
cbind->func = cmdfunc;
cbind->next = cmd_binds[bind_index];
+ cbind->parameters = NULL;
+ cbind->flags = 0;
cmd_binds[bind_index] = cbind;
return 1;
}
else
cmd_binds[bind_index] = cbind->next;
free(cbind->cmd);
+ if(cbind->parameters)
+ free(cbind->parameters);
free(cbind);
return 1;
} else
for(cbind = cmd_binds[i]; cbind; cbind = next) {
next = cbind->next;
free(cbind->cmd);
+ if(cbind->parameters)
+ free(cbind->parameters);
free(cbind);
}
}
projects / NeonServV5.git / blobdiff