static struct module *modcmd_module;
static struct modcmd *bind_command, *help_command, *version_command;
static const struct message_entry msgtab[] = {
- { "MCMSG_VERSION", "$b"PACKAGE_STRING"$b ("CODENAME"), Built: " __DATE__ ", " __TIME__"." },
{ "MCMSG_BARE_FLAG", "Flag %.*s must be preceded by a + or -." },
{ "MCMSG_UNKNOWN_FLAG", "Unknown module flag %.*s." },
{ "MCMSG_BAD_OPSERV_LEVEL", "Invalid $O access level %s." },
{ "MCMSG_SERVICE_REMOVED", "Service $b%s$b has been deleted." },
{ "MCMSG_FILE_NOT_OPENED", "Unable to open file $b%s$b for writing." },
{ "MCMSG_MESSAGES_DUMPED", "Messages written to $b%s$b." },
+ { "MCMSG_MESSAGE_DUMP_FAILED", "Message dump failed: %s." },
{ "MCMSG_COMMAND_FLAGS", "Command flags are %s (inferred: %s)." },
{ "MCMSG_COMMAND_ACCOUNT_FLAGS", "Requires account flags +%s, prohibits account flags +%s." },
{ "MCMSG_COMMAND_ACCESS_LEVEL", "Requires channel access %d and $O access %d." },
void
modcmd_privmsg(struct userNode *user, struct userNode *bot, char *text, int server_qualified) {
struct service *service;
+
if (!(service = dict_find(services, bot->nick, NULL))) {
log_module(MAIN_LOG, LOG_ERROR, "modcmd_privmsg got privmsg for unhandled service %s, unregistering.", bot->nick);
reg_privmsg_func(bot, NULL);
return;
}
+
+ if (text[0] == '\x01') {
+ char *term, response[MAXLEN];
+
+ text++; /* Skip leading ^A. */
+ /* Chop off final ^A. */
+ term = strchr(text, '\x01');
+ if (!term)
+ return;
+ *term = '\0';
+ /* Parse out leading text. */
+ term = strchr(text, ' ');
+ if (term) {
+ *term++ = '\0';
+ if (!*term)
+ term = NULL;
+ }
+ /* No dict lookup since these are so few. */
+ if (!irccasecmp(text, "CLIENTINFO")) {
+ /* Use \001 instead of \x01 because apparently \x01C is
+ * interpreted as ASCII FS (\034, decimal 28, hex 1C).
+ */
+ irc_notice_user(bot, user, "\001CLIENTINFO CLIENTINFO PING TIME USERINFO VERSION\x01");
+ } else if (!irccasecmp(text, "PING")) {
+ if (term) {
+ snprintf(response, sizeof(response), "\x01PONG %s\x01", term);
+ irc_notice_user(bot, user, response);
+ } else {
+ irc_notice_user(bot,user, "\x01PONG\x01");
+ }
+ } else if (!irccasecmp(text, "TIME")) {
+ struct tm tm;
+ localtime_r(&now, &tm);
+ strftime(response, sizeof(response), "\x01TIME %a %b %d %H:%M:%S %Y\x01", &tm);
+ irc_notice_user(bot, user, response);
+ } else if (!irccasecmp(text, "USERINFO")) {
+ snprintf(response, sizeof(response), "\x01USERINFO %s\x01", bot->info);
+ irc_notice_user(bot, user, response);
+ } else if (!irccasecmp(text, "VERSION")) {
+ /* This function provides copyright management information
+ * to end users of srvx. You should not alter, disable or
+ * remove this command or its accessibility to normal IRC
+ * users, except to add copyright information pertaining
+ * to changes you make to srvx.
+ */
+ snprintf(response, sizeof(response), "\x01VERSION %s (%s) %s\x01", PACKAGE_STRING, CODENAME, ARCH_VERSION);
+ irc_notice_user(bot, user, response);
+ }
+ return;
+ }
+
if (service->msg_hook && service->msg_hook(user, bot, text, server_qualified))
return;
svccmd_invoke(user, service, NULL, text, server_qualified);
}
struct service *
-service_register(struct userNode *bot, char trigger) {
+service_register(struct userNode *bot) {
struct service *service;
if ((service = dict_find(services, bot->nick, NULL)))
return service;
module_list_init(&service->modules);
service->commands = dict_new();
service->bot = bot;
- service->trigger = trigger;
dict_set_free_data(service->commands, free_service_command);
dict_insert(services, service->bot->nick, service);
reg_privmsg_func(bot, modcmd_privmsg);
- if (trigger)
- reg_chanmsg_func(trigger, bot, modcmd_chanmsg);
return service;
}
}
static MODCMD_FUNC(cmd_joiner) {
- char cmdname[80];
+ char cmdname[MAXLEN];
if (argc < 2) {
int len = sprintf(cmdname, "%s ", cmd->name);
}
static MODCMD_FUNC(cmd_service_add) {
- const char *nick, *desc;
+ const char *nick, *hostname, *desc;
struct userNode *bot;
nick = argv[1];
reply("MCMSG_BAD_SERVICE_NICK", nick);
return 0;
}
- desc = unsplit_string(argv+2, argc-2, NULL);
+ hostname = argv[2];
+ desc = unsplit_string(argv+3, argc-3, NULL);
bot = GetUserH(nick);
if (bot && IsService(bot)) {
reply("MCMSG_ALREADY_SERVICE", bot->nick);
return 0;
}
- bot = AddService(nick, desc);
- service_register(bot, '\0');
+ bot = AddService(nick, NULL, desc, hostname);
+ service_register(bot);
reply("MCMSG_NEW_SERVICE", bot->nick);
return 1;
}
struct saxdb_context *ctx;
dict_iterator_t it;
FILE *pf;
+ int res;
if (!(pf = fopen(fname, "w"))) {
reply("MCMSG_FILE_NOT_OPENED", fname);
reply("MSG_INTERNAL_FAILURE");
return 0;
}
- for (it = dict_first(lang_C->messages); it; it = iter_next(it))
- saxdb_write_string(ctx, iter_key(it), iter_data(it));
- saxdb_close_context(ctx);
- fclose(pf);
- reply("MCMSG_MESSAGES_DUMPED", fname);
- return 1;
+ if ((res = setjmp(ctx->jbuf)) != 0) {
+ ctx->complex.used = 0; /* to avoid false assert()s in close */
+ saxdb_close_context(ctx);
+ fclose(pf);
+ reply("MCMSG_MESSAGE_DUMP_FAILED", strerror(res));
+ return 0;
+ } else {
+ for (it = dict_first(lang_C->messages); it; it = iter_next(it))
+ saxdb_write_string(ctx, iter_key(it), iter_data(it));
+ saxdb_close_context(ctx);
+ fclose(pf);
+ reply("MCMSG_MESSAGES_DUMPED", fname);
+ return 1;
+ }
}
static MODCMD_FUNC(cmd_version) {
/* This function provides copyright management information to end
* users of srvx. You should not alter, disable or remove this
- * command or its accessibility to normal IRC users.
+ * command or its accessibility to normal IRC users, except to add
+ * copyright information pertaining to changes you make to srvx.
*/
- reply("MCMSG_VERSION");
- send_message_type(4, user, cmd->parent->bot, "Copyright 2000-2004 srvx Development Team.\nThe srvx Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others.\nThe srvx Development Team can be reached at http://sf.net/projects/srvx/ or in #srvx on irc.gamesurge.net.");
+ send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"$b ("CODENAME"), Built: "__DATE__", "__TIME__".\nCopyright 2000-2004 srvx Development Team.\nThe srvx Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others.\nThe srvx Development Team can be reached at http://sf.net/projects/srvx/ or in #srvx on irc.gamesurge.net.");
if ((argc > 1) && !irccasecmp(argv[1], "arch"))
send_message_type(4, user, cmd->parent->bot, "%s", ARCH_VERSION);
return 1;
saxdb_write_string(ctx, "trigger", buff);
}
saxdb_write_string(ctx, "description", service->bot->info);
+ saxdb_write_string(ctx, "hostname", service->bot->hostname);
if (service->privileged)
saxdb_write_string(ctx, "privileged", "1");
saxdb_end_record(ctx);
}
static void
-modcmd_load_bots(struct dict *db) {
+modcmd_load_bots(struct dict *db, int default_nick) {
dict_iterator_t it;
for (it = dict_first(db); it; it = iter_next(it)) {
struct record_data *rd;
- struct userNode *bot;
- const char *nick, *desc;
- char trigger;
+ struct service *svc;
+ const char *nick, *desc, *hostname;
rd = iter_data(it);
if (rd->type != RECDB_OBJECT) {
continue;
}
nick = database_get_data(rd->d.object, "nick", RECDB_QSTRING);
- if (!nick)
- nick = iter_key(it);
- if (service_find(nick))
- continue;
- desc = database_get_data(rd->d.object, "trigger", RECDB_QSTRING);
- trigger = desc ? desc[0] : '\0';
+ if (!nick) {
+ if (default_nick)
+ nick = iter_key(it);
+ else
+ continue;
+ }
+ svc = service_find(nick);
desc = database_get_data(rd->d.object, "description", RECDB_QSTRING);
- if (desc)
- {
- struct service *svc;
- bot = AddService(nick, desc);
- svc = service_register(bot, trigger);
+ hostname = database_get_data(rd->d.object, "hostname", RECDB_QSTRING);
+ if (desc) {
+ if (!svc)
+ svc = service_register(AddService(nick, NULL, desc, hostname));
+ else if (hostname)
+ strcpy(svc->bot->hostname, hostname);
+ desc = database_get_data(rd->d.object, "trigger", RECDB_QSTRING);
+ if (desc)
+ svc->trigger = desc[0];
desc = database_get_data(rd->d.object, "privileged", RECDB_QSTRING);
if (desc && (true_string(desc) || enabled_string(desc)))
svc->privileged = 1;
static void
modcmd_conf_read(void) {
- modcmd_load_bots(conf_get_data("services", RECDB_OBJECT));
+ modcmd_load_bots(conf_get_data("services", RECDB_OBJECT), 0);
}
void
modcmd_register(modcmd_module, "stats services", cmd_stats_services, 1, 0, "flags", "+oper", NULL);
modcmd_register(modcmd_module, "showcommands", cmd_showcommands, 1, 0, "flags", "+acceptchan", NULL);
modcmd_register(modcmd_module, "helpfiles", cmd_helpfiles, 2, 0, "template", "bind", NULL);
- modcmd_register(modcmd_module, "service add", cmd_service_add, 3, 0, "flags", "+oper", NULL);
+ modcmd_register(modcmd_module, "service add", cmd_service_add, 4, 0, "flags", "+oper", NULL);
modcmd_register(modcmd_module, "service rename", cmd_service_rename, 3, 0, "flags", "+oper", NULL);
modcmd_register(modcmd_module, "service trigger", cmd_service_trigger, 2, 0, "flags", "+oper", NULL);
modcmd_register(modcmd_module, "service privileged", cmd_service_privileged, 2, 0, "flags", "+oper", NULL);
struct record_data *rd, *rd2;
struct service *service;
- modcmd_load_bots(database_get_data(db, "bots", RECDB_OBJECT));
+ modcmd_load_bots(database_get_data(db, "bots", RECDB_OBJECT), 1);
db2 = database_get_data(db, "services", RECDB_OBJECT);
if (!db2) {
log_module(MAIN_LOG, LOG_ERROR, "Missing section 'services' in modcmd db.");
void
modcmd_finalize(void) {
+ dict_iterator_t it;
+
/* Check databases. */
saxdb_register("modcmd", modcmd_saxdb_read, modcmd_saxdb_write);
create_default_binds();
if (!saxdb_present)
import_aliases_db();
+ /* Register services for their triggers. */
+ for (it = dict_first(services); it; it = iter_next(it)) {
+ struct service *svc = iter_data(it);
+ if (svc->trigger)
+ reg_chanmsg_func(svc->trigger, svc->bot, modcmd_chanmsg);
+ }
+
/* Resolve command rule-templates. */
while (pending_templates) {
struct pending_template *ptempl = pending_templates;
projects / srvx.git / blobdiff