X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/f27c218d18ebf7198e07249aca1eed625da914fd..e4f66a8221e3f2156d89a7a358073863503b2564:/Server/src/controlserver.cpp?ds=sidebyside
diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index f5c6c73..23f89c4 100644
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -63,7 +63,7 @@ void ControlServer::real_run(void) {
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) {
@@ -77,6 +77,7 @@ void ControlServer::real_run(void) {
<< e.code << " | reason = " << HTTPMessage::reason(e.code)
<< " | desc = " << e.what() << endl;
#endif // DEBUG
+ //Glib::Mutex::Lock lock(socket_mutex);
socket << HTTPResponse(e) << flush;
continue;
}
@@ -125,61 +126,15 @@ void ControlServer::real_run(void) {
#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 << "" << endl;
- response_xml << " " << endl;
- response_xml << " PlaQui v0.4" << endl;
- response_xml << " " << endl;
- response_xml << " " << endl;
- response_xml << " PlaQui
" << endl;
- response_xml << " versión 0.4
" << endl;
- response_xml << " Comando
" << endl;
- response_xml << " " << endl;
- response_xml << " - Target: " << command.get_target() << endl;
- response_xml << "
- Command: " << command.get_command() << endl;
- response_xml << "
- Argumentos:" << endl;
- response_xml << "
" << endl;
- for (Command::Arguments::const_iterator i = command.get_args().begin();
- i != command.get_args().end(); i++) {
- response_xml << " - " << *i << "
" << endl;
- }
- response_xml << "
" << endl;
- response_xml << "
" << endl;
- response_xml << " Desarrollado por
" << endl;
- response_xml << " " << endl;
- response_xml << " - Nicolás Dimov.
" << endl;
- response_xml << " - Leandro Lucarella.
" << endl;
- response_xml << " - Ricardo Markiewicz.
" << endl;
- response_xml << "
" << endl;
- response_xml << " " << endl;
- response_xml << " Copyleft 2003 - bajo los " << endl;
- response_xml << " términos de la licencia GPL" << endl;
- response_xml << " " << endl;
- response_xml << " " << endl;
- response_xml << "" << endl;
- socket << "Content-Length: " << response_xml.str().length() << endl;
- socket << endl;
- socket << response_xml.str() << flush;
-*/
}
}
void ControlServer::send(const HTTPResponse& response) {
- Glib::Mutex::Lock lock(socket_mutex);
+ //Glib::Mutex::Lock lock(socket_mutex);
socket << response << flush;
+#ifdef DEBUG
+ cerr << __FILE__ << ": send() Enviado!" << endl;
+#endif // DEBUG
}
ControlServer::SignalCommandReceived& ControlServer::signal_command_received(void) {