X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/1de5f8fa25dcea9fb9de9707d75120f762ce3a87..34fb46485db0fb44f8dcc532866d988f8e54caa2:/Server/src/tcpserver.cpp diff --git a/Server/src/tcpserver.cpp b/Server/src/tcpserver.cpp index c00a8b6..0f97fe5 100644 --- a/Server/src/tcpserver.cpp +++ b/Server/src/tcpserver.cpp @@ -31,60 +31,101 @@ # include #endif // DEBUG -PlaQui::Server::TCPServer::~TCPServer(void) { +using namespace std; + +namespace PlaQui { + +namespace Server { + +TCPServer::~TCPServer(void) { #ifdef DEBUG - std::cerr << __FILE__ << ": destructor." << std::endl; + cerr << __FILE__ << ": destructor." << endl; #endif // DEBUG } -PlaQui::Server::TCPServer::TCPServer(int port): - socket(sockbuf::sock_stream) { +TCPServer::TCPServer(int port): socket(sockbuf::sock_stream) { #ifdef DEBUG - std::cerr << __FILE__ << ": port = " << port << std::endl; + cerr << __FILE__ << ": port = " << port << endl; #endif // DEBUG socket.bind(port); #ifdef DEBUG - std::cerr << __FILE__ << ": escuchando en " << socket.localhost() - << ":" << socket.localport() << "." << std::endl; + cerr << __FILE__ << ": escuchando en " << socket.localhost() + << ":" << socket.localport() << "." << endl; #endif // DEBUG - socket.listen(); + socket.listen(MAX_PENDING_CONNECTIONS); #ifdef DEBUG - std::cerr << __FILE__ << ": [despues de listen()] escuchando en " - << socket.localhost() << ":" << socket.localport() << "." << std::endl; + cerr << __FILE__ << ": [despues de listen()] escuchando en " + << socket.localhost() << ":" << socket.localport() << "." << endl; #endif // DEBUG } -void PlaQui::Server::TCPServer::on_connection_finished( - PlaQui::Server::Connection* connection) { +void TCPServer::on_connection_finished(Connection* connection) { #ifdef DEBUG - std::cerr << __FILE__ << ": on_connection_finished(connection = " - << connection << ")" << std::endl; + cerr << __FILE__ << ": on_connection_finished(connection = " + << connection << ")" << endl; #endif // DEBUG - // TODO: poner lock. + Glib::Mutex::Lock lock(connections_mutex); connections.remove(connection); - // TODO: sacar lock. +#ifdef DEBUG + cerr << __FILE__ << ": lista de conexiones" << endl; + for (ConnectionList::const_iterator i = connections.begin(); + i != connections.end(); i++) { + cerr << "\t " << *i << endl; + } +#endif // DEBUG } -void PlaQui::Server::TCPServer::real_run(void) { +/// \todo TODO: ver tema de timeout o como salir de un accept(). +void TCPServer::real_run(void) { #ifdef DEBUG - std::cerr << __FILE__ << ": real_run" << std::endl; + cerr << __FILE__ << ": real_run()" << endl; #endif // DEBUG - PlaQui::Server::Connection* conn; + Connection* connection; while (!stop) { - // TODO: ver tema de timeout o como salir de un accept(). // Forma grasa de salir del accept: crear conexion que salga al toque. - conn = new_connection(socket.accept()); - // TODO: poner lock. - connections.push_back(conn); - // TODO: sacar lock. - // TODO: esto va en Server::new_connection() + connection = new_connection(socket.accept()); +#ifdef DEBUG + cerr << __FILE__ << ": real_run(): connection = " << connection + << endl; +#endif // DEBUG + Glib::Mutex::Lock lock(connections_mutex); + // XXX connections_mutex.lock(); + connections.push_back(connection); +#ifdef DEBUG + cerr << __FILE__ << ": real_run(): lista de conexiones" << endl; + for (ConnectionList::const_iterator i = connections.begin(); + i != connections.end(); i++) { + cerr << "\t " << *i << endl; + } +#endif // DEBUG + // XXX connections_mutex.unlock(); // Si pongo el mutex antes del run(), + // muere. // Conecto la señal para cuando termina una conexión, borrarla. - conn->signal_finished().connect( - SigC::bind( + connection->signal_finished().connect( + SigC::bind( SigC::slot_class(*this, - &PlaQui::Server::TCPServer::on_connection_finished), - conn)); - conn->run(); + &TCPServer::on_connection_finished), + connection)); + connection->run(); + } +} + +TCPServer::ConnectionInfoList TCPServer::get_connected(void) { +#ifdef DEBUG + cerr << __FILE__ << ": get_connected()" << endl; +#endif // DEBUG + TCPServer::ConnectionInfoList con; + Glib::Mutex::Lock lock(connections_mutex); + for (ConnectionList::const_iterator i = connections.begin(); + i != connections.end(); i++) { + TCPServer::ConnectionInfo ci = + { (*i)->get_peerhost(), (*i)->get_peerport() }; + con.push_back(ci); } + return con; } +} // namespace Server + +} // namespace PlaQui +