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

diff --git a/src/ClientSocket.c b/src/ClientSocket.c
index 5fa795e..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;
@@ -77,6 +78,7 @@ struct ClientSocket* create_socket(char *host, int port, char *bindto, char *pas
     return client;
 }
 
+#ifndef WIN32
 int connect_socket(struct ClientSocket *client) {
     if((client->flags & SOCKET_FLAG_CONNECTED)) return 1;
     int sock;
@@ -184,7 +186,9 @@ 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];
@@ -201,12 +205,74 @@ int connect_socket(struct ClientSocket *client) {
     
     return 1;
 }
+#else
+int connect_socket(struct ClientSocket *client) {
+    if((client->flags & SOCKET_FLAG_CONNECTED)) return 1;
+    struct hostent *host;
+    struct sockaddr_in addr;
+    int sock;
+    addr.sin_addr.s_addr = inet_addr(client->host);
+    if (addr.sin_addr.s_addr == INADDR_NONE) {
+        host = gethostbyname(client->host);
+        if(!host) {
+            return SOCKET_ERROR;
+        }
+        memcpy(&(addr.sin_addr), host->h_addr_list[0], 4);
+    }
+    sock = socket(PF_INET, SOCK_STREAM, 0);
+    if (sock == -1)
+    {
+        perror("socket() failed");
+        return 0;
+    }
+
+    addr.sin_port = htons(client->port);
+    addr.sin_family = AF_INET;
+
+    if (connect(sock, (struct sockaddr*)&addr, sizeof(addr)) == -1)
+    {
+        perror("connect() failed");
+        return 0;
+    }
+
+    client->sock = sock;
+    client->flags |= SOCKET_FLAG_CONNECTED | SOCKET_FLAG_RECONNECT;
+    client->connection_time = time(0);
+
+
+    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];
+    int len;
+
+    if(client->pass && strcmp(client->pass, "")) {
+        len = sprintf(sendBuf, "PASS :%s\n", client->pass);
+        write_socket(client, sendBuf, len);
+    }
+    len = sprintf(sendBuf, "USER %s 0 0 :%s\n", client->ident, client->realname);
+    write_socket(client, sendBuf, len);
+    len = sprintf(sendBuf, "NICK %s\n", client->nick);
+    write_socket(client, sendBuf, len);
+
+    return 1;
+}
+#endif
 
 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);
-    if(client->flags & SOCKET_FLAG_SSL)
+        bot_disconnect(client);
+    }
+    if(client->flags & SOCKET_FLAG_HAVE_SSL)
         ssl_disconnect(client);
     struct ClientSocket *sock, *last_sock = NULL;
     for (sock = sockets->data; sock; sock = sock->next) {
@@ -234,9 +300,30 @@ 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_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
@@ -276,7 +363,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
@@ -291,7 +378,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
@@ -308,8 +395,12 @@ 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);
+                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);
@@ -365,7 +456,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);