X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2FClientSocket.c;h=2e2eb1c703fca717a79ab4c87e33f856d7539ef2;hp=db93f9a114236a64b6dc444c66a670ceb058a433;hb=391260f64a1dfb35bf0a55e7044fe1b8d83f2561;hpb=74495e70c2a89dc7dd938c5278cb256bd3820c9e

diff --git a/src/ClientSocket.c b/src/ClientSocket.c
index db93f9a..2e2eb1c 100644
--- a/src/ClientSocket.c
+++ b/src/ClientSocket.c
@@ -185,6 +185,7 @@ int connect_socket(struct ClientSocket *client) {
     
     if(client->flags & SOCKET_FLAG_SSL) {
         ssl_connect(client);
+        client->flags |= SOCKET_FLAG_HAVE_SSL;
     }
     
     //send the IRC Headers
@@ -239,6 +240,7 @@ int connect_socket(struct ClientSocket *client) {
 
     if(client->flags & SOCKET_FLAG_SSL) {
         ssl_connect(client);
+        client->flags |= SOCKET_FLAG_HAVE_SSL;
     }
 
 
@@ -263,7 +265,7 @@ int close_socket(struct ClientSocket *client) {
     if(client == NULL) return 0;
     if((client->flags & SOCKET_FLAG_CONNECTED))
         close(client->sock);
-    if(client->flags & SOCKET_FLAG_SSL)
+    if(client->flags & SOCKET_FLAG_HAVE_SSL)
         ssl_disconnect(client);
     struct ClientSocket *sock, *last_sock = NULL;
     for (sock = sockets->data; sock; sock = sock->next) {
@@ -293,7 +295,7 @@ int close_socket(struct ClientSocket *client) {
 
 int write_socket_force(struct ClientSocket *client, char* msg, int len) {
     printf("[send %d] %s", len, msg);
-    if(!(client->flags & SOCKET_FLAG_SSL) || ssl_write(client, msg, len) == -2) {
+    if(!(client->flags & SOCKET_FLAG_HAVE_SSL) || ssl_write(client, msg, len) == -2) {
         #ifdef WIN32
         send(client->sock, msg, len, 0);
         #else
@@ -333,7 +335,7 @@ void socket_loop(int timeout_seconds) {
     for (sock = sockets->data; sock; sock = sock->next) {
         if((sock->flags & SOCKET_FLAG_CONNECTED) && FD_ISSET(sock->sock, &fds)) {
             if(sock->bufferpos != 0) {
-                if(!(sock->flags & SOCKET_FLAG_SSL) || (bytes = ssl_read(sock, buffer, sizeof(buffer))) == -2) {
+                if(!(sock->flags & SOCKET_FLAG_HAVE_SSL) || (bytes = ssl_read(sock, buffer, sizeof(buffer))) == -2) {
                     #ifdef WIN32
                     bytes = recv(sock->sock, buffer, sizeof(buffer), 0);
                     #else
@@ -348,7 +350,7 @@ void socket_loop(int timeout_seconds) {
                     sock->bufferpos += i;
                 }
             } else {
-                if(!(sock->flags & SOCKET_FLAG_SSL) || (bytes = ssl_read(sock, sock->buffer, sizeof(sock->buffer))) == -2) {
+                if(!(sock->flags & SOCKET_FLAG_HAVE_SSL) || (bytes = ssl_read(sock, sock->buffer, sizeof(sock->buffer))) == -2) {
                     #ifdef WIN32
                     bytes = recv(sock->sock, sock->buffer, sizeof(sock->buffer), 0);
                     #else
@@ -365,7 +367,7 @@ void socket_loop(int timeout_seconds) {
                 if(sock->queue)
                     queue_destroy(sock);
                 close(sock->sock);
-                if(sock->flags & SOCKET_FLAG_SSL)
+                if(sock->flags & SOCKET_FLAG_HAVE_SSL)
                     ssl_disconnect(sock);
             } else {
                 sock->traffic_in += bytes;
@@ -422,7 +424,7 @@ void free_sockets() {
         next = client->next;
         if((client->flags & SOCKET_FLAG_CONNECTED))
             close(client->sock);
-        if(client->flags & SOCKET_FLAG_SSL)
+        if(client->flags & SOCKET_FLAG_HAVE_SSL)
             ssl_disconnect(client);
         if(client->queue)
             queue_destroy(client);