X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ClientSocket.c;h=78467a1c94b5d1d725d216ed4f57e261d6a4706e;hb=84fb65ee885f3f747b0a07eb07999395c0ae22f9;hp=345a58ae1ebcf136f3da385902e6b471f13fbc52;hpb=6fa73a6250ed284c16f2b775e46c350a0556c182;p=NeonServV5.git

diff --git a/ClientSocket.c b/ClientSocket.c
index 345a58a..78467a1 100644
--- a/ClientSocket.c
+++ b/ClientSocket.c
@@ -1,6 +1,7 @@
 
 #include "ClientSocket.h"
 #include "IRCParser.h"
+#include "UserNode.h"
 
 struct socket_list {
     struct ClientSocket *data;
@@ -11,7 +12,7 @@ struct socket_list {
 static struct socket_list *sockets = NULL;
 static char buffer[BUF_SIZ];
 
-static void init() {
+static void init_sockets() {
     sockets = malloc(sizeof(*sockets));
     if (!sockets)
     {
@@ -23,7 +24,7 @@ static void init() {
 }
 
 struct ClientSocket* create_socket(char *host, int port, char *pass, struct UserNode *user) {
-    if(sockets == NULL) init();
+    if(sockets == NULL) init_sockets();
     struct ClientSocket *client = malloc(sizeof(*client));
     if (!client)
     {
@@ -36,6 +37,8 @@ struct ClientSocket* create_socket(char *host, int port, char *pass, struct User
     client->user = user;
     client->flags = 0;
     client->bufferpos = 0;
+	client->botid = 0;
+    client->clientid = 0;
     client->next = sockets->data;
     sockets->data = client;
     return client;
@@ -150,13 +153,13 @@ void socket_loop(int timeout_seconds) {
                 }
             } else {
                 bytes = read(sock->sock, sock->buffer, sizeof(sock->buffer));
-                sock->buffer[bytes] = 0; //debug only
                 if(bytes > 0)
                     sock->bufferpos = bytes;
             }
             if(bytes <= 0) {
                 //error
                 sock->flags &= ~(SOCKET_FLAG_CONNECTED | SOCKET_FLAG_READY);
+                bot_disconnect(sock);
             } else {
                 int used = parse_lines(sock, sock->buffer, sock->bufferpos);
                 if(used == sock->bufferpos + 1) {
@@ -177,16 +180,40 @@ void
 putsock(struct ClientSocket *client, const char *text, ...)
 {
     va_list arg_list;
-    char buffer[MAXLEN];
+    char sendBuf[MAXLEN];
     int pos;
     if (!(client->flags & SOCKET_FLAG_CONNECTED)) return;
-    buffer[0] = '\0';
+    sendBuf[0] = '\0';
     va_start(arg_list, text);
-    pos = vsnprintf(buffer, MAXLEN - 2, text, arg_list);
+    pos = vsnprintf(sendBuf, MAXLEN - 2, text, arg_list);
     va_end(arg_list);
     if (pos < 0 || pos > (MAXLEN - 2)) pos = MAXLEN - 2;
-    buffer[pos] = '\n';
-    buffer[pos+1] = '0';
-    write_socket(client, buffer, pos+1);
+    sendBuf[pos] = '\n';
+    sendBuf[pos+1] = '\0';
+    write_socket(client, sendBuf, pos+1);
 }
 
+struct ClientSocket* getBots(int flags, struct ClientSocket* last_bot) {
+    struct ClientSocket *sock = (last_bot ? last_bot->next : sockets->data);
+    if(sock == NULL) return NULL;
+    for (; sock; sock = sock->next) {
+        if((sock->flags & flags) == flags)
+            return sock;
+    }
+    return NULL;
+}
+
+void free_sockets() {
+    if(!sockets) return;
+    struct ClientSocket *client, *next;
+    for (client = sockets->data; client; client = next) {
+        next = client->next;
+        if((client->flags & SOCKET_FLAG_CONNECTED))
+            close(client->sock);
+        free(client->host);
+        free(client->pass);
+        free(client);
+    }
+    free(sockets);
+    sockets = NULL;
+}