* Se agrega un Tanque al ejemplo, y ANDA!!!!

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

diff --git a/Server/src/tcpserver.cpp b/Server/src/tcpserver.cpp
index d2bb7fd58eed54a78be5b1a5ded52a25fbbf08d8..0f97fe5a762b5fbaebcfc0410ff62685cbad39cf 100644 (file)
--- a/Server/src/tcpserver.cpp
+++ b/Server/src/tcpserver.cpp
@@ -31,76 +31,75 @@
 #      include <iostream>
 #endif // DEBUG
 
 #      include <iostream>
 #endif // DEBUG
 

-const unsigned PlaQui::Server::TCPServer::MAX_PENDING_CONNECTIONS = 5;
+using namespace std;

 
 

-PlaQui::Server::TCPServer::~TCPServer(void) {
+namespace PlaQui {
+
+namespace Server {
+
+TCPServer::~TCPServer(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ <<  ": destructor." << std::endl;
+       cerr << __FILE__ <<  ": destructor." << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-PlaQui::Server::TCPServer::TCPServer(int port):
-               socket(sockbuf::sock_stream) {
+TCPServer::TCPServer(int port):        socket(sockbuf::sock_stream) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ <<  ": port = " << port << std::endl;
+       cerr << __FILE__ <<  ": port = " << port << endl;

 #endif // DEBUG
        socket.bind(port);
 #ifdef DEBUG
 #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(MAX_PENDING_CONNECTIONS);
 #ifdef DEBUG
 #endif // DEBUG
        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
 }
 
 #endif // DEBUG
 }
 

-void PlaQui::Server::TCPServer::on_connection_finished(
-               Connection* connection) {
+void TCPServer::on_connection_finished(Connection* connection) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ <<  ": on_connection_finished(connection = "
-               << connection << ")" << std::endl;
+       cerr << __FILE__ <<  ": on_connection_finished(connection = "
+               << connection << ")" << endl;

 #endif // DEBUG
 #endif // DEBUG

-       connections_mutex.lock();
-       // FIXME pruebo el mutex.
-       sleep(5);
+       Glib::Mutex::Lock lock(connections_mutex);

        connections.remove(connection);
 #ifdef DEBUG
        connections.remove(connection);
 #ifdef DEBUG

-       std::cerr << __FILE__ <<  ": lista de conexiones" << std::endl;
+       cerr << __FILE__ <<  ": lista de conexiones" << endl;

        for (ConnectionList::const_iterator i = connections.begin();
                        i != connections.end(); i++) {
        for (ConnectionList::const_iterator i = connections.begin();
                        i != connections.end(); i++) {

-               std::cerr << "\t " << *i << std::endl;
+               cerr << "\t " << *i << endl;

        }
 #endif // DEBUG
        }
 #endif // DEBUG

-       connections_mutex.unlock();

 }
 
 /// \todo TODO: ver tema de timeout o como salir de un accept().
 }
 
 /// \todo TODO: ver tema de timeout o como salir de un accept().

-void PlaQui::Server::TCPServer::real_run(void) {
+void TCPServer::real_run(void) {

 #ifdef DEBUG
 #ifdef DEBUG

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

 #endif // DEBUG
        Connection* connection;
        while (!stop) {
                // Forma grasa de salir del accept: crear conexion que salga al toque.
                connection = new_connection(socket.accept());
 #ifdef DEBUG
 #endif // DEBUG
        Connection* connection;
        while (!stop) {
                // Forma grasa de salir del accept: crear conexion que salga al toque.
                connection = new_connection(socket.accept());
 #ifdef DEBUG

-               std::cerr << __FILE__ <<  ": real_run(): connection = " << connection
-                       << std::endl;
+               cerr << __FILE__ <<  ": real_run(): connection = " << connection
+                       << endl;

 #endif // DEBUG
 #endif // DEBUG

-               connections_mutex.lock();
-               // FIXME pruebo el mutex.
-               sleep(5);
+               Glib::Mutex::Lock lock(connections_mutex);
+               // XXX connections_mutex.lock();

                connections.push_back(connection);
 #ifdef DEBUG
                connections.push_back(connection);
 #ifdef DEBUG

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

                for (ConnectionList::const_iterator i = connections.begin();
                                i != connections.end(); i++) {
                for (ConnectionList::const_iterator i = connections.begin();
                                i != connections.end(); i++) {

-                       std::cerr << "\t " << *i << std::endl;
+                       cerr << "\t " << *i << endl;

                }
 #endif // DEBUG
                }
 #endif // DEBUG

-               connections_mutex.unlock();
+               // XXX connections_mutex.unlock(); // Si pongo el mutex antes del run(),
+               //                                    muere.

                // Conecto la señal para cuando termina una conexión, borrarla.
                connection->signal_finished().connect(
                                SigC::bind<Connection*>(
                // Conecto la señal para cuando termina una conexión, borrarla.
                connection->signal_finished().connect(
                                SigC::bind<Connection*>(


@@ -111,3 +110,22 @@ void PlaQui::Server::TCPServer::real_run(void) {
        }
 }
 
        }
 }
 

+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
+