Author: suokko
Date: Mon Jun 30 12:43:51 2008
New Revision: 27610
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27610&view=rev
Log:
Fixed server_manager to remove server connection from connection map
Modified:
trunk/src/network.cpp
trunk/src/network.hpp
Modified: trunk/src/network.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/network.cpp?rev=27610&r1=27609&r2=27610&view=diff
==============================================================================
--- trunk/src/network.cpp (original)
+++ trunk/src/network.cpp Mon Jun 30 12:43:51 2008
@@ -273,11 +273,12 @@
network_worker_pool::set_raw_data_only();
}
-server_manager::server_manager(int port, CREATE_SERVER create_server) :
free_(false)
+server_manager::server_manager(int port, CREATE_SERVER create_server) :
free_(false), connection_(0)
{
if(create_server != NO_SERVER && !server_socket) {
try {
- server_socket = get_socket(connect("",port));
+ connection_ = connect("",port);
+ server_socket = get_socket(connection_);
} catch(network::error& e) {
if(create_server == MUST_CREATE_SERVER) {
throw e;
@@ -300,6 +301,7 @@
{
if(free_) {
SDLNet_TCP_Close(server_socket);
+ remove_connection(connection_);
server_socket = 0;
free_ = false;
}
Modified: trunk/src/network.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/network.hpp?rev=27610&r1=27609&r2=27610&view=diff
==============================================================================
--- trunk/src/network.hpp (original)
+++ trunk/src/network.hpp Mon Jun 30 12:43:51 2008
@@ -65,6 +65,9 @@
void set_raw_data_only();
+typedef int connection;
+connection const null_connection = 0;
+
//! A server manager causes listening on a given port
//! to occur for the duration of its lifetime.
struct server_manager {
@@ -83,11 +86,9 @@
private:
bool free_;
-};
-
-typedef int connection;
-
-connection const null_connection = 0;
+ connection connection_;
+};
+
//! The number of peers we are connected to.
size_t nconnections();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
