X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fbot_DummyServ.c;h=b6605d5fba486a001d531a76e7f994d210393b0b;hb=f80fa658483884289cf2585790b1cf64ef722197;hp=3ebe2676525234972df8918825f385a5c14bad8d;hpb=ffc462dec2b405f14d7b13d37e17b95ea6fdf2f5;p=NeonServV5.git

diff --git a/src/bot_DummyServ.c b/src/bot_DummyServ.c
index 3ebe267..b6605d5 100644
--- a/src/bot_DummyServ.c
+++ b/src/bot_DummyServ.c
@@ -39,6 +39,7 @@
 #include "cmd_neonspam.h"
 
 #define BOTID 3
+#define BOTALIAS "DummyServ"
 
 static void dummyserv_bot_ready(struct ClientSocket *client) {
     MYSQL_RES *res;
@@ -58,28 +59,24 @@ static void dummyserv_bot_ready(struct ClientSocket *client) {
     }
 }
 
-static void dummyserv_trigger_callback(struct ChanNode *chan, char *trigger) {
+static void dummyserv_trigger_callback(int clientid, struct ChanNode *chan, char *trigger) {
     //this bot doesn't have a trigger
     strcpy(trigger, "");
 }
 
 static void start_bots() {
-    struct UserNode *user;
     struct ClientSocket *client;
     MYSQL_RES *res, *res2;
     MYSQL_ROW row;
     
-    printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
+    printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl`, `bind` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
     res = mysql_use();
     
     while ((row = mysql_fetch_row(res)) != NULL) {
-        user = addUser(row[0]);
-        strcpy(user->ident, row[1]);
-        strcpy(user->realname, row[2]);
-        user->flags |= USERFLAG_ISBOT;
-        client = create_socket(row[3], atoi(row[4]), row[5], user);
+        client = create_socket(row[3], atoi(row[4]), row[10], row[5], row[0], row[1], row[2]);
         client->flags |= (strcmp(row[6], "0") ? SOCKET_FLAG_PREFERRED : 0);
         client->flags |= (strcmp(row[8], "0") ? SOCKET_FLAG_USE_QUEUE : 0);
+        client->flags |= (strcmp(row[9], "0") ? SOCKET_FLAG_SSL : 0);
         client->botid = BOTID;
         client->clientid = atoi(row[7]);
         connect_socket(client);
@@ -105,6 +102,7 @@ static void start_bots() {
 
 void init_DummyServ() {
     
+    set_bot_alias(BOTID, BOTALIAS);
     start_bots();
     
     //register events
@@ -122,3 +120,4 @@ void free_DummyServ() {
 }
 
 #undef BOTID
+#undef BOTALIAS