X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/dd5a5045d5549015b6500726098cb43d1e1c614c..9523acd2d7be7b8bbbf6d8c786c68c91f9fcc700:/Server/src/server.cpp?ds=sidebyside
diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 837295f..8f76922 100644
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -143,6 +143,10 @@ void Server::on_control_command_received(const Command& command,
} 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 {
@@ -153,7 +157,7 @@ void Server::on_control_command_received(const Command& command,
response = new HTTPResponse(HTTPMessage::NOT_FOUND, "Invalid taget!");
}
// 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;
@@ -167,37 +171,14 @@ 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 << " " << 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 << " - " << *i << "
" << 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_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());
}
@@ -205,29 +186,15 @@ 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;
+ 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 << "\t" << endl;
+ response_xml << "\t\t| " << i->host << " | " << endl;
+ response_xml << "\t\t" << i->port << " | " << endl;
+ response_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 << " " << endl;
- response_xml << " " << endl;
- response_xml << "" << endl;
+ response_xml << "" << endl;
return new HTTPResponse(HTTPMessage::OK, response_xml.str());
}
@@ -251,32 +218,18 @@ HTTPResponse* Server::cmd_connection_stop(const Command& command) {
HTTPResponse* Server::cmd_transmission_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 transmisiones:
" << endl;
- response_xml << " " << endl;
- // TODO - recorrer todas las plantas y sus transmisiones.
-/* transmissions_mutex.lock();
- for (TransmitterList::const_iterator i = transmissions.begin();
- i != transmissions.end(); i++) {
+ response_xml << "" << endl;
+/*TODO plants_mutex.lock();
+ for (PlantList::const_iterator i = plants.begin();
+ i != plants.end(); i++) {
+ trans
response_xml << " - " << (*i)->get_host() << ":"
<< (*i)->get_port() << " [get_host() << "/" << (*i)->get_port()
<< "\">desconectar]
" << endl;
}
transmissions_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;
+ response_xml << "" << endl;
return new HTTPResponse(HTTPMessage::OK, response_xml.str());
}
@@ -286,8 +239,8 @@ HTTPResponse* Server::cmd_transmission_start(const Command& command) {
return new HTTPResponse(HTTPMessage::CONFLICT,
"Faltan argumentos.");
} else {
- const string& plant = args[0];
- const string& host = args[1];
+ string plant = args[0];
+ string host = args[1];
Connection::Port port = String(args[2]).to(port);
Glib::Mutex::Lock lock(plants_mutex);
PlantList::iterator p = plants.find(plant);
@@ -299,7 +252,7 @@ HTTPResponse* Server::cmd_transmission_start(const Command& command) {
} 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] + ".");
+ + "' a " + host + ":" + String().from(port) + ".");
} else {
return new HTTPResponse(HTTPMessage::INTERNAL_SERVER_ERROR,
string("Error al crear la transmisión a de la planta '")
@@ -335,33 +288,63 @@ HTTPResponse* Server::cmd_transmission_stop(const Command& command) {
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;
+ response_xml << "" << endl;
plants_mutex.lock();
for (PlantList::const_iterator i = plants.begin();
i != plants.end(); i++) {
- response_xml << " - " << i->first
- << " [first << "\">parar]
"
- << endl;
+ response_xml << "\t" << endl;
+ response_xml << "\t\t| " << i->first << " | " << endl;
+ response_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;
+ response_xml << "" << endl;
return new HTTPResponse(HTTPMessage::OK, response_xml.str());
}
+HTTPResponse* Server::cmd_plant_get(const Command& command) {
+ if (!command.get_args().size()) {
+ return new HTTPResponse(HTTPMessage::CONFLICT,
+ "Faltan argumentos.");
+ }
+ 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);
+ }
+ string xml = plants[plant]->get_xml();
+ if (xml.length()) {
+ return new HTTPResponse(HTTPMessage::OK, xml);
+ } else {
+ return new HTTPResponse(HTTPMessage::INTERNAL_SERVER_ERROR,
+ ("No se pudo obtener el XML de la planta ") + plant);
+ }
+}
+
+HTTPResponse* 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.");
+ }
+ string plant = args[0];
+ string element = args[1];
+ string key = args[2];
+ 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 + "'.");
+ }
+/* 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);
+}
+
HTTPResponse* Server::cmd_plant_stop(const Command& command) {
if (!command.get_args().size()) {
return new HTTPResponse(HTTPMessage::CONFLICT,