X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/989d0da7e93d155dde399bf3047ab6b4af550bb6..c0e0cf58ce033421d125afb813636f102456592c:/Server/src/server.cpp?ds=sidebyside diff --git a/Server/src/server.cpp b/Server/src/server.cpp index 8704d69..4247d91 100644 --- a/Server/src/server.cpp +++ b/Server/src/server.cpp @@ -53,18 +53,19 @@ Server::~Server(void) { } } -Server::Server(int port): TCPServer(port) { +Server::Server(const string& plant_filename, const Connection::Port& port): + TCPServer(port) { #ifdef DEBUG cerr << __FILE__ << ": port = " << port << endl; #endif // DEBUG // FIXME Glib::Mutex::Lock lock(plants_mutex); - plants["prueba"] = new Plant("prueba.xml"); - plants["prueba"]->signal_finished().connect( + plants["default"] = new Plant(plant_filename); + plants["default"]->signal_finished().connect( SigC::bind( SigC::slot_class(*this, &Server::on_plant_finished), - "prueba")); - plants["prueba"]->run(); + "default")); + plants["default"]->run(); } Connection* Server::new_connection( @@ -114,10 +115,10 @@ void Server::on_control_command_received(const Command& command, } else if (command.get_command() == "stop") { finish(); response = new HTTPResponse(HTTPMessage::OK, - "El server se apagará en instantes..."); + ""); } else { response = new HTTPResponse(HTTPMessage::NOT_FOUND, - "Invalid command for 'server' taget!"); + ""); } } else if (command.get_target() == "connection") { if (command.get_command() == "list") { @@ -126,7 +127,7 @@ void Server::on_control_command_received(const Command& command, response = cmd_connection_stop(command); } else { response = new HTTPResponse(HTTPMessage::NOT_FOUND, - "Invalid command for 'connection' taget!"); + ""); } } else if (command.get_target() == "transmission") { if (command.get_command() == "list") { @@ -137,22 +138,27 @@ void Server::on_control_command_received(const Command& command, response = cmd_transmission_stop(command); } else { response = new HTTPResponse(HTTPMessage::NOT_FOUND, - "Invalid command for 'transmission' taget!"); + ""); } } else if (command.get_target() == "plant") { if (command.get_command() == "list") { response = cmd_plant_list(); + } else if (command.get_command() == "get") { + response = cmd_plant_get(command); + } else if (command.get_command() == "set") { + response = cmd_plant_set(command); } else if (command.get_command() == "stop") { response = cmd_plant_stop(command); } else { response = new HTTPResponse(HTTPMessage::NOT_FOUND, - "Invalid command for 'plant' taget!"); + ""); } } else { - response = new HTTPResponse(HTTPMessage::NOT_FOUND, "Invalid taget!"); + response = new HTTPResponse(HTTPMessage::NOT_FOUND, + ""); } // FIXME - response->headers["Content-Type"] = "text/html; charset=iso-8859-1"; + response->headers["Content-Type"] = "text/xml; charset=iso-8859-1"; //response->headers["Connection"] = "close"; controlserver->send(*response); delete response; @@ -165,69 +171,32 @@ void Server::on_control_command_received(const Command& command, HTTPResponse* Server::cmd_server_status(void) const { // FIXME - stringstream response_xml; - response_xml << "" << endl; - response_xml << " " << endl; - response_xml << " PlaQui v0.8" << endl; - response_xml << " " << endl; - response_xml << " " << endl; - response_xml << "

PlaQui

" << endl; - response_xml << "

versión 0.8

" << 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 << "

" << endl; - response_xml << " " << endl; - response_xml << "" << endl; - return new HTTPResponse(HTTPMessage::OK, response_xml.str()); + stringstream xml; + xml << "" << endl; + xml << "\t0.9" << endl; + xml << "\t" << endl; + xml << "\t\tNicolás Dimov" << endl; + xml << "\t\tLeandro Lucarella" << endl; + xml << "\t\tRicardo Markiewicz" << endl; + xml << "\t" << endl; + xml << "" << endl; + return new HTTPResponse(HTTPMessage::OK, xml.str()); } HTTPResponse* Server::cmd_connection_list(void) { // FIXME TCPServer::ConnectionInfoList cil = get_connected(); - stringstream response_xml; - response_xml << "" << endl; - response_xml << " " << endl; - response_xml << " PlaQui v0.8" << endl; - response_xml << " " << endl; - response_xml << " " << endl; - response_xml << "

PlaQui

" << endl; - response_xml << "

versión 0.8

" << 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; + xml << "\t" << endl; + xml << "\t\t" << i->host << "" << endl; + xml << "\t\t" << i->port << "" << endl; + xml << "\t" << 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 << "

PlaQui

" << endl; - response_xml << "

versión 0.8

" << endl; - response_xml << "

Lista de transmisiones:

" << endl; - response_xml << "

" << (*i)->get_host() << ":" + stringstream xml; + xml << "" << endl; +/*TODO plants_mutex.lock(); + for (PlantList::const_iterator i = plants.begin(); + i != plants.end(); i++) { + trans + xml << "
" << (*i)->get_host() << ":" << (*i)->get_port() << " [get_host() << "/" << (*i)->get_port() << "\">desconectar]

" << 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; - return new HTTPResponse(HTTPMessage::OK, response_xml.str()); + xml << "" << endl; + return new HTTPResponse(HTTPMessage::OK, xml.str()); } HTTPResponse* Server::cmd_transmission_start(const Command& command) { const Command::Arguments& args = command.get_args(); if (args.size() < 3) { return new HTTPResponse(HTTPMessage::CONFLICT, - "Faltan argumentos."); + ""); } else { - const string& plant = args[0]; - const string& host = args[1]; - Connection::Port port = String(args[2]).to(port); + string plant = args[0]; + string host = args[1]; + Connection::Port port = to(args[2], port); Glib::Mutex::Lock lock(plants_mutex); PlantList::iterator p = plants.find(plant); if (p == plants.end()) { return new HTTPResponse(HTTPMessage::NOT_FOUND, - string("No existe la planta '") + plant + "'."); + string(""); // TODO - agregar chequeo de que la transmision a ese host:port no // exista para otra planta? } else if (plants[plant]->transmission_start(host, port)) { return new HTTPResponse(HTTPMessage::OK, - string("Se empieza a transmitir la planta '") + plant - + "' a " + host + ":" + args[1] + "."); + string(""); } else { return new HTTPResponse(HTTPMessage::INTERNAL_SERVER_ERROR, - string("Error al crear la transmisión a de la planta '") - + plant + "' a " + host + ":" + args[2] + "."); + string(""); } } } @@ -311,71 +266,110 @@ HTTPResponse* Server::cmd_transmission_stop(const Command& command) { const Command::Arguments& args = command.get_args(); if (args.size() < 2) { return new HTTPResponse(HTTPMessage::CONFLICT, - "Faltan argumentos."); + ""); } else { const string& host = args[0]; - Connection::Port port = String(args[1]).to(port); + Connection::Port port = to(args[1], port); for (PlantList::iterator i = plants.begin(); i != plants.end(); i++) { // TODO - agregar chequeo para saber si existe una conexion (para // tirar error de que no hay conexion o de que no se pudo // desconectar. if (i->second->transmission_stop(host, port)) { return new HTTPResponse(HTTPMessage::OK, - string("Se finaliza la transmisión de la planta '") - + i->first + "' a " + host + ":" + args[1] + "."); + string("first + "' a " + host + ":" + args[1] + ".\" />"); } } return new HTTPResponse(HTTPMessage::NOT_FOUND, - string("No se puede finalizar la transmisión a ") - + host + ":" + args[1] + "."); + string(""); } } HTTPResponse* Server::cmd_plant_list(void) { // FIXME - stringstream response_xml; - response_xml << "" << endl; - response_xml << " " << endl; - response_xml << " PlaQui v0.8" << endl; - response_xml << " " << endl; - response_xml << " " << endl; - response_xml << "

PlaQui

" << endl; - response_xml << "

versión 0.8

" << endl; - response_xml << "

Lista de plantas:

" << endl; - response_xml << "

" << endl; plants_mutex.lock(); for (PlantList::const_iterator i = plants.begin(); i != plants.end(); i++) { - response_xml << "

" << i->first - << " [first << "\">parar]

" - << endl; + xml << "\t" << endl; + xml << "\t\t" << i->first << "" << endl; + xml << "\t" << endl; } plants_mutex.unlock(); - 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; - return new HTTPResponse(HTTPMessage::OK, response_xml.str()); + xml << "" << endl; + return new HTTPResponse(HTTPMessage::OK, xml.str()); +} + +HTTPResponse* Server::cmd_plant_get(const Command& command) { + if (!command.get_args().size()) { + return new HTTPResponse(HTTPMessage::CONFLICT, + ""); + } + Glib::Mutex::Lock lock(plants_mutex); + string plant = command.get_args()[0]; + if (plants.find(plant) == plants.end()) { + return new HTTPResponse(HTTPMessage::NOT_FOUND, + string(""); + } + string xml = plants[plant]->get_xml(); + if (xml.length()) { + return new HTTPResponse(HTTPMessage::OK, xml); + } else { + return new HTTPResponse(HTTPMessage::INTERNAL_SERVER_ERROR, + (""); + } +} + +HTTPResponse* Server::cmd_plant_set(const Command& command) { + const Command::Arguments& args = command.get_args(); + if (args.size() < 4) { + return new HTTPResponse(HTTPMessage::CONFLICT, + ""); + } + string plant = args[0]; + string element = args[1]; + string key = args[2]; + if (key != "open") { + return new HTTPResponse(HTTPMessage::NOT_FOUND, + string(""); + } + string value = args[3]; + Glib::Mutex::Lock lock(plants_mutex); + PlantList::iterator p = plants.find(plant); + if (p == plants.end()) { + return new HTTPResponse(HTTPMessage::NOT_FOUND, + string(""); + } + bool open = true; + if ((value == "false") || (value == "0") || (value == "off") + || (value == "no")) { + open = false; + } + if (!plants[plant]->set_open(element, open)) { + return new HTTPResponse(HTTPMessage::CONFLICT, + string(""); + } + return new HTTPResponse(HTTPMessage::OK, + string(""); } HTTPResponse* Server::cmd_plant_stop(const Command& command) { if (!command.get_args().size()) { return new HTTPResponse(HTTPMessage::CONFLICT, - "Faltan argumentos."); + ""); } Glib::Mutex::Lock lock(plants_mutex); const string name = command.get_args()[0]; if (plants.find(name) == plants.end()) { return new HTTPResponse(HTTPMessage::NOT_FOUND, - string("No existe la planta ") + name); + string(""); } // TODO Ver si al frenar la planta se destruye (no deberia!!!) plants[name]->finish(); return new HTTPResponse(HTTPMessage::OK, - string("La planta '") + name + "' se cerrará en instantes..."); + string(""); } } // namespace Server