- Se arregla el bug de ControlClient::get_host() y ControlClient::get_port().

[z.facultad/75.42/plaqui.git] / Server / src / server.cpp

diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 73963babf8597e797f4a99d451992a1f9c114e85..8704d696af2645528786b967c20a16a3d7912149 100644 (file)
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -46,25 +46,27 @@ Server::~Server(void) {
 #ifdef DEBUG
        cerr << __FILE__ <<  ": destructor." << endl;
 #endif // DEBUG
 #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):
-               TCPServer(port) {
+Server::Server(int port): TCPServer(port) {

 #ifdef DEBUG
        cerr << __FILE__ <<  ": port = " << port << endl;
 #endif // DEBUG
 #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(
+                       SigC::bind<const char*>(
+                               SigC::slot_class(*this, &Server::on_plant_finished),
+                               "prueba"));
+       plants["prueba"]->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
 Connection* Server::new_connection(
                const sockbuf::sockdesc& sd) {
 #ifdef DEBUG


@@ -81,35 +83,97 @@ Connection* Server::new_connection(
        return 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__ << ": on_plant_updated(plant = " << plant << ")." << endl;
+#endif // DEBUG
+}
+
+void Server::on_plant_finished(const char* plant) {

 #ifdef DEBUG
 #ifdef DEBUG

-       cerr << __FILE__ <<  ": stop_transmission(host = " << host
-               << " | port = " << port << ")" << endl;
+       cerr << __FILE__ <<  ": on_plant_finished(plant_name = " << plant << endl;

 #endif // DEBUG
 #endif // DEBUG

-       // TODO
-       return false;
+       Glib::Mutex::Lock lock(plants_mutex);
+       plants.erase(plant);

 }
 
 }
 

-/// \todo Implementar.
+/// \todo Terminar de implementar.

 void Server::on_control_command_received(const Command& command,
 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
 #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

-       // TODO, seguir aca!
+       HTTPResponse* response;
+       //bool stop_controlserver = false;
+       if (command.get_target() == "server") {
+               if (command.get_command() == "status") {
+                       response = cmd_server_status();
+               } else if (command.get_command() == "stop") {
+                       finish();
+                       response = new HTTPResponse(HTTPMessage::OK,
+                                       "El server se apagará en instantes...");
+               } else {
+                       response = new HTTPResponse(HTTPMessage::NOT_FOUND,
+                                       "Invalid command for 'server' taget!");
+               }
+       } else if (command.get_target() == "connection") {
+               if (command.get_command() == "list") {
+                       response = cmd_connection_list();
+               } else if (command.get_command() == "stop") {
+                       response = cmd_connection_stop(command);
+               } else {
+                       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 = 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 << "<html>" << endl;
        response_xml << "    <head>" << endl;
        stringstream response_xml;
        response_xml << "<html>" << endl;
        response_xml << "    <head>" << endl;

-       response_xml << "        <title>PlaQui v0.4</title>" << 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 << "    </head>" << endl;
        response_xml << "    <body>" << endl;
        response_xml << "        <h1>PlaQui</h1>" << endl;

-       response_xml << "        <p>versión 0.4</p>" << endl;
-       response_xml << "        <h2>Comando</h2>" << 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 << "        <ul>" << endl;
        response_xml << "           <li><b>Target:</b> " << command.get_target() << endl;
        response_xml << "           <li><b>Command:</b> " << command.get_command() << endl;


@@ -120,7 +184,7 @@ void Server::on_control_command_received(const Command& command,
                response_xml << "                   <li>" << *i << "</li>" << endl;
        }
        response_xml << "               </ol>" << endl;
                response_xml << "                   <li>" << *i << "</li>" << endl;
        }
        response_xml << "               </ol>" << endl;

-       response_xml << "        </ul>" << 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 << "        <h2>Desarrollado por</h2>" << endl;
        response_xml << "        <ul>" << endl;
        response_xml << "            <li>Nicolás Dimov.</li>" << endl;


@@ -133,11 +197,186 @@ void Server::on_control_command_received(const Command& command,
        response_xml << "        </address>" << endl;
        response_xml << "    </body>" << endl;
        response_xml << "</html>" << endl;
        response_xml << "        </address>" << endl;
        response_xml << "    </body>" << endl;
        response_xml << "</html>" << endl;

-       HTTPResponse response(HTTPMessage::OK, response_xml.str());
-       response.headers["Content-Type"] = "text/html; charset=iso-8859-1";
-       //response.headers["Connection"] = "close";
-               server->send(response);
+       return new HTTPResponse(HTTPMessage::OK, response_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;
+       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 << "        </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());
+}
+
+HTTPResponse* 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...");
+       } else {
+               return new HTTPResponse(HTTPMessage::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 << "<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() << ":"
+                       << (*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());
+}
+
+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.");
+       } else {
+               const string& plant = args[0];
+               const string& host = args[1];
+               Connection::Port port = String(args[2]).to(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?
+               } 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] + ".");
+               } else {
+                       return new HTTPResponse(HTTPMessage::INTERNAL_SERVER_ERROR,
+                                       string("Error al crear la transmisión a de la planta '")
+                                       + plant + "' a " + host + ":" + args[2] + ".");
+               }
+       }
+}
+
+HTTPResponse* 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.");
+       } else {
+               const string& host = args[0];
+               Connection::Port port = String(args[1]).to(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 HTTPResponse(HTTPMessage::NOT_FOUND,
+                               string("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;
+       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;
+       }
+       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());
+}
+
+HTTPResponse* Server::cmd_plant_stop(const Command& command) {
+       if (!command.get_args().size()) {
+               return new HTTPResponse(HTTPMessage::CONFLICT,
+                               "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);
+       }
+       // 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...");
+}

 
 } // namespace Server
 
 
 } // namespace Server