}
}
-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<const char*>(
SigC::slot_class(*this, &Server::on_plant_finished),
- "prueba"));
- plants["prueba"]->run();
+ "default"));
+ plants["default"]->run();
}
Connection* Server::new_connection(
} else if (command.get_command() == "stop") {
finish();
response = new HTTPResponse(HTTPMessage::OK,
- "El server se apagará en instantes...");
+ "<response desc=\"El server se apagará en instantes...\" />");
} else {
response = new HTTPResponse(HTTPMessage::NOT_FOUND,
- "Invalid command for 'server' taget!");
+ "<response desc=\"Invalid command for 'server' taget!\" />");
}
} else if (command.get_target() == "connection") {
if (command.get_command() == "list") {
response = cmd_connection_stop(command);
} else {
response = new HTTPResponse(HTTPMessage::NOT_FOUND,
- "Invalid command for 'connection' taget!");
+ "<response desc=\"Invalid command for 'connection' taget!\" />");
}
} else if (command.get_target() == "transmission") {
if (command.get_command() == "list") {
response = cmd_transmission_stop(command);
} else {
response = new HTTPResponse(HTTPMessage::NOT_FOUND,
- "Invalid command for 'transmission' taget!");
+ "<response desc=\"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!");
+ "<response desc=\"Invalid command for 'plant' taget!\" />");
}
} else {
- response = new HTTPResponse(HTTPMessage::NOT_FOUND, "Invalid taget!");
+ response = new HTTPResponse(HTTPMessage::NOT_FOUND,
+ "<response desc=\"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;
HTTPResponse* Server::cmd_server_status(void) const {
// FIXME
- stringstream response_xml;
- response_xml << "<html>" << endl;
- response_xml << " <head>" << endl;
- response_xml << " <title>PlaQui v0.8</title>" << endl;
- response_xml << " </head>" << endl;
- response_xml << " <body>" << endl;
- response_xml << " <h1>PlaQui</h1>" << endl;
- response_xml << " <p>versión 0.8</p>" << endl;
-/* response_xml << " <h2>Comando</h2>" << endl;
- response_xml << " <ul>" << endl;
- response_xml << " <li><b>Target:</b> " << command.get_target() << endl;
- response_xml << " <li><b>Command:</b> " << command.get_command() << endl;
- response_xml << " <li><b>Argumentos:</b>" << endl;
- response_xml << " <ol>" << endl;
- for (Command::Arguments::const_iterator i = command.get_args().begin();
- i != command.get_args().end(); i++) {
- response_xml << " <li>" << *i << "</li>" << endl;
- }
- response_xml << " </ol>" << endl;
- response_xml << " </ul>" << endl;*/
- response_xml << " <h2>Desarrollado por</h2>" << endl;
- response_xml << " <ul>" << endl;
- response_xml << " <li>Nicolás Dimov.</li>" << endl;
- response_xml << " <li>Leandro Lucarella.</li>" << endl;
- response_xml << " <li>Ricardo Markiewicz.</li>" << endl;
- response_xml << " </ul>" << endl;
- response_xml << " <address>" << endl;
- response_xml << " Copyleft 2003 - bajo los " << endl;
- response_xml << " términos de la licencia GPL" << endl;
- response_xml << " </address>" << endl;
- response_xml << " </body>" << endl;
- response_xml << "</html>" << endl;
- return new HTTPResponse(HTTPMessage::OK, response_xml.str());
+ stringstream xml;
+ xml << "<serverstatus>" << endl;
+ xml << "\t<version>0.9</version>" << endl;
+ xml << "\t<authors>" << endl;
+ xml << "\t\t<author>Nicolás Dimov</author>" << endl;
+ xml << "\t\t<author>Leandro Lucarella</author>" << endl;
+ xml << "\t\t<author>Ricardo Markiewicz</author>" << endl;
+ xml << "\t</authors>" << endl;
+ xml << "</serverstatus>" << 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 << "<html>" << endl;
- response_xml << " <head>" << endl;
- response_xml << " <title>PlaQui v0.8</title>" << endl;
- response_xml << " </head>" << endl;
- response_xml << " <body>" << endl;
- response_xml << " <h1>PlaQui</h1>" << endl;
- response_xml << " <p>versión 0.8</p>" << endl;
- response_xml << " <h2>Lista de conexiones:</h2>" << endl;
- response_xml << " <ul>" << endl;
+ stringstream xml;
+ xml << "<list type=\"connection\">" << endl;
for (TCPServer::ConnectionInfoList::const_iterator i = cil.begin();
i != cil.end(); i++) {
- response_xml << " <li>" << i->host
- << ":" << i->port << " [<a href=\"/connection/stop/"
- << i->host << "/" << i->port << "\">deconectar</a>]</li>"
- << endl;
+ xml << "\t<row>" << endl;
+ xml << "\t\t<cell>" << i->host << "</cell>" << endl;
+ xml << "\t\t<cell>" << i->port << "</cell>" << endl;
+ xml << "\t</row>" << endl;
}
- response_xml << " </ul>" << endl;
- response_xml << " <address>" << endl;
- response_xml << " Copyleft 2003 - bajo los " << endl;
- response_xml << " términos de la licencia GPL" << endl;
- response_xml << " </address>" << endl;
- response_xml << " </body>" << endl;
- response_xml << "</html>" << endl;
- return new HTTPResponse(HTTPMessage::OK, response_xml.str());
+ xml << "</list>" << endl;
+ return new HTTPResponse(HTTPMessage::OK, xml.str());
}
HTTPResponse* Server::cmd_connection_stop(const Command& command) {
Connection::Port port;
if (args.size() < 2) {
return new HTTPResponse(HTTPMessage::CONFLICT,
- "Faltan argumentos.");
- } else if (disconnect(args[0], String(args[1]).to(port))) {
+ "<response desc=\"Faltan argumentos.\" />");
+ } else if (disconnect(args[0], to(args[1], port))) {
return new HTTPResponse(HTTPMessage::OK,
- string("La conexión a ") + args[0] + ":" + args[1]
- + " se cerrará en instantes...");
+ string("<response desc=\"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]);
+ string("<response desc=\"No existe una conexión a ") + args[0]
+ + ":" + args[1] + "\" />");
}
}
HTTPResponse* Server::cmd_transmission_list(void) {
// FIXME
- stringstream response_xml;
- response_xml << "<html>" << endl;
- response_xml << " <head>" << endl;
- response_xml << " <title>PlaQui v0.8</title>" << endl;
- response_xml << " </head>" << endl;
- response_xml << " <body>" << endl;
- response_xml << " <h1>PlaQui</h1>" << endl;
- response_xml << " <p>versión 0.8</p>" << endl;
- response_xml << " <h2>Lista de transmisiones:</h2>" << endl;
- response_xml << " <ul>" << 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 << " <li>" << (*i)->get_host() << ":"
+ stringstream xml;
+ xml << "<list type=\"transmission\">" << endl;
+/*TODO plants_mutex.lock();
+ for (PlantList::const_iterator i = plants.begin();
+ i != plants.end(); i++) {
+ trans
+ xml << " <li>" << (*i)->get_host() << ":"
<< (*i)->get_port() << " [<a href=\"/transmission/stop/"
<< (*i)->get_host() << "/" << (*i)->get_port()
<< "\">desconectar</a>]</li>" << endl;
}
transmissions_mutex.unlock();*/
- response_xml << " </ul>" << endl;
- response_xml << " <address>" << endl;
- response_xml << " Copyleft 2003 - bajo los " << endl;
- response_xml << " términos de la licencia GPL" << endl;
- response_xml << " </address>" << endl;
- response_xml << " </body>" << endl;
- response_xml << "</html>" << endl;
- return new HTTPResponse(HTTPMessage::OK, response_xml.str());
+ xml << "</list>" << 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.");
+ "<response desc=\"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("<response desc=\"No existe la planta '") + plant + "'.\" />");
// 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("<response desc=\"Se empieza a transmitir la planta '") + plant
+ + "' a " + host + ":" + String().from(port) + ".\" />");
} 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("<response desc=\"Error al crear la transmisión a de la planta '")
+ + plant + "' a " + host + ":" + args[2] + ".\" />");
}
}
}
const Command::Arguments& args = command.get_args();
if (args.size() < 2) {
return new HTTPResponse(HTTPMessage::CONFLICT,
- "Faltan argumentos.");
+ "<response desc=\"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("<response desc=\"Se finaliza la transmisión de la planta '")
+ + i->first + "' a " + host + ":" + args[1] + ".\" />");
}
}
return new HTTPResponse(HTTPMessage::NOT_FOUND,
- string("No se puede finalizar la transmisión a ")
- + host + ":" + args[1] + ".");
+ string("<response desc=\"No se puede finalizar la transmisión a ")
+ + host + ":" + args[1] + ".\" />");
}
}
HTTPResponse* Server::cmd_plant_list(void) {
// FIXME
- stringstream response_xml;
- response_xml << "<html>" << endl;
- response_xml << " <head>" << endl;
- response_xml << " <title>PlaQui v0.8</title>" << endl;
- response_xml << " </head>" << endl;
- response_xml << " <body>" << endl;
- response_xml << " <h1>PlaQui</h1>" << endl;
- response_xml << " <p>versión 0.8</p>" << endl;
- response_xml << " <h2>Lista de plantas:</h2>" << endl;
- response_xml << " <ul>" << endl;
+ stringstream xml;
+ xml << "<list type=\"plant\">" << endl;
plants_mutex.lock();
for (PlantList::const_iterator i = plants.begin();
i != plants.end(); i++) {
- response_xml << " <li>" << i->first
- << " [<a href=\"/plant/stop/" << i->first << "\">parar</a>]</li>"
- << endl;
+ xml << "\t<row>" << endl;
+ xml << "\t\t<cell>" << i->first << "</cell>" << endl;
+ xml << "\t</row>" << endl;
}
plants_mutex.unlock();
- response_xml << " </ul>" << endl;
- response_xml << " <address>" << endl;
- response_xml << " Copyleft 2003 - bajo los " << endl;
- response_xml << " términos de la licencia GPL" << endl;
- response_xml << " </address>" << endl;
- response_xml << " </body>" << endl;
- response_xml << "</html>" << endl;
- return new HTTPResponse(HTTPMessage::OK, response_xml.str());
+ xml << "</list>" << 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,
+ "<response desc=\"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("<response desc=\"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,
+ ("<response desc=\"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,
+ "<response desc=\"Faltan argumentos.\" />");
+ }
+ string plant = args[0];
+ string element = args[1];
+ string key = args[2];
+ if (key != "open") {
+ return new HTTPResponse(HTTPMessage::NOT_FOUND,
+ string("<response desc=\"La clave '") + key + "' es inválida.\" />");
+ }
+ 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("<response desc=\"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 HTTPResponse(HTTPMessage::CONFLICT,
+ string("<response desc=\"No se pudo cambiar el estado del elemento '") + element + "'.\" />");
+ }
+ return new HTTPResponse(HTTPMessage::OK,
+ string("<response desc=\"Se cambió el estado del elemento '") + element + "'.\" />");
}
HTTPResponse* Server::cmd_plant_stop(const Command& command) {
if (!command.get_args().size()) {
return new HTTPResponse(HTTPMessage::CONFLICT,
- "Faltan argumentos.");
+ "<response desc=\"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("<response desc=\"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...");
+ string("<response desc=\"La planta '") + name + "' se cerrará en instantes...\" />");
}
} // namespace Server
projects / z.facultad / 75.42 / plaqui.git / blobdiff