Ya se mandan seniales cuando se reciben comandos.

[z.facultad/75.42/plaqui.git] / Server / src / controlserver.cpp
diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp

index 133f36eeccc9abb64992180256931253fdcee5a6..c5e163fe44e8d71044c563ed876a2e6071ce94b9 100644 (file)
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -47,7 +47,7 @@ ControlServer::~ControlServer(void) {
  }
  
  ControlServer::ControlServer(const sockbuf::sockdesc& sd):
  }
  
  ControlServer::ControlServer(const sockbuf::sockdesc& sd):
-               ServerConnection(sd) {
+               Connection(sd) {
  #ifdef DEBUG
         cerr << __FILE__ << ": sd = " << sd.sock << endl;
  #endif // DEBUG
  #ifdef DEBUG
         cerr << __FILE__ << ": sd = " << sd.sock << endl;
  #endif // DEBUG
@@ -110,18 +110,13 @@ void ControlServer::real_run(void) {
                         }
                 }
  */
                         }
                 }
  */
-               // TODO: Manda el comando.
-               // Command command = parse_command(request.uri);
-               //signal_command_received().emit(command);
+               // Manda el comando.
+               command_received.emit(command);
  #ifdef DEBUG
                 cerr << "Comando: target = " << command.get_target()
                         << " | command = " << command.get_command()
                         << " | args = [" << String::join(command.get_args(), ", ") << "]"
                         << endl;
  #ifdef DEBUG
                 cerr << "Comando: target = " << command.get_target()
                         << " | command = " << command.get_command()
                         << " | args = [" << String::join(command.get_args(), ", ") << "]"
                         << endl;
-               //for (HTTPRequest::const_iterator i = request.begin();
-               //              i != request.end(); i++) {
-               //      cerr << "   " << i->first << ": " << i->second << endl;
-               //}
  #endif // DEBUG
                 // FIXME - hacer respuesta XML.
                 // La respuesta hay que mandarla asincrónicamente porque no puedo
  #endif // DEBUG
                 // FIXME - hacer respuesta XML.
                 // La respuesta hay que mandarla asincrónicamente porque no puedo
@@ -138,7 +133,7 @@ Accept-Ranges: bytes
                 socket << "Content-Type: text/html; charset=iso-8859-1" << endl;
                 response_xml << "<html>" << endl;
                 response_xml << "    <head>" << endl;
                 socket << "Content-Type: text/html; charset=iso-8859-1" << endl;
                 response_xml << "<html>" << endl;
                 response_xml << "    <head>" << endl;
-               response_xml << "        <title>PlaQui v0.1</title>" << endl;
+               response_xml << "        <title>PlaQui v0.4</title>" << endl;
                 response_xml << "    </head>" << endl;
                 response_xml << "    <body>" << endl;
                 response_xml << "        <h1>PlaQui</h1>" << endl;
                 response_xml << "    </head>" << endl;
                 response_xml << "    <body>" << endl;
                 response_xml << "        <h1>PlaQui</h1>" << endl;
@@ -182,6 +177,10 @@ Accept-Ranges: bytes
         }
  }
  
         }
  }
  
+ControlServer::SignalCommandReceived& ControlServer::signal_command_received(void) {
+       return command_received;
+}
+
  } // namespace Server
  
  } // namespace PlaQui
  } // namespace Server
  
  } // namespace PlaQui