Add slab allocator; reduce delta with srvx-gs.

[srvx.git] / src / modcmd.c

diff --git a/src/modcmd.c b/src/modcmd.c
index 027c06f94acf2a70424b5c3f1c91f8081e0e1e3b..2ae4db59e59005b6c8149b079ffed66ce3aa8802 100644 (file)
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -145,18 +145,18 @@ static struct modcmd_flag {
     { "channel", MODCMD_REQUIRE_CHANNEL },
     { "chanuser", MODCMD_REQUIRE_CHANUSER },
     { "disabled", MODCMD_DISABLED },
+    { "helping", MODCMD_REQUIRE_HELPING },
     { "ignore_csuspend", MODCMD_IGNORE_CSUSPEND },
     { "joinable", MODCMD_REQUIRE_JOINABLE },
     { "keepbound", MODCMD_KEEP_BOUND },
     { "loghostmask", MODCMD_LOG_HOSTMASK },
-    { "nolog", MODCMD_NO_LOG },
     { "networkhelper", MODCMD_REQUIRE_NETWORK_HELPER },
     { "never_csuspend", MODCMD_NEVER_CSUSPEND },
+    { "nolog", MODCMD_NO_LOG },
     { "oper", MODCMD_REQUIRE_OPER },
     { "qualified", MODCMD_REQUIRE_QUALIFIED },
     { "regchan", MODCMD_REQUIRE_REGCHAN },
     { "supporthelper", MODCMD_REQUIRE_SUPPORT_HELPER },
-    { "helping", MODCMD_REQUIRE_HELPING },
     { "toy", MODCMD_TOY },
     { NULL, 0 }
 };
@@ -545,7 +545,8 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm
         rflags |= ACTION_STAFF;
     }
     if (cmd->min_opserv_level > 0) {
-        if (!oper_has_access(user, bot, cmd->min_opserv_level, !(options & SVCCMD_NOISY))) return 0;
+        if (!oper_has_access(user, bot, cmd->min_opserv_level, !(options & SVCCMD_NOISY)))
+            return 0;
         rflags |= ACTION_STAFF;
     }
     if (cmd->req_account_flags || cmd->deny_account_flags) {
@@ -566,7 +567,7 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm
     /* If it's an override, return a special value. */
     if ((flags & MODCMD_REQUIRE_CHANUSER)
         && (options & SVCCMD_NOISY)
-        && (uData->access > 500)
+        && (!uData || (uData->access > 500))
         && (!(uData = _GetChannelUser(channel->channel_info, user->handle_info, 0, 0))
             || uData->access < cmd->min_channel_access)
         && !(flags & (MODCMD_REQUIRE_STAFF|MODCMD_REQUIRE_HELPING))) {
@@ -852,10 +853,10 @@ modcmd_privmsg(struct userNode *user, struct userNode *bot, char *text, int serv
             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);
+                snprintf(response, sizeof(response), "\x01PING %s\x01", term);
                 irc_notice_user(bot, user, response);
             } else {
-                irc_notice_user(bot,user, "\x01PONG\x01");
+                irc_notice_user(bot,user, "\x01PING\x01");
             }
         } else if (!irccasecmp(text, "TIME")) {
             struct tm tm;
@@ -1464,7 +1465,7 @@ static MODCMD_FUNC(cmd_god) {
 }
 
 static MODCMD_FUNC(cmd_joiner) {
-    char cmdname[80];
+    char cmdname[MAXLEN];
 
     if (argc < 2) {
         int len = sprintf(cmdname, "%s ", cmd->name);
@@ -1670,12 +1671,12 @@ static MODCMD_FUNC(cmd_showcommands) {
             if (flags & MODCMD_REQUIRE_HELPING)
                 access = "helping";
             else if (flags & MODCMD_REQUIRE_STAFF) {
-                switch (flags & MODCMD_REQUIRE_STAFF) {
-                case MODCMD_REQUIRE_OPER: access = "oper"; break;
-                case MODCMD_REQUIRE_OPER | MODCMD_REQUIRE_NETWORK_HELPER:
-                case MODCMD_REQUIRE_NETWORK_HELPER: access = "net.helper"; break;
-                default: access = "staff"; break;
-                }
+                if (flags & MODCMD_REQUIRE_OPER)
+                    access = "oper";
+                else if (flags & MODCMD_REQUIRE_NETWORK_HELPER)
+                    access = "net.helper";
+                else
+                    access = "staff";
             } else
                 access = strtab(svccmd->min_channel_access);
             tbl.contents[ii+1][1+show_opserv_level] = access;
@@ -1730,7 +1731,7 @@ static MODCMD_FUNC(cmd_service_add) {
         reply("MCMSG_ALREADY_SERVICE", bot->nick);
         return 0;
     }
-    bot = AddService(nick, desc, hostname);
+    bot = AddService(nick, NULL, desc, hostname);
     service_register(bot);
     reply("MCMSG_NEW_SERVICE", bot->nick);
     return 1;
@@ -2024,7 +2025,7 @@ modcmd_expand(const char *variable) {
 }
 
 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)) {
@@ -2038,14 +2039,18 @@ modcmd_load_bots(struct dict *db) {
             continue;
         }
         nick = database_get_data(rd->d.object, "nick", RECDB_QSTRING);
-        if (!nick)
-            continue;
+        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);
         hostname = database_get_data(rd->d.object, "hostname", RECDB_QSTRING);
         if (desc) {
             if (!svc)
-                svc = service_register(AddService(nick, desc, hostname));
+                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);
@@ -2060,7 +2065,7 @@ modcmd_load_bots(struct dict *db) {
 
 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
@@ -2204,7 +2209,7 @@ modcmd_saxdb_read(struct dict *db) {
     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.");