X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2FClientSocket.c;h=9b44e2064cffcfd5ece05e43b4efd1304d104f4f;hp=2e2eb1c703fca717a79ab4c87e33f856d7539ef2;hb=6927fcd82e211ff0561ae50e0b9acebedbbe789a;hpb=826eb241e5d704f750bf4985277be1ed59bc024d

diff --git a/src/ClientSocket.c b/src/ClientSocket.c
index 2e2eb1c..9b44e20 100644
--- a/src/ClientSocket.c
+++ b/src/ClientSocket.c
@@ -23,6 +23,7 @@
 #include "HandleInfoHandler.h"
 #include "ssl.h"
 #include "ConfigParser.h"
+#include "version.h"
 
 struct socket_list {
     struct ClientSocket *data;
@@ -186,7 +187,8 @@ int connect_socket(struct ClientSocket *client) {
     if(client->flags & SOCKET_FLAG_SSL) {
         ssl_connect(client);
         client->flags |= SOCKET_FLAG_HAVE_SSL;
-    }
+    } else
+        client->flags &= ~SOCKET_FLAG_HAVE_SSL;
     
     //send the IRC Headers
     char sendBuf[512];
@@ -241,8 +243,8 @@ int connect_socket(struct ClientSocket *client) {
     if(client->flags & SOCKET_FLAG_SSL) {
         ssl_connect(client);
         client->flags |= SOCKET_FLAG_HAVE_SSL;
-    }
-
+    } else
+        client->flags &= ~SOCKET_FLAG_HAVE_SSL;
 
     //send the IRC Headers
     char sendBuf[512];
@@ -263,8 +265,13 @@ int connect_socket(struct ClientSocket *client) {
 
 int close_socket(struct ClientSocket *client) {
     if(client == NULL) return 0;
-    if((client->flags & SOCKET_FLAG_CONNECTED))
+    if((client->flags & SOCKET_FLAG_CONNECTED)) {
+        char quitbuf[MAXLEN];
+        int quitlen = sprintf(quitbuf, "QUIT :[NeonServ %s.%d] disconnect requested.\n", NEONSERV_VERSION, patchlevel);
+        write_socket_force(client, quitbuf, quitlen);
         close(client->sock);
+        bot_disconnect(client);
+    }
     if(client->flags & SOCKET_FLAG_HAVE_SSL)
         ssl_disconnect(client);
     struct ClientSocket *sock, *last_sock = NULL;
@@ -293,6 +300,27 @@ int close_socket(struct ClientSocket *client) {
     return 1;
 }
 
+int disconnect_socket(struct ClientSocket *client) {
+    if(client == NULL) return 0;
+    if((client->flags & SOCKET_FLAG_CONNECTED)) {
+        char quitbuf[MAXLEN];
+        int quitlen = sprintf(quitbuf, "QUIT :[NeonServ %s.%d] disconnect requested.\n", NEONSERV_VERSION, patchlevel);
+        write_socket_force(client, quitbuf, quitlen);
+        close(client->sock);
+        bot_disconnect(client);
+    }
+    if(client->flags & SOCKET_FLAG_HAVE_SSL)
+        ssl_disconnect(client);
+    if(client->queue)
+        queue_destroy(client);
+    if(client->whoqueue_first)
+        clear_whoqueue(client);
+    if(client->handleinfo_first)
+        clear_handleinfoqueue(client);
+    client->flags &= ~(SOCKET_FLAG_CONNECTED | SOCKET_FLAG_READY | SOCKET_FLAG_RECONNECT);
+    return 1;
+}
+
 int write_socket_force(struct ClientSocket *client, char* msg, int len) {
     printf("[send %d] %s", len, msg);
     if(!(client->flags & SOCKET_FLAG_HAVE_SSL) || ssl_write(client, msg, len) == -2) {
@@ -369,6 +397,10 @@ void socket_loop(int timeout_seconds) {
                 close(sock->sock);
                 if(sock->flags & SOCKET_FLAG_HAVE_SSL)
                     ssl_disconnect(sock);
+                if(sock->whoqueue_first)
+                    clear_whoqueue(sock);
+                if(sock->handleinfo_first)
+                    clear_handleinfoqueue(sock);
             } else {
                 sock->traffic_in += bytes;
                 int used = parse_lines(sock, sock->buffer, sock->bufferpos);