fixed compilation without threads and fixed some warnings

[NeonServV5.git] / src / ClientSocket.c

diff --git a/src/ClientSocket.c b/src/ClientSocket.c
index eab5204dfc720fd08395bba0457750fe2b375062..6cf36e2d187a90e77186452d7fccc1f3c11cc3fa 100644 (file)
--- a/src/ClientSocket.c
+++ b/src/ClientSocket.c
@@ -1,4 +1,4 @@
-/* ClientSocket.c - NeonServ v5.3
+/* ClientSocket.c - NeonServ v5.4
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -74,6 +74,7 @@ struct ClientSocket* create_socket(char *host, int port, char *bindto, char *pas
     client->ident = strdup(ident);
     client->realname = strdup(realname);
     client->user = NULL;
+    client->network_name = NULL;
     client->flags = 0;
     client->bufferpos = 0;
     client->traffic_in = 0;
@@ -344,6 +345,8 @@ static void destroy_socket(struct ClientSocket *client, int free_socket) {
             free(client->bind);
         if(client->pass)
             free(client->pass);
+        if(client->network_name)
+            free(client->network_name);
         free(client);
     } else if(client->flags & SOCKET_FLAG_FAST_JUMP) {
         client->flags &= ~SOCKET_FLAG_FAST_JUMP;
@@ -359,16 +362,17 @@ int write_socket_force(struct ClientSocket *client, char* msg, int len) {
     #else
     putlog(LOGLEVEL_RAW, "[send %d] %s", len, msg);
     #endif
+       int ret = 1;
     if(!(client->flags & SOCKET_FLAG_HAVE_SSL) || ssl_write(client, msg, len) == -2) {
         #ifdef WIN32
-        send(client->sock, msg, len, 0);
+        ret = send(client->sock, msg, len, 0);
         #else
-        write(client->sock, msg, len);
+        ret = write(client->sock, msg, len);
         #endif
     }
     client->traffic_out += len;
     DESYNCHRONIZE(synchronized);
-    return 1;
+    return ret;
 }
 
 int write_socket(struct ClientSocket *client, char* msg, int len) {
@@ -580,6 +584,8 @@ void free_sockets() {
             free(client->bind);
         if(client->pass)
             free(client->pass);
+        if(client->network_name)
+            free(client->network_name);
         free(client);
     }
     free(sockets);