X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/6bffb655ac989fe4f115763270f84175bf24e4bb..eb95b779b5006ce4ef16ee1ffc1d15557d31ccef:/Server/src/server.cpp?ds=sidebyside diff --git a/Server/src/server.cpp b/Server/src/server.cpp index 375087a..837295f 100644 --- a/Server/src/server.cpp +++ b/Server/src/server.cpp @@ -46,25 +46,28 @@ Server::~Server(void) { #ifdef DEBUG cerr << __FILE__ << ": 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); + } } -Server::Server(int 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["default"] = new Plant(plant_filename); + plants["default"]->signal_finished().connect( + SigC::bind( + SigC::slot_class(*this, &Server::on_plant_finished), + "default")); + plants["default"]->run(); } -/// \todo Implementar. -bool Server::start_transmission(string host, int port) { -#ifdef DEBUG - cerr << __FILE__ << ": start_transmission(host = " << host - << " | port = " << port << ")" << endl; -#endif // DEBUG - // TODO - return false; -} - Connection* Server::new_connection( const sockbuf::sockdesc& sd) { #ifdef DEBUG @@ -81,121 +84,299 @@ Connection* Server::new_connection( return connection; } -/// \todo Implementar. -bool Server::stop_transmission(string host, int port) { +void Server::on_plant_updated(const Plant* plant) { #ifdef DEBUG - cerr << __FILE__ << ": stop_transmission(host = " << host - << " | port = " << port << ")" << endl; + cerr << __FILE__ << ": on_plant_updated(plant = " << plant << ")." << endl; #endif // DEBUG - // TODO - return false; } -/// \todo Implementar. +void Server::on_plant_finished(const char* plant) { +#ifdef DEBUG + cerr << __FILE__ << ": 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* server) { + ControlServer* controlserver) { #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); + HTTPResponse* response; + //bool stop_controlserver = false; 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 << "

" << endl; - response_xml << " " << endl; - response_xml << "" << endl; - response.status_code = HTTPMessage::OK; - response.set_body(response_xml.str()); + response = cmd_server_status(); } else if (command.get_command() == "stop") { - stop = true; - response.set_body("El server se apagará en instantes..."); + finish(); + response = new HTTPResponse(HTTPMessage::OK, + "El server se apagará en instantes..."); } else { - response.status_code = HTTPMessage::NOT_FOUND; - response.set_body("Invalid command for 'server' taget!"); + response = new HTTPResponse(HTTPMessage::NOT_FOUND, + "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 << "

" << 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()); + response = cmd_connection_list(); } else if (command.get_command() == "stop") { - // TODO server->finish(); - response.set_body("La conexión se cerrará en instantes..."); + response = cmd_connection_stop(command); } else { - response.status_code = HTTPMessage::NOT_FOUND; - response.set_body("Invalid command for 'connection' taget!"); + response = new HTTPResponse(HTTPMessage::NOT_FOUND, + "Invalid command for 'connection' taget!"); } } else if (command.get_target() == "transmission") { + if (command.get_command() == "list") { + response = cmd_transmission_list(); + } else if (command.get_command() == "start") { + response = cmd_transmission_start(command); + } else if (command.get_command() == "stop") { + 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() == "stop") { + response = cmd_plant_stop(command); + } else { + response = new HTTPResponse(HTTPMessage::NOT_FOUND, + "Invalid command for 'plant' taget!"); + } } else { - response.status_code = HTTPMessage::NOT_FOUND; - response.set_body("Invalid Target!"); + response = new HTTPResponse(HTTPMessage::NOT_FOUND, "Invalid taget!"); + } + // FIXME + response->headers["Content-Type"] = "text/html; 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 << " " << endl; + response_xml << " PlaQui v0.8" << endl; + response_xml << " " << endl; + response_xml << " " << endl; + response_xml << "

PlaQui