- Se limpian un poco las respuestas, ahora lo que van a ser respuestas reales,

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

index f5c6c730ca017c8b0610d860e7045e8c6d52fef0..23f89c40f0a0f53a561b5991658ebb5f13f64bcc 100644 (file)
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -63,7 +63,7 @@ void ControlServer::real_run(void) {
         while (!stop) {
                 Command command;
                 try {
         while (!stop) {
                 Command command;
                 try {
-                       Glib::Mutex::Lock lock(socket_mutex);
+                       //Glib::Mutex::Lock lock(socket_mutex);
                         socket >> command;
                 // Si se cerró el socket.
                 } catch (const ios::failure& e) {
                         socket >> command;
                 // Si se cerró el socket.
                 } catch (const ios::failure& e) {
@@ -77,6 +77,7 @@ void ControlServer::real_run(void) {
                                 << e.code << " | reason = " << HTTPMessage::reason(e.code)
                                 << " | desc = " << e.what() << endl;
  #endif // DEBUG
                                 << e.code << " | reason = " << HTTPMessage::reason(e.code)
                                 << " | desc = " << e.what() << endl;
  #endif // DEBUG
+                       //Glib::Mutex::Lock lock(socket_mutex);
                         socket << HTTPResponse(e) << flush;
                         continue;
                 }
                         socket << HTTPResponse(e) << flush;
                         continue;
                 }
@@ -125,61 +126,15 @@ void ControlServer::real_run(void) {
  #endif // DEBUG
                 // Manda el comando.
                 command_received(command);
  #endif // DEBUG
                 // Manda el comando.
                 command_received(command);
-               // FIXME - hacer respuesta XML.
-               // La respuesta hay que mandarla asincrónicamente porque no puedo
-               // responder hasta que la planta no se termine de actualizar, por
-               // ejemplo.
-               //stringstream response_xml;
-               //socket << "HTTP/1.0 200 OK" << endl;
-/*
-Date: Sun, 19 Oct 2003 15:11:14 GMT
-Server: Apache/1.3.28 (Debian GNU/Linux)
-Last-Modified: Mon, 28 Apr 2003 07:50:08 GMT
-Accept-Ranges: bytes
-*/
-/*
-               socket << "Content-Type: text/html; charset=iso-8859-1" << endl;
-               response_xml << "<html>" << endl;
-               response_xml << "    <head>" << 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 << "        <p>versión 0.4</p>" << endl;
-               response_xml << "        <h2>Comando</h2>" << endl;
-               response_xml << "        <ul>" << endl;
-               response_xml << "           <li><b>Target:</b> " << command.get_target() << endl;
-               response_xml << "           <li><b>Command:</b> " << command.get_command() << endl;
-               response_xml << "           <li><b>Argumentos:</b>" << endl;
-               response_xml << "               <ol>" << endl;
-               for (Command::Arguments::const_iterator i = command.get_args().begin();
-                               i != command.get_args().end(); i++) {
-                       response_xml << "                   <li>" << *i << "</li>" << endl;
-               }
-               response_xml << "               </ol>" << endl;
-               response_xml << "        </ul>" << endl;
-               response_xml << "        <h2>Desarrollado por</h2>" << endl;
-               response_xml << "        <ul>" << endl;
-               response_xml << "            <li>Nicolás Dimov.</li>" << endl;
-               response_xml << "            <li>Leandro Lucarella.</li>" << endl;
-               response_xml << "            <li>Ricardo Markiewicz.</li>" << endl;
-               response_xml << "        </ul>" << endl;
-               response_xml << "        <address>" << endl;
-               response_xml << "             Copyleft 2003 - bajo los " << endl;
-               response_xml << "             términos de la licencia GPL" << endl;
-               response_xml << "        </address>" << endl;
-               response_xml << "    </body>" << endl;
-               response_xml << "</html>" << endl;
-               socket << "Content-Length: " << response_xml.str().length() << endl;
-               socket << endl;
-               socket << response_xml.str() << flush;
-*/
         }
  }
  
  void ControlServer::send(const HTTPResponse& response) {
         }
  }
  
  void ControlServer::send(const HTTPResponse& response) {
-       Glib::Mutex::Lock lock(socket_mutex);
+       //Glib::Mutex::Lock lock(socket_mutex);
         socket << response << flush;
         socket << response << flush;
+#ifdef DEBUG
+       cerr << __FILE__ << ": send() Enviado!" << endl;
+#endif // DEBUG
  }
  
  ControlServer::SignalCommandReceived& ControlServer::signal_command_received(void) {
  }
  
  ControlServer::SignalCommandReceived& ControlServer::signal_command_received(void) {