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

diff --git a/src/ClientSocket.c b/src/ClientSocket.c
index 5fa795e..2e2eb1c 100644
--- a/src/ClientSocket.c
+++ b/src/ClientSocket.c
@@ -77,6 +77,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,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
@@ -201,12 +203,69 @@ 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;
+    }
+
+
+    //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))
         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) {
@@ -236,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
@@ -276,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
@@ -291,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
@@ -308,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;
@@ -365,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);