#include "plaqui/server/controlserver.h"
#include "plaqui/server/command.h"
-#include "plaqui/server/string.h"
-#include <cstring>
-#include <sstream>
+#include "plaqui/server/httperror.h"
+#include "plaqui/server/httpresponse.h"
+//#include <cstring>
+//#include <sstream>
#ifdef DEBUG
+# include "plaqui/server/string.h"
# include <iostream>
#endif // DEBUG
ControlServer::~ControlServer(void) {
#ifdef DEBUG
- cerr << __FILE__ << ": destructor." << endl;
+ cerr << __FILE__ << "(" << __LINE__ << ")"
+ << ": destructor." << endl;
#endif // DEBUG
}
ControlServer::ControlServer(const sockbuf::sockdesc& sd):
- ServerConnection(sd) {
+ Connection(sd) {
#ifdef DEBUG
- cerr << __FILE__ << ": sd = " << sd.sock << endl;
+ cerr << __FILE__ << "(" << __LINE__ << ")"
+ << ": sd = " << sd.sock << endl;
#endif // DEBUG
}
void ControlServer::real_run(void) {
#ifdef DEBUG
- cerr << __FILE__ << ": real_run()" << endl;
+ cerr << __FILE__ << "(" << __LINE__ << ")"
+ << ": real_run()" << endl;
#endif // DEBUG
//char buf[BUFSIZ];
while (!stop) {
Command command;
try {
+ //Glib::Mutex::Lock lock(socket_mutex);
socket >> command;
- } catch (const char* e) {
- cerr << " (" << __LINE__ << ") Error: " << e << endl;
- stop = true;
- continue;
- } catch (string e) {
- cerr << " (" << __LINE__ << ") Error: " << e << endl;
- stop = true;
- continue;
- } catch (...) {
- cerr << " (" << __LINE__ << ") Error desconocido!" << endl;
- stop = true;
+ } catch (const ios::failure& e) {
+ // TODO poner buenos codigos de error.
+ error(1000000, "Se desconectó.");
+ return;
+ } catch (const sockerr& e) {
+ error(e.serrno(), e.errstr());
+ return;
+ // Si se cerró el socket.
+ //} catch (const ios::failure& e) {
+ // stop = true;
+ // continue;
+ // Si hay un error al parsear el comando, se envia una respuesta con el
+ // error.
+ } catch (const HTTPError& e) {
+#ifdef DEBUG
+ cerr << __FILE__ << "(" << __LINE__ << ")"
+ << " : real_run() ERROR: status_code = "
+ << e.code << " | reason = " << HTTPMessage::reason(e.code)
+ << " | desc = " << e.what() << endl;
+#endif // DEBUG
+ //Glib::Mutex::Lock lock(socket_mutex);
+ socket << HTTPResponse(e) << flush;
continue;
}
// TODO agregar las verificaciones de abajo a HTTPRequest y padres.
+ // Actualizacion: Estoy usando trim() en casi todos lados, no debería
+ // ser necesario.
/*
// Primera línea no vacía (que debe ser el request).
bool is_first = true;
while (!stop && socket.getline(buf, BUFSIZ)) {
#ifdef DEBUG
- cerr << __FILE__ << " Recibiendo inea: " << buf << endl;
+ cerr << __FILE__ << "(" << __LINE__ << ")"
+ << " Recibiendo inea: " << buf << endl;
#endif // DEBUG
int len = strlen(buf);
// Si tiene un retorno de carro, lo elimina.
}
}
*/
- // TODO: Manda el comando.
- // Command command = parse_command(request.uri);
- //signal_command_received().emit(command);
#ifdef DEBUG
- cerr << "Comando: target = " << command.get_target()
- << " | command = " << command.get_command()
+ cerr << __FILE__ << "(" << __LINE__ << ")"
+ << " : real_run() Despachando 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
- // 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>Versión:</b> " << request.version << endl;
- response_xml << " <li><b>Método:</b> " << (request.method ? "POST" : "GET") << endl;
- response_xml << " <li><b>URI:</b> " << request.uri << endl;
- response_xml << " <li><b>Query:</b> " << request.query << endl;
- for (HTTPHeaders::const_iterator i = request.headers.begin();
- i != request.headers.end(); i++) {
- response_xml << " <li><b>" << i->first << ":</b> "
- << i->second << 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;
+ // Manda el comando.
+ command_received(command);
}
}
+void ControlServer::send(const HTTPResponse& response) {
+ //Glib::Mutex::Lock lock(socket_mutex);
+ socket << response << flush;
+#ifdef DEBUG
+ cerr << __FILE__ << "(" << __LINE__ << ")"
+ << ": send() Enviado!" << endl;
+#endif // DEBUG
+}
+
+ControlServer::SignalCommandReceived& ControlServer::signal_command_received(void) {
+ return command_received;
+}
+
} // namespace Server
} // namespace PlaQui
projects / z.facultad / 75.42 / plaqui.git / blobdiff