WebSVN – HomeAutomation – Diff – /trunk/PcSoftware/Atom1.5/src/net/Manager.cpp


/*
 *
 *  Copyright (C) 2010  Mattias Runge
 *
 *  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 2 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, write to the Free Software Foundation, Inc.,
 *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 *
 */
 
#include "Manager.h"
 
#include <iostream>
 
#include <boost/lexical_cast.hpp>
#include <boost/bind.hpp>
#include <boost/cast.hpp>
 
namespace atom {
namespace net {
 
Manager::Pointer Manager::instance_ = Manager::Pointer(new Manager());
   
Manager::Manager() : io_service_work_(io_service_)
{
    boost::thread thread(boost::bind(&boost::asio::io_service::run, &this->io_service_));
    this->thread_ = thread.move();
}
 
Manager::~Manager()
{
    this->clients_.clear();
   
    this->thread_.interrupt();
    this->thread_.join();
}
 
Manager::Pointer Manager::Instance()
{
    return Manager::instance_;
}
 
void Manager::Delete()
{
    Manager::instance_.reset();
}
 
void Manager::ConnectSlots(const SignalOnNewState::slot_type& slot_on_new_state, const SignalOnNewData::slot_type& slot_on_new_data)
{
    this->signal_on_new_state_.connect(slot_on_new_state);
    this->signal_on_new_data_.connect(slot_on_new_data);
}
 
void Manager::SlotOnNewState(ClientId client_id, ServerId server_id, ClientState client_state)
{
    if (client_state == CLIENT_STATE_DISCONNECTED)
    {
 
        this->clients_.erase(client_id);
 
    }
    else if (client_state == CLIENT_STATE_ACCEPTED)
    {
 
        ClientList::iterator it = this->clients_.find(client_id);
       
        if (it != this->clients_.end())
        {
            TcpClient::Pointer client = TcpClient::Pointer(new TcpClient(this->io_service_, this->GetFreeClientId(), it->second->GetServerId()));
           
            client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),
                                 Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));
           
            client->Accept(boost::polymorphic_downcast<TcpClient*>(it->second.get())->ReleaseAcceptor());
           
            this->clients_[client->GetId()] = client;
 
 
           
            this->signal_on_new_state_(client_id, server_id, CLIENT_STATE_CONNECTED);
            return;
        }
        else
        {
 
            throw std::runtime_error("Accepted unknown client!");
        }
    }
   
    this->signal_on_new_state_(client_id, server_id, client_state);
}
 
void Manager::SlotOnNewData(ClientId client_id, ServerId server_id, type::Byteset data)
{
    this->signal_on_new_data_(client_id, server_id, data);
}
 
ServerId Manager::GetFreeServerId()
{
    ServerId server_id = 1;
   
    for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)
    {
        if (it->second->GetServerId() != server_id)
        {
            return server_id;
        }
       
        server_id++;
    }
   
    return server_id;
}
 
ClientId Manager::GetFreeClientId()
{
    ClientId client_id = 1;
   
    while (this->clients_.find(client_id) != this->clients_.end())
    {
        client_id++;
    }
   
    return client_id;
}
 
ServerId Manager::StartServer(Protocol protocol, unsigned int port)
{
    if (protocol != PROTOCOL_TCP)
    {
        throw std::runtime_error("Can not start server for the Serial or UDP protocol!");
        return 0;
    }
 
 
   
    TcpClient::Pointer client = TcpClient::Pointer(new TcpClient(this->io_service_, this->GetFreeClientId(), this->GetFreeServerId()));
   
    client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),
                         Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));
   
    TcpClient::AcceptorPointer acceptor = TcpClient::AcceptorPointer(new boost::asio::ip::tcp::acceptor(this->io_service_, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port)));    
 
    client->Accept(acceptor);
   
    this->clients_[client->GetId()] = client;
 
 
   
    return client->GetServerId();
}
 
ClientId Manager::Connect(Protocol protocol, std::string address, unsigned int port_or_baud)
{
    Client::Pointer client;
 
 
   
    switch (protocol)
    {
        case PROTOCOL_TCP:
        {
            client = Client::Pointer(new TcpClient(this->io_service_, this->GetFreeClientId(), 0));
            break;
        }
        case PROTOCOL_UDP:
        {
            client = Client::Pointer(new UdpClient(this->io_service_, this->GetFreeClientId(), 0));
            break;
        }
        case PROTOCOL_SERIAL:
        {
            client = Client::Pointer(new SerialClient(this->io_service_, this->GetFreeClientId(), 0));
            break;
        }
        default:
        {
 
            throw std::runtime_error("Invalid protocol specified!");
            return 0;
        }
    }
   
    client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),
                         Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));
   
    try
    {
        client->Connect(address, port_or_baud);
    }
    catch (std::exception& e)
    {
        throw std::runtime_error(e.what());
 
    }
   
    this->clients_[client->GetId()] = client;
   
 
 
    return client->GetId();
}
 
