X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/fc388ed8c2016ad44f83d20859bf864562f731a1..f29a7129de56edca96ea8ef58576898c1e52ed6f:/Server/src/server.cpp?ds=inline diff --git a/Server/src/server.cpp b/Server/src/server.cpp index 8f33449..37f5c1c 100644 --- a/Server/src/server.cpp +++ b/Server/src/server.cpp @@ -29,63 +29,182 @@ #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 #endif // DEBUG -PlaQui::Server::Server::~Server(void) { +using namespace std; + +namespace PlaQui { + +namespace Server { + +Server::~Server(void) { #ifdef DEBUG - std::cerr << __FILE__ << ": destructor." << std::endl; + cerr << __FILE__ << ": destructor." << endl; #endif // DEBUG } -PlaQui::Server::Server::Server(int port): - PlaQui::Server::TCPServer(port) { +Server::Server(int port): + TCPServer(port) { #ifdef DEBUG - std::cerr << __FILE__ << ": port = " << port << std::endl; + cerr << __FILE__ << ": port = " << port << endl; #endif // DEBUG } /// \todo Implementar. -bool PlaQui::Server::Server::start_transmission(std::string host, int port) { +bool Server::start_transmission(string host, int port) { #ifdef DEBUG - std::cerr << __FILE__ << ": start_transmission(host = " << host - << " | port = " << port << ")" << std::endl; + cerr << __FILE__ << ": start_transmission(host = " << host + << " | port = " << port << ")" << endl; #endif // DEBUG // TODO return false; } -PlaQui::Server::Connection* -PlaQui::Server::Server::new_connection(const sockbuf::sockdesc& sd) { +Connection* Server::new_connection( + const sockbuf::sockdesc& sd) { #ifdef DEBUG - std::cerr << __FILE__ << ": new_connection(sd = " << sd.sock << ")" - << std::endl; + cerr << __FILE__ << ": new_connection(sd = " << sd.sock << ")" + << endl; #endif // DEBUG - PlaQui::Server::ControlServer* conn = new PlaQui::Server::ControlServer(sd); + ControlServer* connection = new ControlServer(sd); // TODO verificar si el new se hace bien? no creo. - conn->signal_command_received().connect( - SigC::slot_class(*this, - &PlaQui::Server::Server::on_control_command_received)); + connection->signal_command_received().connect( + SigC::bind( + SigC::slot_class(*this, &Server::on_control_command_received), + connection)); // TODO: - return conn; + return connection; } /// \todo Implementar. -bool PlaQui::Server::Server::stop_transmission(std::string host, int port) { +bool Server::stop_transmission(string host, int port) { #ifdef DEBUG - std::cerr << __FILE__ << ": stop_transmission(host = " << host - << " | port = " << port << ")" << std::endl; + cerr << __FILE__ << ": stop_transmission(host = " << host + << " | port = " << port << ")" << endl; #endif // DEBUG // TODO return false; } /// \todo Implementar. -void PlaQui::Server::Server::on_control_command_received(void* command) { +void Server::on_control_command_received(const Command& command, + ControlServer* server) { #ifdef DEBUG - std::cerr << __FILE__ << ": on_control_command_received(command = " - << command << ")" << std::endl; + 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 << "

Target: " << command.get_target() << endl; + response_xml << "
Command: " << command.get_command() << endl; + response_xml << "
Argumentos:" << endl; + response_xml << "
1. " << *i << "
" << endl; + response_xml << "

" << endl; + response_xml << "

Desarrollado por

" << endl; + response_xml << "

Nicolás Dimov.
Leandro Lucarella.
Ricardo Markiewicz.

" << endl; + response_xml << "

" << endl; + response_xml << " Copyleft 2003 - bajo los " << endl; + response_xml << " términos de la licencia GPL" << endl; + response_xml << "

PlaQui

" << endl; + response_xml << "

versión 0.6

" << endl; + response_xml << "

Lista de conexiones:

" << endl; + response_xml << "

" << i->host + << ":" << i->port << " [host << "/" << i->port << "\">deconectar]

" << 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 + +} // namespace PlaQui +