/* opserv.c - IRC Operator assistance service
* Copyright 2000-2004 srvx Development Team
*
- * This program is free software; you can redistribute it and/or modify
+ * This file is part of srvx.
+ *
+ * srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version. Important limitations are
- * listed in the COPYING file that accompanies this software.
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, email srvx-maintainers@srvx.net.
+ * along with srvx; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
#include "conf.h"
{ "OSMSG_WHOIS_IDENT", "%s (%s@%s) from %d.%d.%d.%d" },
{ "OSMSG_WHOIS_NICK", "Nick : %s" },
{ "OSMSG_WHOIS_HOST", "Host : %s@%s" },
+ { "OSMSG_WHOIS_FAKEHOST", "Fakehost: %s" },
{ "OSMSG_WHOIS_IP", "Real IP : %s" },
{ "OSMSG_WHOIS_MODES", "Modes : +%s " },
{ "OSMSG_WHOIS_INFO", "Info : %s" },
{ "OSMSG_RAW_PARSE_ERROR", "Error parsing raw line (not dumping to uplink)." },
{ "OSMSG_COLLIDED_NICK", "Now temporarily holding nick $b%s$b." },
{ "OSMSG_RESERVED_NICK", "Now reserving nick $b%s$b." },
+ { "OSMSG_NICK_UNRESERVED", "Nick $b%s$b is no longer reserved." },
{ "OSMSG_NOT_RESERVED", "Nick $b%s$b is not reserved." },
{ "OSMSG_ILLEGAL_REASON", "This channel is illegal." },
{ "OSMSG_ILLEGAL_KILL_REASON", "Joined an illegal modeless channel - do not repeat." },
{ "OSMSG_WARN_LISTSTART", "Channel activity warnings:" },
{ "OSMSG_WARN_LISTENTRY", "%s (%s)" },
{ "OSMSG_WARN_LISTEND", "End of activity warning list." },
+ { "OSMSG_STATS_MEMORY", "%u allocations totalling %u bytes." },
{ "OSMSG_UPLINK_CONNECTING", "Establishing connection with %s (%s:%d)." },
{ "OSMSG_CURRENT_UPLINK", "$b%s$b is already the current uplink." },
{ "OSMSG_INVALID_UPLINK", "$b%s$b is not a valid uplink name." },
{ "OSMSG_CHANINFO_TOPIC_UNKNOWN", "Topic: (none / not gathered)" },
{ "OSMSG_CHANINFO_BAN_COUNT", "Bans (%d):" },
{ "OSMSG_CHANINFO_BAN", "%%s by %%s (%a %b %d %H:%M:%S %Y)" },
- { "OSMSG_CHANINFO_MANY_USERS", "%d users (\"/msg $s %s %s users\" for the list)" },
+ { "OSMSG_CHANINFO_MANY_USERS", "%d users (\"/msg $S %s %s users\" for the list)" },
{ "OSMSG_CHANINFO_USER_COUNT", "Users (%d):" },
{ "OSMSG_CSEARCH_CHANNEL_INFO", "%s [%d users] %s %s" },
{ NULL, NULL }
static dict_t opserv_nick_based_alerts; /* data is struct opserv_user_alert* */
static dict_t opserv_channel_alerts; /* data is struct opserv_user_alert* */
static struct module *opserv_module;
-static struct service *opserv_service;
static struct log_type *OS_LOG;
static unsigned int new_user_flood;
static char *level_strings[1001];
free(alert);
}
-static struct svccmd *
-opserv_get_command(const char *name) {
- return dict_find(opserv_service->commands, name, NULL);
-}
-
#define opserv_debug(format...) do { if (opserv_conf.debug_channel) send_channel_notice(opserv_conf.debug_channel , opserv , ## format); } while (0)
#define opserv_alert(format...) do { if (opserv_conf.alert_channel) send_channel_notice(opserv_conf.alert_channel , opserv , ## format); } while (0)
struct mod_chanmode change;
struct userNode *victim;
- change.modes_set = change.modes_clear = 0;
+ mod_chanmode_init(&change);
change.argc = 1;
change.args[0].mode = MODE_BAN;
if (is_ircmask(argv[1]))
- change.args[0].hostmask = strdup(argv[1]);
+ change.args[0].u.hostmask = strdup(argv[1]);
else if ((victim = GetUserH(argv[1])))
- change.args[0].hostmask = generate_hostmask(victim, 0);
+ change.args[0].u.hostmask = generate_hostmask(victim, 0);
else {
reply("OSMSG_INVALID_IRCMASK", argv[1]);
return 0;
}
modcmd_chanmode_announce(&change);
- reply("OSMSG_ADDED_BAN", change.args[0].hostmask, channel->name);
- free((char*)change.args[0].hostmask);
+ reply("OSMSG_ADDED_BAN", change.args[0].u.hostmask, channel->name);
+ free((char*)change.args[0].u.hostmask);
return 1;
}
if (channel->topic_time) {
fmt = user_find_message(user, "OSMSG_CHANINFO_TOPIC");
strftime(buffer, sizeof(buffer), fmt, gmtime(&channel->topic_time));
- reply(buffer, channel->topic_nick, channel->topic);
+ send_message_type(4, user, cmd->parent->bot, buffer, channel->topic_nick, channel->topic);
} else {
irc_fetchtopic(cmd->parent->bot, channel->name);
reply("OSMSG_CHANINFO_TOPIC_UNKNOWN");
for (n = 0; n < channel->banlist.used; n++) {
ban = channel->banlist.list[n];
strftime(buffer, sizeof(buffer), fmt, localtime(&ban->set));
- reply(buffer, ban->ban, ban->who);
+ send_message_type(4, user, cmd->parent->bot, buffer, ban->ban, ban->who);
}
}
if ((argc < 2) && (channel->members.used >= 50)) {
change = mod_chanmode_alloc(channel->banlist.used);
for (ii=0; ii<channel->banlist.used; ii++) {
change->args[ii].mode = MODE_REMOVE | MODE_BAN;
- change->args[ii].hostmask = channel->banlist.list[ii]->ban;
+ change->args[ii].u.hostmask = strdup(channel->banlist.list[ii]->ban);
}
modcmd_chanmode_announce(change);
+ for (ii=0; ii<change->argc; ++ii)
+ free((char*)change->args[ii].u.hostmask);
mod_chanmode_free(change);
reply("OSMSG_CLEARBANS_DONE", channel->name);
return 1;
reply("OSMSG_NO_CHANNEL_MODES", channel->name);
return 0;
}
- change.modes_set = 0;
+ mod_chanmode_init(&change);
change.modes_clear = channel->modes;
- change.argc = 0;
modcmd_chanmode_announce(&change);
reply("OSMSG_CLEARMODES_DONE", channel->name);
return 1;
|| !(mn->modes & MODE_CHANOP))
continue;
change->args[count].mode = MODE_REMOVE | MODE_CHANOP;
- change->args[count++].member = mn;
+ change->args[count++].u.member = mn;
}
if (count) {
change->argc = count;
if (IsService(mn->user) || !(mn->modes & MODE_CHANOP))
continue;
change->args[count].mode = MODE_REMOVE | MODE_CHANOP;
- change->args[count++].member = mn;
+ change->args[count++].u.member = mn;
}
if (count) {
change->argc = count;
return 0;
}
if (GetUserMode(opserv_conf.debug_channel, user)) {
- reply("OSMSG_ALREADY_THERE", channel->name);
+ reply("OSMSG_ALREADY_THERE", opserv_conf.debug_channel->name);
return 0;
}
irc_invite(cmd->parent->bot, target, opserv_conf.debug_channel);
return 0;
} else {
struct mod_chanmode change;
- change.modes_set = change.modes_clear = 0;
+ mod_chanmode_init(&change);
change.argc = 1;
change.args[0].mode = MODE_CHANOP;
- change.args[0].member = AddChannelUser(bot, channel);
+ change.args[0].u.member = AddChannelUser(bot, channel);
modcmd_chanmode_announce(&change);
}
irc_fetchtopic(bot, channel->name);
* channel, we have to join it in temporarily. */
if (!(inchan = GetUserMode(channel, bot) ? 1 : 0)) {
struct mod_chanmode change;
- memset(&change, 0, sizeof(change));
+ mod_chanmode_init(&change);
change.args[0].mode = MODE_CHANOP;
- change.args[0].member = AddChannelUser(bot, channel);
+ change.args[0].u.member = AddChannelUser(bot, channel);
modcmd_chanmode_announce(&change);
}
if (argc < 2) {
reply("OSMSG_NOT_ON_CHANNEL", target->nick, channel->name);
return 0;
}
- change.modes_set = change.modes_clear = 0;
+ mod_chanmode_init(&change);
change.argc = 1;
change.args[0].mode = MODE_BAN;
- change.args[0].hostmask = mask = generate_hostmask(target, 0);
+ change.args[0].u.hostmask = mask = generate_hostmask(target, 0);
modcmd_chanmode_announce(&change);
KickChannelUser(target, channel, cmd->parent->bot, reason);
free(mask);
if (!(inchan = GetUserMode(channel, bot) ? 1 : 0)) {
change = mod_chanmode_alloc(2);
change->args[0].mode = MODE_CHANOP;
- change->args[0].member = AddChannelUser(bot, channel);
+ change->args[0].u.member = AddChannelUser(bot, channel);
change->args[1].mode = MODE_BAN;
- change->args[1].hostmask = "*!*@*";
+ change->args[1].u.hostmask = "*!*@*";
} else {
- change = mod_chanmode_alloc(2);
+ change = mod_chanmode_alloc(1);
change->args[0].mode = MODE_BAN;
- change->args[0].hostmask = "*!*@*";
+ change->args[0].u.hostmask = "*!*@*";
}
modcmd_chanmode_announce(change);
+ mod_chanmode_free(change);
if (argc < 2) {
reason = alloca(strlen(OSMSG_KICK_REQUESTED)+strlen(user->nick)+1);
sprintf(reason, OSMSG_KICK_REQUESTED, user->nick);
continue;
if (!(mn = GetUserMode(channel, victim)))
continue;
- if (!(mn->modes & MODE_CHANOP))
+ if (mn->modes & MODE_CHANOP)
continue;
change->args[count].mode = MODE_CHANOP;
- change->args[count++].member = mn;
+ change->args[count++].u.member = mn;
}
if (count) {
change->argc = count;
if (mn->modes & MODE_CHANOP)
continue;
change->args[count].mode = MODE_CHANOP;
- change->args[count++].member = mn;
+ change->args[count++].u.member = mn;
}
if (count) {
change->argc = count;
if (argv[1][0] == '*')
target = GetUserN(argv[1]+1);
else
- target = GetUserH(argv[1]);
-#else
- target = GetUserH(argv[1]);
#endif
+ target = GetUserH(argv[1]);
if (!target) {
reply("MSG_NICK_UNKNOWN", argv[1]);
return 0;
}
reply("OSMSG_WHOIS_NICK", target->nick);
reply("OSMSG_WHOIS_HOST", target->ident, target->hostname);
+ if (IsFakeHost(target))
+ reply("OSMSG_WHOIS_FAKEHOST", target->fakehost);
reply("OSMSG_WHOIS_IP", inet_ntoa(target->ip));
if (target->modes) {
bpos = 0;
if (IsDeaf(target)) buffer[bpos++] = 'd';
if (IsHiddenHost(target)) buffer[bpos++] = 'x';
if (IsGagged(target)) buffer_cat(" (gagged)");
+ if (IsRegistering(target)) buffer_cat(" (registered account)");
buffer[bpos] = 0;
if (bpos > 0)
reply("OSMSG_WHOIS_MODES", buffer);
#endif
reply("OSMSG_WHOIS_SERVER", target->uplink->name);
reply("OSMSG_WHOIS_ACCOUNT", (target->handle_info ? target->handle_info->handle : "Not authenticated"));
- intervalString(buffer, now - target->timestamp);
+ intervalString(buffer, now - target->timestamp, user->handle_info);
reply("OSMSG_WHOIS_NICK_AGE", buffer);
if (target->channels.used <= MAX_CHANNELS_WHOIS)
opserv_ison(user, target, "OSMSG_WHOIS_CHANNELS");
static MODCMD_FUNC(cmd_unban)
{
struct mod_chanmode change;
- change.modes_set = change.modes_clear = 0;
+ mod_chanmode_init(&change);
change.argc = 1;
change.args[0].mode = MODE_REMOVE | MODE_BAN;
- change.args[0].hostmask = argv[1];
+ change.args[0].u.hostmask = argv[1];
modcmd_chanmode_announce(&change);
reply("OSMSG_UNBAN_DONE", channel->name);
return 1;
if (mn->modes & (MODE_CHANOP|MODE_VOICE))
continue;
change->args[count].mode = MODE_VOICE;
- change->args[count++].member = mn;
+ change->args[count++].u.member = mn;
}
if (count) {
change->argc = count;
change = mod_chanmode_alloc(channel->members.used);
for (ii = count = 0; ii < channel->members.used; ++ii) {
struct modeNode *mn = channel->members.list[ii];
- if (mn->modes & MODE_VOICE)
+ if (!(mn->modes & MODE_VOICE))
continue;
change->args[count].mode = MODE_REMOVE | MODE_VOICE;
- change->args[count++].member = mn;
+ change->args[count++].u.member = mn;
}
if (count) {
change->argc = count;
#endif
tbl.contents[nn][1] = buffer;
ofs = strlen(buffer) + 1;
- intervalString(buffer + ofs, now - server->link);
- if (server->self_burst) strcat(buffer + ofs, " Bursting");
+ intervalString(buffer + ofs, now - server->link, user->handle_info);
+ if (server->self_burst)
+ strcat(buffer + ofs, " Bursting");
tbl.contents[nn][2] = buffer + ofs;
nn++;
}
th = dict_find(opserv_trusted_hosts, argv[1], NULL);
if (th) {
if (th->issued)
- intervalString(issued, now - th->issued);
+ intervalString(issued, now - th->issued, user->handle_info);
if (th->expires)
- intervalString(length, th->expires - now);
+ intervalString(length, th->expires - now, user->handle_info);
if (th->limit)
sprintf(limit, "limit %lu", th->limit);
reply("OSMSG_HOST_IS_TRUSTED",
for (it = dict_first(opserv_trusted_hosts); it; it = iter_next(it)) {
th = iter_data(it);
if (th->issued)
- intervalString(issued, now - th->issued);
+ intervalString(issued, now - th->issued, user->handle_info);
if (th->expires)
- intervalString(length, th->expires - now);
+ intervalString(length, th->expires - now, user->handle_info);
if (th->limit)
sprintf(limit, "limit %lu", th->limit);
reply("OSMSG_HOST_IS_TRUSTED", iter_key(it),
clocks_per_sec = CLOCKS_PER_SEC;
}
}
- intervalString(uptime, time(NULL)-boot_time);
+ intervalString(uptime, time(NULL)-boot_time, user->handle_info);
times(&buf);
reply("OSMSG_UPTIME_STATS",
uptime, lines_processed,
table.contents[0][3] = "Reason";
for (nn=1, gag=gagList; gag; nn++, gag=gag->next) {
char expstr[INTERVALLEN];
- if (gag->expires) intervalString(expstr, gag->expires - now);
- else strcpy(expstr, "Never");
+ if (gag->expires)
+ intervalString(expstr, gag->expires - now, user->handle_info);
+ else
+ strcpy(expstr, "Never");
table.contents[nn] = calloc(table.width, sizeof(char*));
table.contents[nn][0] = gag->mask;
table.contents[nn][1] = gag->owner;
return 1;
}
+#if defined(WITH_MALLOC_SRVX)
+static MODCMD_FUNC(cmd_stats_memory) {
+ extern unsigned long alloc_count, alloc_size;
+ reply("OSMSG_STATS_MEMORY", alloc_count, alloc_size);
+ return 1;
+}
+#endif
+
static MODCMD_FUNC(cmd_dump)
{
char linedup[MAXLEN], *original;
change = mod_chanmode_alloc(2);
change->modes_set = MODE_SECRET | MODE_INVITEONLY;
change->args[0].mode = MODE_CHANOP;
- change->args[0].member = AddChannelUser(opserv, channel);
+ change->args[0].u.member = AddChannelUser(opserv, channel);
change->args[1].mode = MODE_BAN;
- change->args[1].hostmask = "*!*@*";
+ change->args[1].u.hostmask = "*!*@*";
mod_chanmode_announce(opserv, channel, change);
mod_chanmode_free(change);
for (nn=channel->members.used; nn>0; ) {
struct modeNode *mNode = channel->members.list[--nn];
if (IsService(mNode->user))
continue;
- KickChannelUser(mNode->user, channel, opserv, reason);
+ KickChannelUser(mNode->user, channel, opserv, user_find_message(mNode->user, reason));
}
timeq_add(now + opserv_conf.purge_lock_delay, opserv_part_channel, channel);
}
newchan->bad_channel = opserv_bad_channel(newchan->name);
}
+static void
+opserv_channel_delete(struct chanNode *chan)
+{
+ timeq_del(0, opserv_part_channel, chan, TIMEQ_IGNORE_WHEN);
+}
+
static int
opserv_join_check(struct modeNode *mNode)
{
if (channel->name[0] != '#')
DelUser(user, opserv, 1, "OSMSG_ILLEGAL_KILL_REASON");
else if (!GetUserMode(channel, opserv))
- opserv_shutdown_channel(channel, user_find_message(user, "OSMSG_ILLEGAL_REASON"));
+ opserv_shutdown_channel(channel, "OSMSG_ILLEGAL_REASON");
else {
send_message(user, opserv, "OSMSG_ILLEGAL_CHANNEL", channel->name);
msg = user_find_message(user, "OSMSG_ILLEGAL_REASON");
/* Don't moderate the channel unless it is activated and
the number of users in the channel is over the threshold. */
struct mod_chanmode change;
- change.modes_set = change.modes_clear = change.argc = 0;
+ mod_chanmode_init(&change);
channel->join_flooded = 1;
if (opserv_conf.join_flood_moderate && (channel->members.used > opserv_conf.join_flood_moderate_threshold)) {
if (!GetUserMode(channel, opserv)) {
/* If we aren't in the channel, join it. */
change.args[0].mode = MODE_CHANOP;
- change.args[0].member = AddChannelUser(opserv, channel);
+ change.args[0].u.member = AddChannelUser(opserv, channel);
change.argc++;
}
- if (!(channel->modes & MODE_MODERATED))
- change.modes_set |= MODE_MODERATED;
+ change.modes_set = (MODE_MODERATED | MODE_DELAYJOINS) & ~channel->modes;
if (change.modes_set || change.argc)
mod_chanmode_announce(opserv, channel, &change);
- send_channel_notice(channel, opserv, "OSMSG_FLOOD_MODERATE");
+ send_target_message(0, channel->name, opserv, "OSMSG_FLOOD_MODERATE");
opserv_alert("Warning: Possible join flood in %s (currently %d users; channel moderated).", channel->name, channel->members.used);
} else {
opserv_alert("Warning: Possible join flood in %s (currently %d users).", channel->name, channel->members.used);
unsigned long interval;
char *reason, *tmp;
struct in_addr tmpaddr;
- int count;
+ unsigned int count;
if (dict_find(opserv_trusted_hosts, argv[1], NULL)) {
reply("OSMSG_ALREADY_TRUSTED", argv[1]);
}
count = strtoul(argv[2], &tmp, 10);
- if (!count || *tmp != '\0') {
+ if (*tmp != '\0') {
reply("OSMSG_BAD_NUMBER", argv[2]);
return 0;
}
unsigned long interval;
struct trusted_host *th;
char *reason, *tmp;
- int count;
+ unsigned int count;
th = dict_find(opserv_trusted_hosts, argv[1], NULL);
if (!th) {
reply("MSG_CHANNEL_UNKNOWN", argv[3]);
return 0;
}
- change.modes_set = change.modes_clear = 0;
+ mod_chanmode_init(&change);
change.argc = 1;
change.args[0].mode = MODE_CHANOP;
- change.args[0].member = GetUserMode(channel, clone);
- if (!change.args[0].member) {
+ change.args[0].u.member = GetUserMode(channel, clone);
+ if (!change.args[0].u.member) {
reply("OSMSG_NOT_ON_CHANNEL", clone->nick, channel->name);
return 0;
}
static struct helpfile_expansion
opserv_help_expand(const char *variable)
{
+ extern struct userNode *message_source;
struct helpfile_expansion exp;
+ struct service *service;
struct svccmd *cmd;
dict_iterator_t it;
int row;
unsigned int level;
- if (!irccasecmp(variable, "index")) {
+ if (!(service = service_find(message_source->nick))) {
+ exp.type = HF_STRING;
+ exp.value.str = NULL;
+ } else if (!irccasecmp(variable, "index")) {
exp.type = HF_TABLE;
exp.value.table.length = 1;
exp.value.table.width = 2;
exp.value.table.flags = TABLE_REPEAT_HEADERS | TABLE_REPEAT_ROWS;
- exp.value.table.contents = calloc(dict_size(opserv_service->commands)+1, sizeof(char**));
+ exp.value.table.contents = calloc(dict_size(service->commands)+1, sizeof(char**));
exp.value.table.contents[0] = calloc(exp.value.table.width, sizeof(char*));
exp.value.table.contents[0][0] = "Command";
exp.value.table.contents[0][1] = "Level";
- for (it=dict_first(opserv_service->commands); it; it=iter_next(it)) {
+ for (it=dict_first(service->commands); it; it=iter_next(it)) {
cmd = iter_data(it);
row = exp.value.table.length++;
exp.value.table.contents[row] = calloc(exp.value.table.width, sizeof(char*));
exp.value.table.contents[row][1] = level_strings[level];
}
} else if (!strncasecmp(variable, "level", 5)) {
- cmd = opserv_get_command(variable+6);
+ cmd = dict_find(service->commands, variable+6, NULL);
exp.type = HF_STRING;
if (cmd) {
level = cmd->min_opserv_level;
case 2: iflags = MODCMD_REQUIRE_CHANNEL; break;
}
if (flags) {
- return modcmd_register(opserv_module, name, func, min_argc, iflags, "level", buf, "flags", flags, NULL);
+ return modcmd_register(opserv_module, name, func, min_argc, iflags, "level", buf, "flags", flags, "flags", "+oper", NULL);
} else {
- return modcmd_register(opserv_module, name, func, min_argc, iflags, "level", buf, NULL);
+ return modcmd_register(opserv_module, name, func, min_argc, iflags, "level", buf, "flags", "+oper", NULL);
}
}
char buf[MAXLEN];
sprintf(buf, "trace %s", argv[1]);
- if (!(subcmd = opserv_get_command(buf))) {
+ if (!(subcmd = dict_find(cmd->parent->commands, buf, NULL))) {
reply("OSMSG_BAD_ACTION", argv[1]);
return 0;
}
}
sprintf(buf, "%s %s", argv[0], argv[0]);
- if ((subcmd = opserv_get_command(buf))
+ if ((subcmd = dict_find(cmd->parent->commands, buf, NULL))
&& !svccmd_can_invoke(user, cmd->parent->bot, subcmd, channel, SVCCMD_NOISY)) {
return 0;
}
return 0;
}
sprintf(buf, "%s %s", argv[0], argv[0]);
- if ((subcmd = opserv_get_command(buf))
+ if ((subcmd = dict_find(cmd->parent->commands, buf, NULL))
&& !svccmd_can_invoke(user, cmd->parent->bot, subcmd, channel, SVCCMD_NOISY)) {
return 0;
}
name = argv[1];
sprintf(buf, "addalert %s", argv[2]);
- if (!(subcmd = opserv_get_command(buf))) {
+ if (!(subcmd = dict_find(cmd->parent->commands, buf, NULL))) {
reply("OSMSG_UNKNOWN_REACTION", argv[2]);
return 0;
}
}
conf_node = rd->d.object;
str = database_get_data(conf_node, KEY_DEBUG_CHANNEL, RECDB_QSTRING);
- if (str) {
+ if (opserv && str) {
str2 = database_get_data(conf_node, KEY_DEBUG_CHANNEL_MODES, RECDB_QSTRING);
if (!str2)
str2 = "+tinms";
opserv_conf.debug_channel = NULL;
}
str = database_get_data(conf_node, KEY_ALERT_CHANNEL, RECDB_QSTRING);
- if (str) {
+ if (opserv && str) {
str2 = database_get_data(conf_node, KEY_ALERT_CHANNEL_MODES, RECDB_QSTRING);
if (!str2)
str2 = "+tns";
opserv_conf.alert_channel = NULL;
}
str = database_get_data(conf_node, KEY_STAFF_AUTH_CHANNEL, RECDB_QSTRING);
- if (str) {
+ if (opserv && str) {
str2 = database_get_data(conf_node, KEY_STAFF_AUTH_CHANNEL_MODES, RECDB_QSTRING);
if (!str2)
str2 = "+timns";
str = database_get_data(conf_node, KEY_JOIN_FLOOD_MODERATE_THRESH, RECDB_QSTRING);
opserv_conf.join_flood_moderate_threshold = str ? strtoul(str, NULL, 0) : 50;
str = database_get_data(conf_node, KEY_NICK, RECDB_QSTRING);
- if (str)
+ if (opserv && str)
NickChange(opserv, str, 0);
str = database_get_data(conf_node, KEY_CLONE_GLINE_DURATION, RECDB_QSTRING);
opserv_conf.clone_gline_duration = str ? ParseInterval(str) : 3600;
void
init_opserv(const char *nick)
{
- opserv = AddService(nick, "Oper Services");
OS_LOG = log_register_type("OpServ", "file:opserv.log");
+ if (nick) {
+ const char *modes = conf_get_data("services/opserv/modes", RECDB_QSTRING);
+ opserv = AddService(nick, modes ? modes : NULL, "Oper Services", NULL);
+ }
conf_register_reload(opserv_conf_read);
memset(level_strings, 0, sizeof(level_strings));
opserv_define_func("STATS UPLINK", cmd_stats_uplink, 0, 0, 0);
opserv_define_func("STATS UPTIME", cmd_stats_uptime, 0, 0, 0);
opserv_define_func("STATS WARN", cmd_stats_warn, 0, 0, 0);
+#if defined(WITH_MALLOC_SRVX)
+ opserv_define_func("STATS MEMORY", cmd_stats_memory, 0, 0, 0);
+#endif
opserv_define_func("TRACE", cmd_trace, 100, 0, 3);
opserv_define_func("TRACE PRINT", NULL, 0, 0, 0);
opserv_define_func("TRACE COUNT", NULL, 0, 0, 0);
reg_nick_change_func(opserv_alert_check_nick);
reg_del_user_func(opserv_user_cleanup);
reg_new_channel_func(opserv_channel_check);
+ reg_del_channel_func(opserv_channel_delete);
reg_join_func(opserv_join_check);
reg_auth_func(opserv_staff_alert);
opserv_db_init();
saxdb_register("OpServ", opserv_saxdb_read, opserv_saxdb_write);
- opserv_service = service_find(opserv->nick);
+ if (nick)
+ service_register(opserv)->trigger = '?';
reg_exit_func(opserv_db_cleanup);
message_register_table(msgtab);