void Manager::SendToAll(ServerId server_id, type::Byteset data)
{
    this->io_service_.post(boost::bind(&Manager::SendToAllHandler, this, server_id, data));
}
 
void Manager::SendTo(ClientId client_id, type::Byteset data)
{
    this->io_service_.post(boost::bind(&Manager::SendToHandler, this, client_id, data));
}
 
void Manager::StopServer(ServerId server_id)
{
    this->io_service_.post(boost::bind(&Manager::StopServerHandler, this, server_id));
}
 
void Manager::Disconnect(ClientId client_id)
{
    this->io_service_.post(boost::bind(&Manager::DisconnectHandler, this, client_id));
}
 
void Manager::SendToAllHandler(ServerId server_id, type::Byteset data)
{
 
 
    for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)
    {
        if (it->second->GetServerId() == server_id)
        {
            it->second->Send(data);
        }
    }
 
 
}
 
void Manager::SendToHandler(ClientId client_id, type::Byteset data)
{
 
 
    ClientList::iterator it = this->clients_.find(client_id);
   
    if (it != this->clients_.end())
    {
        it->second->Send(data);
    }
 
 
}
 
void Manager::StopServerHandler(ServerId server_id)
{
 
 
    for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)
    {
        if (it->second->GetServerId() == server_id)
        {
 
            it->second->Disconnect();
 
        }
    }
 
 
}
 
void Manager::DisconnectHandler(ClientId client_id)
{
 
 
    ClientList::iterator it = this->clients_.find(client_id);
 
 
   
    if (it != this->clients_.end())
    {
        it->second->Disconnect();
    }
   
   
}
 
}; // namespace net
}; // namespace atom
 

