moved cmd_move to global.mod and fixed crash in bot_SpamServ.c
authorpk910 <philipp@zoelle1.de>
Thu, 16 Feb 2012 16:21:56 +0000 (17:21 +0100)
committerpk910 <philipp@zoelle1.de>
Thu, 16 Feb 2012 16:21:56 +0000 (17:21 +0100)
Makefile.am
src/modules/NeonServ.mod/cmd_neonserv.c
src/modules/NeonServ.mod/cmd_neonserv.h
src/modules/NeonServ.mod/cmd_neonserv_move.c [deleted file]
src/modules/NeonSpam.mod/bot_NeonSpam.c
src/modules/global.mod/cmd_global.c
src/modules/global.mod/cmd_global.h
src/modules/global.mod/cmd_global_move.c [new file with mode: 0644]

index fc146c77057a45c0f29727ccd06846c8b45c6423..03edbe37c370f4525e693f2a77c97ecf1a881c60 100644 (file)
@@ -48,6 +48,7 @@ libglobalcmd_la_SOURCES = src/modules/global.mod/cmd_global.c \
       src/modules/global.mod/cmd_global_modcmd.c \
       src/modules/global.mod/cmd_global_meminfo.c \
       src/modules/global.mod/cmd_global_extscript.c \
+      src/modules/global.mod/cmd_global_move.c \
       src/modules/global.mod/module.c
 libglobalcmd_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
 libglobalcmd_la_LIBADD = $(MYSQL_LIBS)
@@ -92,7 +93,6 @@ libNeonServ_la_SOURCES = src/modules/NeonServ.mod/bot_NeonServ.c \
       src/modules/NeonServ.mod/cmd_neonserv_kickban.c \
       src/modules/NeonServ.mod/cmd_neonserv_mdeluser.c \
       src/modules/NeonServ.mod/cmd_neonserv_mode.c \
-      src/modules/NeonServ.mod/cmd_neonserv_move.c \
       src/modules/NeonServ.mod/cmd_neonserv_myaccess.c \
       src/modules/NeonServ.mod/cmd_neonserv_op.c \
       src/modules/NeonServ.mod/cmd_neonserv_opall.c \
