Author: ai0867
Date: Mon Mar 18 02:37:38 2013
New Revision: 56542

URL: http://svn.gna.org/viewcvs/wesnoth?rev=56542&view=rev
Log:
Change two immediate disconnects to queued disconnects so [error] messages 
actually arrive at the client

Modified:
    trunk/src/server/server.cpp

Modified: trunk/src/server/server.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/server/server.cpp?rev=56542&r1=56541&r2=56542&view=diff
==============================================================================
--- trunk/src/server/server.cpp (original)
+++ trunk/src/server/server.cpp Mon Mar 18 02:37:38 2013
@@ -735,17 +735,17 @@
                                if (!reason.empty()) {
                                        LOG_SERVER << ip << "\trejected banned 
user. Reason: " << reason << "\n";
                                        send_error(sock, "You are banned. 
Reason: " + reason);
-                                       network::disconnect(sock);
+                                       network::queue_disconnect(sock);
                                } else if (ip_exceeds_connection_limit(ip)) {
                                        LOG_SERVER << ip << "\trejected ip due 
to excessive connections\n";
                                        send_error(sock, "Too many connections 
from your IP.");
-                                       network::disconnect(sock);
+                                       network::queue_disconnect(sock);
                                } else {
                                        DBG_SERVER << ip << "\tnew connection 
accepted. (socket: "
                                                << sock << ")\n";
                                        send_doc(version_query_response_, sock);
-                                       not_logged_in_.insert(sock);
                                }
+                               not_logged_in_.insert(sock);
                        }
 
                        static int sample_counter = 0;


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to