X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FQServer.c;h=2d77a6b2e92c2fcb837d5597141436d8c59db03d;hb=78e040af3fcc36ab684611c0f98b4381ff420878;hp=f8a98a11c04bf0022f7cc5f50624671bdf094c56;hpb=55fb605f33a031c93f6bd4c72b72ab00d571c26d;p=NeonServV5.git

diff --git a/src/QServer.c b/src/QServer.c
index f8a98a1..2d77a6b 100644
--- a/src/QServer.c
+++ b/src/QServer.c
@@ -1,4 +1,4 @@
-/* QServer.c - NeonServ v5.3
+/* QServer.c - NeonServ v5.5
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -73,12 +73,13 @@ static int qserver_write(struct QServerClient *client, char* msg, int len) {
     if (!(client && !(client->flags & QSERVER_FLAG_DISCONNECT))) return 0;
     if(!len)
         len = strlen(msg);
+	int ret = 1;
     #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
-    return 1;
+    return ret;
 }
 
 static void qserver_put(struct QServerClient *client, const char *text, ...) {
@@ -205,7 +206,11 @@ void qserver_loop() {
     if(FD_ISSET(server_sockfd, &fds)) {
         //new connection
         struct sockaddr_in cli_addr;
+        #ifdef WIN32
+        int clilen;
+        #else
         socklen_t clilen;
+        #endif
         client = malloc(sizeof(*client));
         clilen = sizeof(cli_addr);
         client->sock = accept(server_sockfd, (struct sockaddr *) &cli_addr, &clilen);
@@ -291,7 +296,7 @@ static void qserver_parse_U(struct QServerClient *client, char **argv, int argc)
     }
     client->references++;
     client->flags |= QSERVER_FLAG_IN_USE;
-    get_userauth(cuser, qserver_parse_U_async, client);
+    get_userauth(cuser, 0, qserver_parse_U_async, client);
 }
 
 static USERAUTH_CALLBACK(qserver_parse_U_async) {
@@ -348,7 +353,7 @@ static void qserver_parse_ACU(struct QServerClient *client, char **argv, int arg
     if(argc > 1 && !stricmp(argv[1], "1")) {
         client->references++;
         client->flags |= QSERVER_FLAG_IN_USE;
-        get_userlist_if_invisible(chan, qserver_parse_ACU_async, client);
+        get_userlist_if_invisible(chan, 0, qserver_parse_ACU_async, client);
         return;
     }
     char tmpStr[6];