index fedd4bd5d97978602ee3f8f667de026197b37723..7bb3539a8e57f4fed674e1d02558a826a1ff14e0 100644 (file)
@@ -87,7 +87,6 @@ void register_commands() {
     OPER_COMMAND("recover",      neonserv_cmd_recover,   1,     200,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG);
     OPER_COMMAND("csuspend",     neonserv_cmd_csuspend,  1,     100,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG);
     OPER_COMMAND("cunsuspend",   neonserv_cmd_cunsuspend,1,     100,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG);
-    OPER_COMMAND("move",         neonserv_cmd_move,      2,     300,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG);
     OPER_COMMAND("oplog",        neonserv_cmd_oplog,     0,     1,    CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG);
     OPER_COMMAND("search",       neonserv_cmd_search,    1,     400,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
     OPER_COMMAND("addrank",      neonserv_cmd_addrank,   1,     1000, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG);
index 96b340c84438f7b89948b76ba86af6d20eead509..13fff4df8ad6d8070a7107ff6cd2076e86f57bad 100644 (file)
@@ -79,7 +79,6 @@ CMD_BIND(neonserv_cmd_kickban);
 CMD_BIND(neonserv_cmd_listrank);
 CMD_BIND(neonserv_cmd_mdeluser);
 CMD_BIND(neonserv_cmd_mode);
-CMD_BIND(neonserv_cmd_move);
 CMD_BIND(neonserv_cmd_myaccess);
 CMD_BIND(neonserv_cmd_nicklist);
 CMD_BIND(neonserv_cmd_noregister);
diff --git a/src/modules/NeonServ.mod/cmd_neonserv_move.c b/src/modules/NeonServ.mod/cmd_neonserv_move.c
deleted file mode 100644 (file)
index fab9e80..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/* cmd_neonserv_move.c - NeonServ v5.4
- * Copyright (C) 2011-2012  Philipp Kreil (pk910)
- * 
- * This program 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 3 of the License, or
- * (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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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, see <http://www.gnu.org/licenses/>. 
- */
-
-#include "cmd_neonserv.h"
-
-/*
-* argv[0] - channel
-* argv[1] - new channel
-*/
-CMD_BIND(neonserv_cmd_move) {
-    MYSQL_RES *res;
-    MYSQL_ROW row;
-    char *channel = argv[0];
-    char *new_channel = argv[1];
-    if(!is_valid_chan(new_channel)) {
-        reply(getTextBot(), user, "NS_INVALID_CHANNEL_NAME", new_channel);
-        return;
-    }
-    if(!stricmp(channel, new_channel)) {
-        reply(getTextBot(), user, "NS_MOVE_SELF");
-        return;
-    }
-    printf_mysql_query("SELECT `channel_id` FROM `bot_channels` LEFT JOIN `channels` ON `channel_id` = `chanid` WHERE `channel_name` = '%s'", escape_string(new_channel));
-    res = mysql_use();
-    if ((row = mysql_fetch_row(res)) != NULL) {
-        reply(getTextBot(), user, "NS_REGISTER_ALREADY", new_channel, client->user->nick);
-        return;
-    }
-    int chanid;
-    printf_mysql_query("SELECT `channel_id` FROM `channels` WHERE `channel_name` = '%s'", escape_string(channel));
-    res = mysql_use();
-    if ((row = mysql_fetch_row(res)) != NULL) {
-        chanid = atoi(row[0]);
-    } else {
-        reply(getTextBot(), user, "NS_UNREGISTER_NOT_REGISTERED", argv[0], client->user->nick);
-        return;
-    }
-    printf_mysql_query("SELECT `botid`, `bot_channels`.`id`, `suspended` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chanid, client->botid);
-    res = mysql_use();
-    if ((row = mysql_fetch_row(res)) == NULL) {
-        reply(getTextBot(), user, "NS_UNREGISTER_NOT_REGISTERED", argv[0], client->user->nick);
-        return;
-    }
-    if(!strcmp(row[2], "1")) {
-        reply(getTextBot(), user, "NS_MOVE_SUSPENDED");
-        return;
-    }
-    int botid = atoi(row[0]);
-    struct ClientSocket *bot;
-    for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
-        if(bot->clientid == botid)
-            break;
-    }
-    if(bot) {
-        putsock(bot, "PART %s :Channel moved to %s.", channel, new_channel);
-        putsock(bot, "JOIN %s", new_channel);
-    }
-    printf_mysql_query("SELECT `channel_id` FROM `channels` WHERE `channel_name` = '%s'", escape_string(new_channel));
-    res = mysql_use();
-    if ((row = mysql_fetch_row(res)) != NULL) {
-        chanid = atoi(row[0]);
-        printf_mysql_query("DELETE FROM `chanusers` WHERE `chanuser_cid` = '%d'", chanid);
-        printf_mysql_query("DELETE FROM `bans` WHERE `ban_channel` = '%d'", chanid);
-        printf_mysql_query("DELETE FROM `events` WHERE `cid` = '%d'", chanid);
-        printf_mysql_query("DELETE FROM `noinvite` WHERE `cid` = '%d'", chanid);
-        printf_mysql_query("DELETE FROM `owner_history` WHERE `owner_history_cid` = '%d'", chanid);
-        printf_mysql_query("DELETE FROM `channels` WHERE `channel_id` = '%d'", chanid);
-    }
-    printf_mysql_query("UPDATE `channels` SET `channel_name` = '%s' WHERE `channel_name` = '%s'", escape_string(new_channel), escape_string(channel));
-    struct ChanNode *channode = getChanByName(channel);
-    if(channode && channode->flags & CHANFLAG_REQUESTED_CHANINFO) {
-        channode->flags &= ~CHANFLAG_CHAN_REGISTERED;
-        channode->channel_id = 0;
-    }
-    reply(getTextBot(), user, "NS_MOVE_DONE", channel, new_channel);
-    logEvent(event);
-}
index 8d349ec8cb8b81757053981ed03b8d0e3d70b5d5..89aeb92be68236a07f30438667c517c56e4855ba 100644 (file)
@@ -234,6 +234,8 @@ int loadNeonSpamSettings(struct ChanNode *chan) {
     MYSQL_RES *res;
     MYSQL_ROW row, defaults = NULL;
     loadChannelSettings(chan);
+    if(!(chan->flags & CHANFLAG_CHAN_REGISTERED))
+        return 0;
     printf_mysql_query("SELECT `channel_scanner`, `channel_spam_limit`, `channel_spam_except`, `channel_flood_limit`, `channel_flood_time`, `channel_flood_except`, `channel_join_limit`, `channel_join_time`, `channel_join_except`, `channel_caps_percent`, `channel_caps_except`, `channel_digit_percent`, `channel_digit_except` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
     res = mysql_use();
     row = mysql_fetch_row(res);
index dff78d322a2cad29b697052763fbd30b55fa1918..9668746bf1379dc0b2cdc5d321a0ff37e6f0e7bb 100644 (file)
@@ -37,6 +37,7 @@ void register_commands() {
     //            NAME            FUNCTION            PARAMS  ACCS  FLAGS
     OPER_COMMAND("register",     global_cmd_register,  1,     200,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG);
     OPER_COMMAND("unregister",   global_cmd_unregister,0,     200,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG);
+    OPER_COMMAND("move",         global_cmd_move,      2,     300,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG);
     OPER_COMMAND("say",          global_cmd_say,       2,     600,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG);
     OPER_COMMAND("emote",        global_cmd_emote,     2,     600,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG);
     OPER_COMMAND("notice",       global_cmd_notice,    2,     600,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG);
index 5ac060d5666afb015c70aa5f45d982c10400fa0b..6db037c372f5ac319f38566637664493dd06ce12 100644 (file)
@@ -53,6 +53,7 @@ CMD_BIND(global_cmd_god);
 CMD_BIND(global_cmd_meminfo);
 CMD_BIND(global_cmd_modcmd);
 CMD_BIND(global_cmd_motd);
+CMD_BIND(global_cmd_move);
 CMD_BIND(global_cmd_netinfo);
 CMD_BIND(global_cmd_notice);
 CMD_BIND(global_cmd_raw);
diff --git a/src/modules/global.mod/cmd_global_move.c b/src/modules/global.mod/cmd_global_move.c
new file mode 100644 (file)
index 0000000..3a1d50f
--- /dev/null
@@ -0,0 +1,97 @@
+/* cmd_global_move.c - NeonServ v5.4
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
+ * 
+ * This program 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 3 of the License, or
+ * (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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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, see <http://www.gnu.org/licenses/>. 
+ */
+
+#include "cmd_global.h"
+
+/*
+* argv[0] - channel
+* argv[1] - new channel
+*/
+CMD_BIND(global_cmd_move) {
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    char *channel = argv[0];
+    char *new_channel = argv[1];
+    if(!is_valid_chan(new_channel)) {
+        reply(getTextBot(), user, "NS_INVALID_CHANNEL_NAME", new_channel);
+        return;
+    }
+    if(!stricmp(channel, new_channel)) {
+        reply(getTextBot(), user, "NS_MOVE_SELF");
+        return;
+    }
+    printf_mysql_query("SELECT `channel_id` FROM `bot_channels` LEFT JOIN `channels` ON `channel_id` = `chanid` WHERE `channel_name` = '%s'", escape_string(new_channel));
+    res = mysql_use();
+    if ((row = mysql_fetch_row(res)) != NULL) {
+        reply(getTextBot(), user, "NS_REGISTER_ALREADY", new_channel, client->user->nick);
+        return;
+    }
+    int chanid;
+    printf_mysql_query("SELECT `channel_id` FROM `channels` WHERE `channel_name` = '%s'", escape_string(channel));
+    res = mysql_use();
+    if ((row = mysql_fetch_row(res)) != NULL) {
+        chanid = atoi(row[0]);
+    } else {
+        reply(getTextBot(), user, "NS_UNREGISTER_NOT_REGISTERED", argv[0], client->user->nick);
+        return;
+    }
+    printf_mysql_query("SELECT `botid`, `bot_channels`.`id`, `suspended` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chanid, client->botid);
+    res = mysql_use();
+    if ((row = mysql_fetch_row(res)) == NULL) {
+        reply(getTextBot(), user, "NS_UNREGISTER_NOT_REGISTERED", argv[0], client->user->nick);
+        return;
+    }
+    if(!strcmp(row[2], "1")) {
+        reply(getTextBot(), user, "NS_MOVE_SUSPENDED");
+        return;
+    }
+    int botid = atoi(row[0]);
+    struct ClientSocket *bot;
+    struct ChanNode *channode = getChanByName(channel);
+    if(channode) {
+        for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
+            if(isUserOnChan(bot->user, channode)) {
+                putsock(bot, "PART %s", channel);
+                putsock(bot, "JOIN %s", new_channel);
+            }
+        }
+    } else {
+        for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
+            if(bot->clientid == botid)
+                putsock(bot, "JOIN %s", new_channel);
+        }
+    }
+    printf_mysql_query("SELECT `channel_id` FROM `channels` WHERE `channel_name` = '%s'", escape_string(new_channel));
+    res = mysql_use();
+    if ((row = mysql_fetch_row(res)) != NULL) {
+        chanid = atoi(row[0]);
+        printf_mysql_query("DELETE FROM `chanusers` WHERE `chanuser_cid` = '%d'", chanid);
+        printf_mysql_query("DELETE FROM `bans` WHERE `ban_channel` = '%d'", chanid);
+        printf_mysql_query("DELETE FROM `events` WHERE `cid` = '%d'", chanid);
+        printf_mysql_query("DELETE FROM `noinvite` WHERE `cid` = '%d'", chanid);
+        printf_mysql_query("DELETE FROM `owner_history` WHERE `owner_history_cid` = '%d'", chanid);
+        printf_mysql_query("DELETE FROM `channels` WHERE `channel_id` = '%d'", chanid);
+    }
+    printf_mysql_query("UPDATE `channels` SET `channel_name` = '%s' WHERE `channel_name` = '%s'", escape_string(new_channel), escape_string(channel));
+    
+    if(channode && channode->flags & CHANFLAG_REQUESTED_CHANINFO) {
+        channode->flags &= ~CHANFLAG_CHAN_REGISTERED;
+        channode->channel_id = 0;
+    }
+    reply(getTextBot(), user, "NS_MOVE_DONE", channel, new_channel);
+    logEvent(event);
+}