]> git.llucax.com Git - z.facultad/75.42/plaqui.git/blobdiff - Server/src/server.cpp
projects / z.facultad / 75.42 / plaqui.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- Se limpian un poco las respuestas, ahora lo que van a ser respuestas reales,
[z.facultad/75.42/plaqui.git] / Server / src / server.cpp
diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 837295fbb071f54ba1753e0dd57283f32d5b8871..8f7692204cab0ff61d27dae60ba8f1281f3627f4 100644 (file)
--- 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_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 {
                } 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 = 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;
        //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;
 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;
+       response_xml << "<serverstatus>" << endl;
+       response_xml << "\t<version>0.9</version>" << endl;
+       response_xml << "\t<authors>" << endl;
+       response_xml << "\t\t<author>Nicolás Dimov</author>" << endl;
+       response_xml << "\t\t<author>Leandro Lucarella</author>" << endl;
+       response_xml << "\t\t<author>Ricardo Markiewicz</author>" << endl;
+       response_xml << "\t</authors>" << endl;
+       response_xml << "</serverstatus>" << endl;
        return new HTTPResponse(HTTPMessage::OK, response_xml.str());
 }
 
        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;
        // 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;
+       response_xml << "<list type=\"connection\">" << endl;
        for (TCPServer::ConnectionInfoList::const_iterator i = cil.begin();
                        i != cil.end(); i++) {
        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;
+               response_xml << "\t<row>" << endl;
+               response_xml << "\t\t<cell>" << i->host << "</cell>" << endl;
+               response_xml << "\t\t<cell>" << i->port << "</cell>" << endl;
+               response_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;
+       response_xml << "</list>" << endl;
        return new HTTPResponse(HTTPMessage::OK, response_xml.str());
 }
 
        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;
 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 << "<list type=\"transmission\">" << endl;
+/*TODO plants_mutex.lock();
+       for (PlantList::const_iterator i = plants.begin();
+                       i != plants.end(); i++) {
+               trans
                response_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 << "       <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;
+       response_xml << "</list>" << endl;
        return new HTTPResponse(HTTPMessage::OK, response_xml.str());
 }
 
        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 {
                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);
                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
                } 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 '")
                } 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;
 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;
+       response_xml << "<list type=\"plant\">" << endl;
        plants_mutex.lock();
        for (PlantList::const_iterator i = plants.begin();
                        i != plants.end(); i++) {
        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;
+               response_xml << "\t<row>" << endl;
+               response_xml << "\t\t<cell>" << i->first << "</cell>" << endl;
+               response_xml << "\t</row>" << endl;
        }
        plants_mutex.unlock();
        }
        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;
+       response_xml << "</list>" << endl;
        return new HTTPResponse(HTTPMessage::OK, response_xml.str());
 }
 
        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,
 HTTPResponse* Server::cmd_plant_stop(const Command& command) {
        if (!command.get_args().size()) {
                return new HTTPResponse(HTTPMessage::CONFLICT,
Simulador de planta química (TP Final de Taller I)