Se corrige el bug que hacia que aparezca un error EADDRINUSE (que el puerto ya

[z.facultad/75.42/plaqui.git] / Server / src / tcpserver.cpp

diff --git a/Server/src/tcpserver.cpp b/Server/src/tcpserver.cpp
index e78e53ca82e65012b5c35fbcd08f4d38308140ed..8b1c3bb571c996a7ba72070b5ac7928b86a3b258 100644 (file)
--- a/Server/src/tcpserver.cpp
+++ b/Server/src/tcpserver.cpp
@@ -27,6 +27,7 @@
 
 #include "plaqui/server/tcpserver.h"
 #include <sigc++/class_slot.h>
 
 #include "plaqui/server/tcpserver.h"
 #include <sigc++/class_slot.h>

+#include <glibmm/timer.h>

 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG


@@ -39,52 +40,75 @@ namespace Server {
 
 TCPServer::~TCPServer(void) {
 #ifdef DEBUG
 
 TCPServer::~TCPServer(void) {
 #ifdef DEBUG

-       cerr << __FILE__ <<  ": destructor." << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               <<  ": destructor." << endl;

 #endif // DEBUG
 #endif // DEBUG

-       Glib::Mutex::Lock lock(connections_mutex);
+       // Mando a terminar todas las conexiones.
+       connections_mutex.lock();

        for (ConnectionList::iterator con = connections.begin();
                        con != connections.end(); con++) {
        for (ConnectionList::iterator con = connections.begin();
                        con != connections.end(); con++) {

-               (*con)->finish(true);
+               (*con)->finish();
+       }
+       ConnectionList::size_type count = connections.size();
+       connections_mutex.unlock();
+       // Espero que terminen realmente.
+       while (count) {
+               Glib::usleep(10000); // 10 milisegundos
+               connections_mutex.lock();
+               count = connections.size();
+               connections_mutex.unlock();

        }
 }
 
        }
 }
 

-TCPServer::TCPServer(const Connection::Port& port): socket(sockbuf::sock_stream) {
+TCPServer::TCPServer(const Connection::Port& port) throw(sockerr):
+               socket(sockbuf::sock_stream) {

 #ifdef DEBUG
 #ifdef DEBUG

-       cerr << __FILE__ <<  ": port = " << port << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               <<  ": port = " << port << endl;

 #endif // DEBUG
        // FIXME
        //cerr << "recvtimeout = " << socket.recvtimeout(1) << endl;
        //cerr << "sendtimeout = " << socket.sendtimeout(1) << endl;
        //cerr << "recvtimeout = " << socket.recvtimeout(1) << endl;
        //cerr << "sendtimeout = " << socket.sendtimeout(1) << endl;
 #endif // DEBUG
        // FIXME
        //cerr << "recvtimeout = " << socket.recvtimeout(1) << endl;
        //cerr << "sendtimeout = " << socket.sendtimeout(1) << endl;
        //cerr << "recvtimeout = " << socket.recvtimeout(1) << endl;
        //cerr << "sendtimeout = " << socket.sendtimeout(1) << endl;

+       socket.reuseaddr(true);

        socket.bind(port);
 #ifdef DEBUG
        socket.bind(port);
 #ifdef DEBUG

-       cerr << __FILE__ <<  ": escuchando en " << socket.localhost()
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               <<  ": escuchando en " << socket.localhost()

                << ":" << socket.localport() << "." << endl;
 #endif // DEBUG
        socket.listen(MAX_PENDING_CONNECTIONS);
 #ifdef DEBUG
                << ":" << socket.localport() << "." << endl;
 #endif // DEBUG
        socket.listen(MAX_PENDING_CONNECTIONS);
 #ifdef DEBUG

-       cerr << __FILE__ <<  ": [despues de listen()] escuchando en "
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               <<  ": [despues de listen()] escuchando en "

                << socket.localhost() << ":" << socket.localport() << "." << endl;
 #endif // DEBUG
 }
 
                << socket.localhost() << ":" << socket.localport() << "." << endl;
 #endif // DEBUG
 }
 

-void TCPServer::finish(bool attach) {
+/*void TCPServer::finish(bool attach) {
+#ifdef DEBUG
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               <<  ": finish(attach = " << attach << ");" << endl;
+#endif // DEBUG

        //socket_mutex.lock();
        //socket_mutex.lock();

-       socket.shutdown(sockbuf::shut_readwrite);
+       close(socket.sd());
+       //socket.shutdown(sockbuf::shut_readwrite);

        //socket_mutex.unlock();
        Runnable::finish(attach);
        //socket_mutex.unlock();
        Runnable::finish(attach);

-}
+}*/

 
 void TCPServer::on_connection_finished(Connection* connection) {
 #ifdef DEBUG
 
 void TCPServer::on_connection_finished(Connection* connection) {
 #ifdef DEBUG

-       cerr << __FILE__ <<  ": on_connection_finished(connection = "
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               <<  ": on_connection_finished(connection = "

                << connection << ")" << endl;
 #endif // DEBUG
        Glib::Mutex::Lock lock(connections_mutex);
        connections.remove(connection);
 #ifdef DEBUG
                << connection << ")" << endl;
 #endif // DEBUG
        Glib::Mutex::Lock lock(connections_mutex);
        connections.remove(connection);
 #ifdef DEBUG

-       cerr << __FILE__ <<  ": lista de conexiones" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               <<  ": lista de conexiones" << endl;

        for (ConnectionList::const_iterator i = connections.begin();
                        i != connections.end(); i++) {
                cerr << "\t " << *i << endl;
        for (ConnectionList::const_iterator i = connections.begin();
                        i != connections.end(); i++) {
                cerr << "\t " << *i << endl;


@@ -92,24 +116,31 @@ void TCPServer::on_connection_finished(Connection* connection) {
 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-/// \todo TODO: ver tema de timeout o como salir de un accept().
-void TCPServer::real_run(void) {
+void TCPServer::real_run(void) throw() {

 #ifdef DEBUG
 #ifdef DEBUG

-       cerr << __FILE__ <<  ": real_run()" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               <<  ": real_run()" << endl;

 #endif // DEBUG
        Connection* connection;
 #endif // DEBUG
        Connection* connection;

-       while (!stop) {
+       while (!stop()) {

                // Forma grasa de salir del accept: crear conexion que salga al toque.
                // Forma grasa de salir del accept: crear conexion que salga al toque.

-               connection = new_connection(socket.accept());
+               try {
+                       connection = new_connection(socket.accept());
+               } catch (const sockerr& e) { // No se si el accept() puede fallar.
+                       signal_error().emit(e.serrno(), e.errstr());
+                       continue; // Supongo que puede seguir aceptando conexiones.
+               }

 #ifdef DEBUG
 #ifdef DEBUG

-               cerr << __FILE__ <<  ": real_run(): connection = " << connection
+               cerr << __FILE__ << "(" << __LINE__ << ")"
+                       <<  ": real_run(): connection = " << connection

                        << endl;
 #endif // DEBUG
                Glib::Mutex::Lock lock(connections_mutex);
                // XXX connections_mutex.lock();
                connections.push_back(connection);
 #ifdef DEBUG
                        << 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;
+               cerr << __FILE__ << "(" << __LINE__ << ")"
+                       <<  ": real_run(): lista de conexiones" << endl;

                for (ConnectionList::const_iterator i = connections.begin();
                                i != connections.end(); i++) {
                        cerr << "\t " << *i << endl;
                for (ConnectionList::const_iterator i = connections.begin();
                                i != connections.end(); i++) {
                        cerr << "\t " << *i << endl;


@@ -129,7 +160,8 @@ void TCPServer::real_run(void) {
 
 bool TCPServer::disconnect(const std::string& host, const Connection::Port& port) {
 #ifdef DEBUG
 
 bool TCPServer::disconnect(const std::string& host, const Connection::Port& port) {
 #ifdef DEBUG

-       cerr << __FILE__ <<  ": disconnect(host = " << host
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               <<  ": disconnect(host = " << host

                << ", port = " << port << ")" << endl;
 #endif // DEBUG
        Glib::Mutex::Lock lock(connections_mutex);
                << ", port = " << port << ")" << endl;
 #endif // DEBUG
        Glib::Mutex::Lock lock(connections_mutex);


@@ -143,9 +175,11 @@ bool TCPServer::disconnect(const std::string& host, const Connection::Port& port
        return false;
 }
 
        return false;
 }
 

+/// \todo TODO Hay que reemplazarlo por una lista generica.

 TCPServer::ConnectionInfoList TCPServer::get_connected(void) {
 #ifdef DEBUG
 TCPServer::ConnectionInfoList TCPServer::get_connected(void) {
 #ifdef DEBUG

-       cerr << __FILE__ <<  ": get_connected()" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               <<  ": get_connected()" << endl;

 #endif // DEBUG
        TCPServer::ConnectionInfoList cl;
        Glib::Mutex::Lock lock(connections_mutex);
 #endif // DEBUG
        TCPServer::ConnectionInfoList cl;
        Glib::Mutex::Lock lock(connections_mutex);