Rev 1596	Rev 1597
1	/*	1	/*
2	*	2	*
3	* Copyright (C) 2010 Mattias Runge	3	* Copyright (C) 2010 Mattias Runge
4	*	4	*
5	* This program is free software; you can redistribute it and/or modify	5	* This program is free software; you can redistribute it and/or modify
6	* it under the terms of the GNU General Public License as published by	6	* it under the terms of the GNU General Public License as published by
7	* the Free Software Foundation; either version 2 of the License, or	7	* the Free Software Foundation; either version 2 of the License, or
8	* (at your option) any later version.	8	* (at your option) any later version.
9	*	9	*
10	* This program is distributed in the hope that it will be useful,	10	* This program is distributed in the hope that it will be useful,
11	* but WITHOUT ANY WARRANTY; without even the implied warranty of	11	* but WITHOUT ANY WARRANTY; without even the implied warranty of
12	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	12	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	* GNU General Public License for more details.	13	* GNU General Public License for more details.
14	*	14	*
15	* You should have received a copy of the GNU General Public License along	15	* You should have received a copy of the GNU General Public License along
16	* with this program; if not, write to the Free Software Foundation, Inc.,	16	* with this program; if not, write to the Free Software Foundation, Inc.,
17	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	17	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18	*	18	*
19	*/	19	*/
20		20
21	#include "Manager.h"	21	#include "Manager.h"
22		22
23	#include <iostream>	23	#include <iostream>
24		24
25	#include <boost/lexical_cast.hpp>	25	#include <boost/lexical_cast.hpp>
26	#include <boost/bind.hpp>	26	#include <boost/bind.hpp>
27	#include <boost/cast.hpp>	27	#include <boost/cast.hpp>
28		28
29	namespace atom {	29	namespace atom {
30	namespace net {	30	namespace net {
31		31
32	Manager::Pointer Manager::instance_ = Manager::Pointer(new Manager());	32	Manager::Pointer Manager::instance_ = Manager::Pointer(new Manager());
33		33
34	Manager::Manager() : io_service_work_(io_service_)	34	Manager::Manager() : io_service_work_(io_service_)
35	{	35	{
36	boost::thread thread(boost::bind(&boost::asio::io_service::run, &this->io_service_));	36	boost::thread thread(boost::bind(&boost::asio::io_service::run, &this->io_service_));
37	this->thread_ = thread.move();	37	this->thread_ = thread.move();
38	}	38	}
39		39
40	Manager::~Manager()	40	Manager::~Manager()
41	{	41	{
42	this->clients_.clear();	42	this->clients_.clear();
43		43
44	this->thread_.interrupt();	44	this->thread_.interrupt();
45	this->thread_.join();	45	this->thread_.join();
46	}	46	}
47		47
48	Manager::Pointer Manager::Instance()	48	Manager::Pointer Manager::Instance()
49	{	49	{
50	return Manager::instance_;	50	return Manager::instance_;
51	}	51	}
52		52
53	void Manager::Delete()	53	void Manager::Delete()
54	{	54	{
55	Manager::instance_.reset();	55	Manager::instance_.reset();
56	}	56	}
57		57
58	void Manager::ConnectSlots(const SignalOnNewState::slot_type& slot_on_new_state, const SignalOnNewData::slot_type& slot_on_new_data)	58	void Manager::ConnectSlots(const SignalOnNewState::slot_type& slot_on_new_state, const SignalOnNewData::slot_type& slot_on_new_data)
59	{	59	{
60	this->signal_on_new_state_.connect(slot_on_new_state);	60	this->signal_on_new_state_.connect(slot_on_new_state);
61	this->signal_on_new_data_.connect(slot_on_new_data);	61	this->signal_on_new_data_.connect(slot_on_new_data);
62	}	62	}
63		63
64	void Manager::SlotOnNewState(ClientId client_id, ServerId server_id, ClientState client_state)	64	void Manager::SlotOnNewState(ClientId client_id, ServerId server_id, ClientState client_state)
65	{	65	{
66	if (client_state == CLIENT_STATE_DISCONNECTED)	66	if (client_state == CLIENT_STATE_DISCONNECTED)
67	{	67	{
68	this->mutex_clients_.lock();	-
69	this->clients_.erase(client_id);	68	this->clients_.erase(client_id);
70	this->mutex_clients_.unlock();	-
71	}	69	}
72	else if (client_state == CLIENT_STATE_ACCEPTED)	70	else if (client_state == CLIENT_STATE_ACCEPTED)
73	{	71	{
74	this->mutex_clients_.lock();	-
75	ClientList::iterator it = this->clients_.find(client_id);	72	ClientList::iterator it = this->clients_.find(client_id);
76		73
77	if (it != this->clients_.end())	74	if (it != this->clients_.end())
78	{	75	{
79	TcpClient::Pointer client = TcpClient::Pointer(new TcpClient(this->io_service_, this->GetFreeClientId(), it->second->GetServerId()));	76	TcpClient::Pointer client = TcpClient::Pointer(new TcpClient(this->io_service_, this->GetFreeClientId(), it->second->GetServerId()));
80		77
81	client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),	78	client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),
82	Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));	79	Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));
83		80
84	client->Accept(boost::polymorphic_downcast<TcpClient*>(it->second.get())->ReleaseAcceptor());	81	client->Accept(boost::polymorphic_downcast<TcpClient*>(it->second.get())->ReleaseAcceptor());
85		82
86	this->clients_[client->GetId()] = client;	83	this->clients_[client->GetId()] = client;
87		-
88	this->mutex_clients_.unlock();	-
89		84
90	this->signal_on_new_state_(client_id, server_id, CLIENT_STATE_CONNECTED);	85	this->signal_on_new_state_(client_id, server_id, CLIENT_STATE_CONNECTED);
91	return;	86	return;
92	}	87	}
93	else	88	else
94	{	89	{
95	this->mutex_clients_.unlock();	-
96	throw std::runtime_error("Accepted unknown client!");	90	throw std::runtime_error("Accepted unknown client!");
97	}	91	}
98	}	92	}
99		93
100	this->signal_on_new_state_(client_id, server_id, client_state);	94	this->signal_on_new_state_(client_id, server_id, client_state);
101	}	95	}
102		96
103	void Manager::SlotOnNewData(ClientId client_id, ServerId server_id, type::Byteset data)	97	void Manager::SlotOnNewData(ClientId client_id, ServerId server_id, type::Byteset data)
104	{	98	{
105	this->signal_on_new_data_(client_id, server_id, data);	99	this->signal_on_new_data_(client_id, server_id, data);
106	}	100	}
107		101
108	ServerId Manager::GetFreeServerId()	102	ServerId Manager::GetFreeServerId()
109	{	103	{
110	ServerId server_id = 1;	104	ServerId server_id = 1;
111		105
112	for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)	106	for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)
113	{	107	{
114	if (it->second->GetServerId() != server_id)	108	if (it->second->GetServerId() != server_id)
115	{	109	{
116	return server_id;	110	return server_id;
117	}	111	}
118		112
119	server_id++;	113	server_id++;
120	}	114	}
121		115
122	return server_id;	116	return server_id;
123	}	117	}
124		118
125	ClientId Manager::GetFreeClientId()	119	ClientId Manager::GetFreeClientId()
126	{	120	{
127	ClientId client_id = 1;	121	ClientId client_id = 1;
128		122
129	while (this->clients_.find(client_id) != this->clients_.end())	123	while (this->clients_.find(client_id) != this->clients_.end())
130	{	124	{
131	client_id++;	125	client_id++;
132	}	126	}
133		127
134	return client_id;	128	return client_id;
135	}	129	}
136		130
137	ServerId Manager::StartServer(Protocol protocol, unsigned int port)	131	ServerId Manager::StartServer(Protocol protocol, unsigned int port)
138	{	132	{
139	if (protocol != PROTOCOL_TCP)	133	if (protocol != PROTOCOL_TCP)
140	{	134	{
141	throw std::runtime_error("Can not start server for the Serial or UDP protocol!");	135	throw std::runtime_error("Can not start server for the Serial or UDP protocol!");
142	return 0;	136	return 0;
143	}	137	}
144		-
145	this->mutex_clients_.lock();	-
146		138
147	TcpClient::Pointer client = TcpClient::Pointer(new TcpClient(this->io_service_, this->GetFreeClientId(), this->GetFreeServerId()));	139	TcpClient::Pointer client = TcpClient::Pointer(new TcpClient(this->io_service_, this->GetFreeClientId(), this->GetFreeServerId()));
148		140
149	client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),	141	client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),
150	Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));	142	Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));
151		143
152	TcpClient::AcceptorPointer acceptor = TcpClient::AcceptorPointer(new boost::asio::ip::tcp::acceptor(this->io_service_, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port)));	144	TcpClient::AcceptorPointer acceptor = TcpClient::AcceptorPointer(new boost::asio::ip::tcp::acceptor(this->io_service_, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port)));
153		145
154	client->Accept(acceptor);	146	client->Accept(acceptor);
155		147
156	this->clients_[client->GetId()] = client;	148	this->clients_[client->GetId()] = client;
157		-
158	this->mutex_clients_.unlock();	-
159		149
160	return client->GetServerId();	150	return client->GetServerId();
161	}	151	}
162		152
163	ClientId Manager::Connect(Protocol protocol, std::string address, unsigned int port_or_baud)	153	ClientId Manager::Connect(Protocol protocol, std::string address, unsigned int port_or_baud)
164	{	154	{
165	Client::Pointer client;	155	Client::Pointer client;
166		-
167	this->mutex_clients_.lock();	-
168		156
169	switch (protocol)	157	switch (protocol)
170	{	158	{
171	case PROTOCOL_TCP:	159	case PROTOCOL_TCP:
172	{	160	{
173	client = Client::Pointer(new TcpClient(this->io_service_, this->GetFreeClientId(), 0));	161	client = Client::Pointer(new TcpClient(this->io_service_, this->GetFreeClientId(), 0));
174	break;	162	break;
175	}	163	}
176	case PROTOCOL_UDP:	164	case PROTOCOL_UDP:
177	{	165	{
178	client = Client::Pointer(new UdpClient(this->io_service_, this->GetFreeClientId(), 0));	166	client = Client::Pointer(new UdpClient(this->io_service_, this->GetFreeClientId(), 0));
179	break;	167	break;
180	}	168	}
181	case PROTOCOL_SERIAL:	169	case PROTOCOL_SERIAL:
182	{	170	{
183	client = Client::Pointer(new SerialClient(this->io_service_, this->GetFreeClientId(), 0));	171	client = Client::Pointer(new SerialClient(this->io_service_, this->GetFreeClientId(), 0));
184	break;	172	break;
185	}	173	}
186	default:	174	default:
187	{	175	{
188	this->mutex_clients_.unlock();	-
189	throw std::runtime_error("Invalid protocol specified!");	176	throw std::runtime_error("Invalid protocol specified!");
190	return 0;	177	return 0;
191	}	178	}
192	}	179	}
193		180
194	client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),	181	client->ConnectSlots(Client::SignalOnNewState::slot_type(&Manager::SlotOnNewState, this, _1, _2, _3).track(Manager::instance_),
195	Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));	182	Client::SignalOnNewData::slot_type(&Manager::SlotOnNewData, this, _1, _2, _3).track(Manager::instance_));
196		183
197	try	184	try
198	{	185	{
199	client->Connect(address, port_or_baud);	186	client->Connect(address, port_or_baud);
200	}	187	}
201	catch (std::exception e)	188	catch (std::exception& e)
202	{	189	{
203	~~this-~~>~~mutex_clients_~~.~~unlock~~();	190	throw std::runtime_error(e.what());
204	throw e;	-
205	}	191	}
206		192
207	this->clients_[client->GetId()] = client;	193	this->clients_[client->GetId()] = client;
208		194
209	this->mutex_clients_.unlock();	-
210		-
211	return client->GetId();	195	return client->GetId();
212	}	196	}
213		197
214	void Manager::SendToAll(ServerId server_id, type::Byteset data)	198	void Manager::SendToAll(ServerId server_id, type::Byteset data)
215	{	199	{
216	this->io_service_.post(boost::bind(&Manager::SendToAllHandler, this, server_id, data));	200	this->io_service_.post(boost::bind(&Manager::SendToAllHandler, this, server_id, data));
217	}	201	}
218		202
219	void Manager::SendTo(ClientId client_id, type::Byteset data)	203	void Manager::SendTo(ClientId client_id, type::Byteset data)
220	{	204	{
221	this->io_service_.post(boost::bind(&Manager::SendToHandler, this, client_id, data));	205	this->io_service_.post(boost::bind(&Manager::SendToHandler, this, client_id, data));
222	}	206	}
223		207
224	void Manager::StopServer(ServerId server_id)	208	void Manager::StopServer(ServerId server_id)
225	{	209	{
226	this->io_service_.post(boost::bind(&Manager::StopServerHandler, this, server_id));	210	this->io_service_.post(boost::bind(&Manager::StopServerHandler, this, server_id));
227	}	211	}
228		212
229	void Manager::Disconnect(ClientId client_id)	213	void Manager::Disconnect(ClientId client_id)
230	{	214	{
231	this->io_service_.post(boost::bind(&Manager::DisconnectHandler, this, client_id));	215	this->io_service_.post(boost::bind(&Manager::DisconnectHandler, this, client_id));
232	}	216	}
233		217
234	void Manager::SendToAllHandler(ServerId server_id, type::Byteset data)	218	void Manager::SendToAllHandler(ServerId server_id, type::Byteset data)
235	{	219	{
236	this->mutex_clients_.lock();	-
237		-
238	for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)	220	for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)
239	{	221	{
240	if (it->second->GetServerId() == server_id)	222	if (it->second->GetServerId() == server_id)
241	{	223	{
242	it->second->Send(data);	224	it->second->Send(data);
243	}	225	}
244	}	226	}
245		-
246	this->mutex_clients_.unlock();	-
247	}	227	}
248		228
249	void Manager::SendToHandler(ClientId client_id, type::Byteset data)	229	void Manager::SendToHandler(ClientId client_id, type::Byteset data)
250	{	230	{
251	this->mutex_clients_.lock();	-
252		-
253	ClientList::iterator it = this->clients_.find(client_id);	231	ClientList::iterator it = this->clients_.find(client_id);
254		232
255	if (it != this->clients_.end())	233	if (it != this->clients_.end())
256	{	234	{
257	it->second->Send(data);	235	it->second->Send(data);
258	}	236	}
259		-
260	this->mutex_clients_.unlock();	-
261	}	237	}
262		238
263	void Manager::StopServerHandler(ServerId server_id)	239	void Manager::StopServerHandler(ServerId server_id)
264	{	240	{
265	this->mutex_clients_.lock();	-
266		-
267	for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)	241	for (ClientList::iterator it = this->clients_.begin(); it != this->clients_.end(); it++)
268	{	242	{
269	if (it->second->GetServerId() == server_id)	243	if (it->second->GetServerId() == server_id)
270	{	244	{
271	this->mutex_clients_.unlock();	-
272	it->second->Disconnect();	245	it->second->Disconnect();
273	this->mutex_clients_.lock();	-
274	}	246	}
275	}	247	}
276		-
277	this->mutex_clients_.unlock();	-
278	}	248	}
279		249
280	void Manager::DisconnectHandler(ClientId client_id)	250	void Manager::DisconnectHandler(ClientId client_id)
281	{	251	{
282	this->mutex_clients_.lock();	-
283		-
284	ClientList::iterator it = this->clients_.find(client_id);	252	ClientList::iterator it = this->clients_.find(client_id);
285		-
286	this->mutex_clients_.unlock();	-
287		253
288	if (it != this->clients_.end())	254	if (it != this->clients_.end())
289	{	255	{
290	it->second->Disconnect();	256	it->second->Disconnect();
291	}	257	}
292		258
293		259
294	}	260	}
295		261
296	}; // namespace net	262	}; // namespace net
297	}; // namespace atom	263	}; // namespace atom
298		264

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom1.5/src/net/Manager.cpp – Rev 1596 → 1597