X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/e4f66a8221e3f2156d89a7a358073863503b2564..HEAD:/Server/src/server.cpp diff --git a/Server/src/server.cpp b/Server/src/server.cpp index 8f76922..692db97 100644 --- a/Server/src/server.cpp +++ b/Server/src/server.cpp @@ -26,13 +26,14 @@ // #include "plaqui/server/server.h" +#include "plaqui/server/string.h" #include "plaqui/server/connection.h" #include "plaqui/server/controlserver.h" #include -// FIXME - sacar sstream (a menos que se necesite) +#include #include +#include #ifdef DEBUG -# include "plaqui/server/string.h" # include #endif // DEBUG @@ -44,81 +45,96 @@ namespace Server { Server::~Server(void) { #ifdef DEBUG - cerr << __FILE__ << ": destructor." << endl; + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": destructor." << endl; #endif // DEBUG - // Termino plantas. - Glib::Mutex::Lock lock(plants_mutex); - for (PlantList::iterator i = plants.end(); i != plants.end(); i++) { - i->second->finish(true); + // Mando a terminar todas las plantas. + plants_mutex.lock(); + for (PlantList::iterator i = plants.begin(); i != plants.end(); i++) { + i->second->finish(); + } + PlantList::size_type count = plants.size(); + plants_mutex.unlock(); + // Espero que terminen realmente. + while (count) { + Glib::usleep(10000); // 10 milisegundos + plants_mutex.lock(); + count = plants.size(); + plants_mutex.unlock(); } } -Server::Server(const string& plant_filename, const Connection::Port& port): - TCPServer(port) { +Server::Server(const Connection::Port& port) + throw(sockerr): TCPServer(port) { #ifdef DEBUG - cerr << __FILE__ << ": port = " << port << endl; + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": port = " << port << endl; #endif // DEBUG - // FIXME +} + +bool Server::add_plant(const string& name, const string& filename) { Glib::Mutex::Lock lock(plants_mutex); - plants["default"] = new Plant(plant_filename); - plants["default"]->signal_finished().connect( - SigC::bind( + if (plants.find(name) == plants.end()) { // No existe + plants[name] = new Plant(filename); + plants[name]->signal_finished().connect(SigC::bind( SigC::slot_class(*this, &Server::on_plant_finished), - "default")); - plants["default"]->run(); + name.c_str())); + plants[name]->run(); + return true; + } + return false; } -Connection* Server::new_connection( - const sockbuf::sockdesc& sd) { +Connection* Server::new_connection(const sockbuf::sockdesc& sd) { #ifdef DEBUG - cerr << __FILE__ << ": new_connection(sd = " << sd.sock << ")" + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": new_connection(sd = " << sd.sock << ")" << endl; #endif // DEBUG ControlServer* connection = new ControlServer(sd); - // TODO verificar si el new se hace bien? no creo. - connection->signal_command_received().connect( - SigC::bind( - SigC::slot_class(*this, &Server::on_control_command_received), - connection)); - // TODO: + connection->signal_command_received().connect(SigC::bind( + SigC::slot_class(*this, &Server::on_control_command_received), + connection)); return connection; } -void Server::on_plant_updated(const Plant* plant) { -#ifdef DEBUG - cerr << __FILE__ << ": on_plant_updated(plant = " << plant << ")." << endl; -#endif // DEBUG -} - void Server::on_plant_finished(const char* plant) { #ifdef DEBUG - cerr << __FILE__ << ": on_plant_finished(plant_name = " << plant << endl; + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": on_plant_finished(plant_name = " << plant << endl; #endif // DEBUG Glib::Mutex::Lock lock(plants_mutex); plants.erase(plant); } -/// \todo Terminar de implementar. void Server::on_control_command_received(const Command& command, ControlServer* controlserver) { #ifdef DEBUG - cerr << __FILE__ << ": on_control_command_received(target = " + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": on_control_command_received(target = " << command.get_target() << ", command = " << command.get_command() << ", args = [" << String::join(command.get_args(), ", ") << "])" << endl; #endif // DEBUG - HTTPResponse* response; - //bool stop_controlserver = false; + Response* response; if (command.get_target() == "server") { - if (command.get_command() == "status") { - response = cmd_server_status(); + if (command.get_command() == "info") { + response = cmd_server_info(); } else if (command.get_command() == "stop") { + response = new Response(Response::OK, + "El server se cerrará en instantes"); + // XXX - Sin mandar la respuesta enseguida podría ser que el server + // cierre la conexión antes de mandar la respuesta. En las pruebas + // esto nunca pasó. + //response->headers["Content-Type"] = "text/xml; charset=iso-8859-1"; + //controlserver->send(*response); + //delete response; finish(); - response = new HTTPResponse(HTTPMessage::OK, - "El server se apagará en instantes..."); + //return; } else { - response = new HTTPResponse(HTTPMessage::NOT_FOUND, - "Invalid command for 'server' taget!"); + response = new Response(Response::INVALID_COMMAND, + command.get_command() + " es un comando inválido para " + + "el destino 'server'"); } } else if (command.get_target() == "connection") { if (command.get_command() == "list") { @@ -126,8 +142,9 @@ void Server::on_control_command_received(const Command& command, } else if (command.get_command() == "stop") { response = cmd_connection_stop(command); } else { - response = new HTTPResponse(HTTPMessage::NOT_FOUND, - "Invalid command for 'connection' taget!"); + response = new Response(Response::INVALID_COMMAND, + command.get_command() + " es un comando inválido para " + + "el destino 'connection'"); } } else if (command.get_target() == "transmission") { if (command.get_command() == "list") { @@ -137,8 +154,9 @@ void Server::on_control_command_received(const Command& command, } else if (command.get_command() == "stop") { response = cmd_transmission_stop(command); } else { - response = new HTTPResponse(HTTPMessage::NOT_FOUND, - "Invalid command for 'transmission' taget!"); + response = new Response(Response::INVALID_COMMAND, + command.get_command() + " es un comando inválido para " + + "el destino 'transmission'"); } } else if (command.get_target() == "plant") { if (command.get_command() == "list") { @@ -147,219 +165,282 @@ void Server::on_control_command_received(const Command& command, response = cmd_plant_get(command); } else if (command.get_command() == "set") { response = cmd_plant_set(command); + } else if (command.get_command() == "set_frequency") { + response = cmd_plant_set_frequency(command); + } else if (command.get_command() == "start") { + response = cmd_plant_start(command); } else if (command.get_command() == "stop") { response = cmd_plant_stop(command); + } else if (command.get_command() == "remove") { + response = cmd_plant_remove(command); } else { - response = new HTTPResponse(HTTPMessage::NOT_FOUND, - "Invalid command for 'plant' taget!"); + response = new Response(Response::INVALID_COMMAND, + command.get_command() + " es un comando inválido para " + + "el destino 'plant'"); } } else { - response = new HTTPResponse(HTTPMessage::NOT_FOUND, "Invalid taget!"); + response = new Response(Response::INVALID_TARGET, command.get_target() + + " es un destino inválido"); } - // FIXME - response->headers["Content-Type"] = "text/xml; charset=iso-8859-1"; - //response->headers["Connection"] = "close"; controlserver->send(*response); delete response; - // FIXME con timeout no debería ser necesario. Verificar cabecera Connection - // para saber si hay que finish()earlo o no. - //if (stop_controlserver) { - // controlserver->finish(); - //} } -HTTPResponse* Server::cmd_server_status(void) const { - // FIXME - stringstream response_xml; - response_xml << "" << endl; - response_xml << "\t0.9" << endl; - response_xml << "\t" << endl; - response_xml << "\t\tNicolás Dimov" << endl; - response_xml << "\t\tLeandro Lucarella" << endl; - response_xml << "\t\tRicardo Markiewicz" << endl; - response_xml << "\t" << endl; - response_xml << "" << endl; - return new HTTPResponse(HTTPMessage::OK, response_xml.str()); +Response* Server::cmd_server_info(void) const { + stringstream xml; + xml << "" << endl; + xml << "\t" VERSION "" << 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 Response(xml.str()); } -HTTPResponse* Server::cmd_connection_list(void) { - // FIXME +Response* Server::cmd_connection_list(void) { + // TODO implementar con lista genérica. TCPServer::ConnectionInfoList cil = get_connected(); - stringstream response_xml; - response_xml << "" << endl; + stringstream xml; + xml << "" << endl; for (TCPServer::ConnectionInfoList::const_iterator i = cil.begin(); i != cil.end(); i++) { - response_xml << "\t" << endl; - response_xml << "\t\t" << i->host << "" << endl; - response_xml << "\t\t" << i->port << "" << endl; - response_xml << "\t" << endl; + xml << "\t" << endl; + xml << "\t\t" << i->host << "" << endl; + xml << "\t\t" << i->port << "" << endl; + xml << "\t" << endl; } - response_xml << "" << endl; - return new HTTPResponse(HTTPMessage::OK, response_xml.str()); + xml << "" << endl; + return new Response(xml.str()); } -HTTPResponse* Server::cmd_connection_stop(const Command& command) { +Response* Server::cmd_connection_stop(const Command& command) { const Command::Arguments& args = command.get_args(); Connection::Port port; if (args.size() < 2) { - return new HTTPResponse(HTTPMessage::CONFLICT, - "Faltan argumentos."); - } else if (disconnect(args[0], String(args[1]).to(port))) { - return new HTTPResponse(HTTPMessage::OK, - string("La conexión a ") + args[0] + ":" + args[1] - + " se cerrará en instantes..."); + return new Response(Response::ARGUMENT_MISSING, "Faltan argumentos " + " para el comando 'stop' del destino 'connection'"); + } else if (disconnect(args[0], to(args[1], port))) { + return new Response(Response::OK, string("La conexión a ") + args[0] + + ":" + args[1] + " se cerrará en instantes"); } else { - return new HTTPResponse(HTTPMessage::NOT_FOUND, - string("No existe una conexión a ") + args[0] - + ":" + args[1]); + return new Response(Response::CONNECTION_NOT_FOUND, + string("No existe una conexión a ") + args[0] + ":" + args[1]); } } -HTTPResponse* Server::cmd_transmission_list(void) { - // FIXME - stringstream response_xml; - response_xml << "" << endl; -/*TODO plants_mutex.lock(); +Response* Server::cmd_transmission_list(void) { + // TODO implementar con lista genérica. + stringstream xml; + xml << "" << endl; +/*FIXME plants_mutex.lock(); for (PlantList::const_iterator i = plants.begin(); i != plants.end(); i++) { trans - response_xml << "
  • " << (*i)->get_host() << ":" + xml << "
  • " << (*i)->get_host() << ":" << (*i)->get_port() << " [get_host() << "/" << (*i)->get_port() << "\">desconectar]
  • " << endl; } transmissions_mutex.unlock();*/ - response_xml << "
    " << endl; - return new HTTPResponse(HTTPMessage::OK, response_xml.str()); + xml << "
    " << endl; + return new Response(xml.str()); } -HTTPResponse* Server::cmd_transmission_start(const Command& command) { +Response* 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."); + return new Response(Response::ARGUMENT_MISSING, "Faltan argumentos " + " para el comando 'start' del destino 'transmission'"); } else { string plant = args[0]; string host = args[1]; - Connection::Port port = String(args[2]).to(port); + 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 + "'."); - // TODO - agregar chequeo de que la transmision a ese host:port no - // exista para otra planta? + return new Response(Response::PLANT_NOT_FOUND, + string("No existe la planta '") + plant + "'"); + // FIXME - agregar chequeo de que la transmision a ese host:port no exista. + // que use respuesta ALLREADY_EXISTS } else if (plants[plant]->transmission_start(host, port)) { - return new HTTPResponse(HTTPMessage::OK, + return new Response(Response::OK, string("Se empieza a transmitir la planta '") + plant - + "' a " + host + ":" + String().from(port) + "."); + + "' a " + host + ":" + String().from(port)); } else { - return new HTTPResponse(HTTPMessage::INTERNAL_SERVER_ERROR, + return new Response(Response::ERROR_STARTING_TRANSMISSION, string("Error al crear la transmisión a de la planta '") - + plant + "' a " + host + ":" + args[2] + "."); + + plant + "' a " + host + ":" + args[2]); } } } -HTTPResponse* Server::cmd_transmission_stop(const Command& command) { +Response* 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."); + return new Response(Response::ARGUMENT_MISSING, "Faltan argumentos " + " para el comando 'stop' del destino 'transmission'"); } 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] + "."); + return new Response(Response::OK, + string("La transmisión de la planta '") + i->first + + "' a " + host + ":" + args[1] + + " se cerrará en instantes"); } } - return new HTTPResponse(HTTPMessage::NOT_FOUND, - string("No se puede finalizar la transmisión a ") - + host + ":" + args[1] + "."); + return new Response(Response::TRANSMISSION_NOT_FOUND, + string("No existe una transmisión a ") + host + ":" + args[1]); } } -HTTPResponse* Server::cmd_plant_list(void) { - // FIXME - stringstream response_xml; - response_xml << "" << endl; +Response* Server::cmd_plant_list(void) { + // FIXME hacer con ResponseList + stringstream xml; + xml << "" << endl; plants_mutex.lock(); for (PlantList::const_iterator i = plants.begin(); i != plants.end(); i++) { - response_xml << "\t" << endl; - response_xml << "\t\t" << i->first << "" << endl; - response_xml << "\t" << endl; + xml << "\t" << endl; + xml << "\t\t" << i->first << "" << endl; + xml << "\t" << endl; } plants_mutex.unlock(); - response_xml << "" << endl; - return new HTTPResponse(HTTPMessage::OK, response_xml.str()); + xml << "" << endl; + return new Response(xml.str()); } -HTTPResponse* Server::cmd_plant_get(const Command& command) { +Response* Server::cmd_plant_get(const Command& command) { if (!command.get_args().size()) { - return new HTTPResponse(HTTPMessage::CONFLICT, - "Faltan argumentos."); + return new Response(Response::ARGUMENT_MISSING, "Faltan argumentos " + " para el comando 'get' del destino 'plant'"); } 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("No existe la planta ") + plant); + return new Response(Response::PLANT_NOT_FOUND, + string("No existe la planta '") + plant + "'"); } string xml = plants[plant]->get_xml(); if (xml.length()) { - return new HTTPResponse(HTTPMessage::OK, xml); + return new Response(xml); } else { - return new HTTPResponse(HTTPMessage::INTERNAL_SERVER_ERROR, - ("No se pudo obtener el XML de la planta ") + plant); + return new Response(Response::ERROR_GETING_PLANT_XML, + ("No se pudo obtener el XML de la planta '") + plant + "'"); } } -HTTPResponse* Server::cmd_plant_set(const Command& command) { +Response* Server::cmd_plant_set(const Command& command) { const Command::Arguments& args = command.get_args(); if (args.size() < 4) { - return new HTTPResponse(HTTPMessage::CONFLICT, - "Faltan argumentos."); + return new Response(Response::ARGUMENT_MISSING, "Faltan argumentos " + " para el comando 'set' del destino 'plant'"); } string plant = args[0]; string element = args[1]; - string key = args[2]; + string input = args[2]; + if (input != "open") { + return new Response(Response::ELEMENT_INPUT_NOT_FOUND, + string("El elemento '") + element + "' de la planta '" + plant + + "' no tiene una entrada '" + input + "'"); + } 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("No existe la planta '") + plant + "'."); + return new Response(Response::PLANT_NOT_FOUND, + string("No existe la planta '") + plant + "'"); + } + bool open = true; + if ((value == "false") || (value == "0") || (value == "off") + || (value == "no")) { + open = false; + } + if (!plants[plant]->set_open(element, open)) { + return new Response(Response::ERROR_CHANGING_ELEMENT_INPUT, + string("No se pudo cambiar la entrada '") + input + + "' del elemento '" + element + "' de la planta '" + + plant + "'"); + } + return new Response(Response::OK, + string("Se cambió la entrada '") + input + "' del elemento '" + + element + "' de la planta '" + plant + "' a '" + value + "'"); +} + +Response* Server::cmd_plant_set_frequency(const Command& command) { + if (command.get_args().size() < 2) { + return new Response(Response::ARGUMENT_MISSING, "Faltan argumentos " + " para el comando 'set_frequency' del destino 'plant'"); + } + Glib::Mutex::Lock lock(plants_mutex); + const string name = command.get_args()[0]; + if (plants.find(name) == plants.end()) { + return new Response(Response::PLANT_NOT_FOUND, + string("No existe la planta '") + name + "'"); + } + unsigned hz; + to(command.get_args()[1], hz); + plants[name]->set_frequency(hz); + String shz; + shz.from(hz); + return new Response(Response::OK, + string("Se cambió la frecuencia de refresco de la planta '") + name + + "' a '" + shz + "' veces por segundo"); +} + +Response* Server::cmd_plant_start(const Command& command) { + if (!command.get_args().size()) { + return new Response(Response::ARGUMENT_MISSING, "Faltan argumentos " + " para el comando 'start' del destino 'plant'"); + } + Glib::Mutex::Lock lock(plants_mutex); + const string name = command.get_args()[0]; + if (plants.find(name) == plants.end()) { + return new Response(Response::PLANT_NOT_FOUND, + string("No existe la planta '") + name + "'"); + } + plants[name]->set_paused(false); + return new Response(Response::OK, + string("La planta '") + name + "' fue reanudada"); +} + +Response* Server::cmd_plant_stop(const Command& command) { + if (!command.get_args().size()) { + return new Response(Response::ARGUMENT_MISSING, "Faltan argumentos " + " para el comando 'stop' del destino 'plant'"); + } + Glib::Mutex::Lock lock(plants_mutex); + const string name = command.get_args()[0]; + if (plants.find(name) == plants.end()) { + return new Response(Response::PLANT_NOT_FOUND, + string("No existe la planta '") + name + "'"); } -/* if (!plants[plant]->set_element(host, port)) { - return new HTTPResponse(HTTPMessage::INTERNAL_SERVER_ERROR, - string("Error al crear la transmisión a de la planta '") - + plant + "' a " + host + ":" + args[2] + "."); - }*/ - return new HTTPResponse(HTTPMessage::OK); + plants[name]->set_paused(true); + return new Response(Response::OK, + string("La planta '") + name + "' fue pausada"); } -HTTPResponse* Server::cmd_plant_stop(const Command& command) { +Response* Server::cmd_plant_remove(const Command& command) { if (!command.get_args().size()) { - return new HTTPResponse(HTTPMessage::CONFLICT, - "Faltan argumentos."); + return new Response(Response::ARGUMENT_MISSING, "Faltan argumentos " + " para el comando 'remove' del destino 'plant'"); } 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); + return new Response(Response::PLANT_NOT_FOUND, + string("No existe la planta '") + name + "'"); } - // 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..."); + return new Response(Response::OK, + string("La planta '") + name + "' fue será removida del servidor " + "en instantes"); } } // namespace Server