Se mueve el mutex a la clase que tiene el recurso a proteger.

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

diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 8f33449f4904a5d6fa971e1ce2faba79b1c44a65..134bcf517f9f1d386c1d8a75ea648c744a651e5d 100644 (file)
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -40,7 +40,7 @@ PlaQui::Server::Server::~Server(void) {
 }
 
 PlaQui::Server::Server::Server(int port):
 }
 
 PlaQui::Server::Server::Server(int port):

-               PlaQui::Server::TCPServer(port) {
+               TCPServer(port) {

 #ifdef DEBUG
        std::cerr << __FILE__ <<  ": port = " << port << std::endl;
 #endif // DEBUG
 #ifdef DEBUG
        std::cerr << __FILE__ <<  ": port = " << port << std::endl;
 #endif // DEBUG


@@ -56,19 +56,18 @@ bool PlaQui::Server::Server::start_transmission(std::string host, int port) {
        return false;
 }
                        
        return false;
 }
                        

-PlaQui::Server::Connection*
-PlaQui::Server::Server::new_connection(const sockbuf::sockdesc& sd) {
+PlaQui::Server::Connection* PlaQui::Server::Server::new_connection(
+               const sockbuf::sockdesc& sd) {

 #ifdef DEBUG
        std::cerr << __FILE__ <<  ": new_connection(sd = " << sd.sock << ")"
                << std::endl;
 #endif // DEBUG
 #ifdef DEBUG
        std::cerr << __FILE__ <<  ": new_connection(sd = " << sd.sock << ")"
                << std::endl;
 #endif // DEBUG

-       PlaQui::Server::ControlServer* conn = new PlaQui::Server::ControlServer(sd);
+       ControlServer* connection = new ControlServer(sd);

        // TODO verificar si el new se hace bien? no creo.
        // TODO verificar si el new se hace bien? no creo.

-       conn->signal_command_received().connect(
-                       SigC::slot_class(*this,
-                               &PlaQui::Server::Server::on_control_command_received));
+       connection->signal_command_received().connect(
+                       SigC::slot_class(*this, &Server::on_control_command_received));

        // TODO: 
        // TODO: 

-       return conn;
+       return connection;

 }
 
 /// \todo Implementar.
 }
 
 /// \todo Implementar.