X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/2f5c973fdf3f7fb25b13996b66d566c58066f6a0..3a8788fb198a1e0590823745f39fbff81056db09:/Server/src/server.cpp?ds=inline diff --git a/Server/src/server.cpp b/Server/src/server.cpp index a05285a..37f5c1c 100644 --- a/Server/src/server.cpp +++ b/Server/src/server.cpp @@ -29,6 +29,8 @@ #include "plaqui/server/connection.h" #include "plaqui/server/controlserver.h" #include +// FIXME - sacar sstream (a menos que se necesite) +#include #ifdef DEBUG # include "plaqui/server/string.h" # include @@ -72,7 +74,9 @@ Connection* Server::new_connection( ControlServer* connection = new ControlServer(sd); // TODO verificar si el new se hace bien? no creo. connection->signal_command_received().connect( - SigC::slot_class(*this, &Server::on_control_command_received)); + SigC::bind( + SigC::slot_class(*this, &Server::on_control_command_received), + connection)); // TODO: return connection; } @@ -88,13 +92,116 @@ bool Server::stop_transmission(string host, int port) { } /// \todo Implementar. -void Server::on_control_command_received(const Command& command) { +void Server::on_control_command_received(const Command& command, + ControlServer* server) { #ifdef DEBUG cerr << __FILE__ << ": on_control_command_received(target = " << command.get_target() << ", command = " << command.get_command() << ", args = [" << String::join(command.get_args(), ", ") << "])" << endl; #endif // DEBUG + HTTPResponse response(HTTPMessage::OK); + if (command.get_target() == "server") { +#ifdef DEBUG + cerr << __FILE__ << ": server" << endl; +#endif // DEBUG + if (command.get_command() == "status") { + // FIXME + stringstream response_xml; + response_xml << "" << endl; + response_xml << " " << endl; + response_xml << " PlaQui v0.6" << endl; + response_xml << " " << endl; + response_xml << " " << endl; + response_xml << "

PlaQui

" << endl; + response_xml << "

versión 0.6

" << 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 << "
    1. " << *i << "
      2. " << 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; + response.status_code = HTTPMessage::OK; + response.set_body(response_xml.str()); + } else if (command.get_command() == "stop") { + stop = true; + response.set_body("El server se apagará en instantes..."); + } else { + response.status_code = HTTPMessage::NOT_FOUND; + response.set_body("Invalid command for 'server' taget!"); + } + } else if (command.get_target() == "connection") { + if (command.get_command() == "list") { + // FIXME + TCPServer::ConnectionInfoList cil = get_connected(); + stringstream response_xml; + response_xml << "" << endl; + response_xml << " " << endl; + response_xml << " PlaQui v0.6" << endl; + response_xml << " " << endl; + response_xml << " " << endl; + response_xml << "

PlaQui

" << endl; + response_xml << "

versión 0.6

" << endl; + response_xml << "

Lista de conexiones:

" << endl; + response_xml << "
    " << endl; + for (TCPServer::ConnectionInfoList::const_iterator i = cil.begin(); + i != cil.end(); i++) { + response_xml << "
  • " << i->host + << ":" << i->port << " [host << "/" << i->port << "\">deconectar]
    • " + << 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; + response.status_code = HTTPMessage::OK; + response.set_body(response_xml.str()); + } else if (command.get_command() == "stop") { + // TODO server->finish(); + response.set_body("La conexión se cerrará en instantes..."); + } else { + response.status_code = HTTPMessage::NOT_FOUND; + response.set_body("Invalid command for 'connection' taget!"); + } + } else if (command.get_target() == "transmission") { + response.status_code = HTTPMessage::NOT_FOUND; + response.set_body("Invalid command for 'transmission' taget!"); + } else if (command.get_target() == "plant") { + response.status_code = HTTPMessage::NOT_FOUND; + response.set_body("Invalid command for 'plant' taget!"); + } else { + response.status_code = HTTPMessage::NOT_FOUND; + response.set_body("Invalid Target!"); + } + // FIXME + response.headers["Content-Type"] = "text/html; charset=iso-8859-1"; + response.headers["Connection"] = "close"; + server->send(response); + // FIXME con timeout no debería ser necesario. Verificar cabecera Connection + // para saber si hay que finish()earlo o no. + // server->finish(); } } // namespace Server