*** VERSION 5.1.0 ***

[NeonServV5.git] / src / ClientSocket.c

diff --git a/src/ClientSocket.c b/src/ClientSocket.c
index f4288f291ec6360aa1e0b532aad62746de386eab..470fa505432a16980d343ac6c5f35b6d0d771f73 100644 (file)
--- a/src/ClientSocket.c
+++ b/src/ClientSocket.c
@@ -1,3 +1,19 @@
+/* ClientSocket.c - NeonServ v5.1
+ * Copyright (C) 2011  Philipp Kreil (pk910)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. 
+ */
 
 #include "ClientSocket.h"
 #include "IRCParser.h"
@@ -33,7 +49,7 @@ struct ClientSocket* create_socket(char *host, int port, char *pass, struct User
     }
     client->host = strdup(host);
     client->port = port;
-    printf("Connect: %s:%d", client->host, client->port);
+    printf("Connect: %s:%d\n", client->host, client->port);
     client->pass = (pass == NULL ? NULL : strdup(pass));
     client->user = user;
     client->flags = 0;
@@ -87,7 +103,7 @@ int connect_socket(struct ClientSocket *client) {
     char sendBuf[512];
     int len;
 
-    if(client->pass) {
+    if(client->pass && strcmp(client->pass, "")) {
         len = sprintf(sendBuf, "PASS :%s\n", client->pass);
         write_socket(client, sendBuf, len);
     }
@@ -178,7 +194,11 @@ int close_socket(struct ClientSocket *client) {
 int write_socket(struct ClientSocket *client, char* msg, int len) {
     if(!(client->flags & SOCKET_FLAG_CONNECTED)) return 0;
     printf("[send %d] %s", len, msg);
+    #ifdef WIN32
+    send(client->sock, msg, len, 0);
+    #else
     write(client->sock, msg, len);
+    #endif
     client->traffic_out += len;
     return 1;
 }
@@ -204,7 +224,11 @@ 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) {
+                #ifdef WIN32
+                bytes = recv(sock->sock, buffer, sizeof(buffer), 0);
+                #else
                 bytes = read(sock->sock, buffer, sizeof(buffer));
+                #endif
                 if(bytes > 0) {
                     for(i = 0; i < bytes; i++) {
                         if(sock->bufferpos + i == BUF_SIZ*2) break; //buffer overflow
@@ -213,7 +237,11 @@ void socket_loop(int timeout_seconds) {
                     sock->bufferpos += i;
                 }
             } else {
+                #ifdef WIN32
+                bytes = recv(sock->sock, sock->buffer, sizeof(sock->buffer), 0);
+                #else
                 bytes = read(sock->sock, sock->buffer, sizeof(sock->buffer));
+                #endif
                 if(bytes > 0)
                     sock->bufferpos = bytes;
             }