]> git.llucax.com Git - z.facultad/75.42/plaqui.git/blobdiff - Server/include/plaqui/server/server.h
cambio la sintaxis XML de las compuertas
[z.facultad/75.42/plaqui.git] / Server / include / plaqui / server / server.h
index ae83251fd9322dfc49fbaca2825684ac0e2e4cbd..cae6f7cc7eb2de37bf2cc567dfa93d78f4d15e0a 100644 (file)
 
 #include "plaqui/server/tcpserver.h"
 #include "plaqui/server/controlserver.h"
-#include "plaqui/server/transmitter.h"
+//#include "plaqui/server/transmitter.h"
 #include "plaqui/server/plant.h"
 #include "plaqui/server/command.h"
+#include "plaqui/server/response.h"
 #include <socket++/sockinet.h>
 #include <string>
 #include <map>
@@ -47,6 +48,7 @@ namespace Server {
         */
        class Server: public TCPServer {
 
+               /////////////////////////////////////////////////////////////////////
                // Tipos.
 
                private:
@@ -54,6 +56,7 @@ namespace Server {
                        /// Lista de plantas químicas.
                        typedef std::map<std::string, Plant*> PlantList;
 
+               /////////////////////////////////////////////////////////////////////
                // Atributos.
 
                private:
@@ -64,6 +67,7 @@ namespace Server {
                        /// Mutex para las plantas.
                        Glib::Mutex plants_mutex;
 
+               /////////////////////////////////////////////////////////////////////
                // Métodos.
 
                protected:
@@ -78,54 +82,69 @@ namespace Server {
                        virtual Connection* new_connection(const sockbuf::sockdesc& sd);
 
                        /**
-                        * Maneja el comando server/status.
+                        * Maneja el comando server/info.
                         */
-                       HTTPResponse* cmd_server_status(void) const;
+                       Response* cmd_server_info(void) const;
 
                        /**
                         * Maneja el comando connection/list.
                         */
-                       HTTPResponse* cmd_connection_list(void);
+                       Response* cmd_connection_list(void);
 
                        /**
                         * Maneja el comando connection/stop.
                         */
-                       HTTPResponse* cmd_connection_stop(const Command& command);
+                       Response* cmd_connection_stop(const Command& command);
 
                        /**
                         * Maneja el comando transmission/list.
                         */
-                       HTTPResponse* cmd_transmission_list(void);
+                       Response* cmd_transmission_list(void);
 
                        /**
                         * Maneja el comando transmission/start.
                         */
-                       HTTPResponse* cmd_transmission_start(const Command& command);
+                       Response* cmd_transmission_start(const Command& command);
 
                        /**
                         * Maneja el comando transmission/stop.
                         */
-                       HTTPResponse* cmd_transmission_stop(const Command& command);
+                       Response* cmd_transmission_stop(const Command& command);
 
                        /**
                         * Maneja el comando plant/list.
                         */
-                       HTTPResponse* cmd_plant_list(void);
+                       Response* cmd_plant_list(void);
 
                        /**
                         * Maneja el comando plant/get.
                         */
-                       HTTPResponse* cmd_plant_get(const Command& command);
+                       Response* cmd_plant_get(const Command& command);
 
                        /**
-                        * Maneja el comando plant/get.
+                        * Maneja el comando plant/set.
+                        */
+                       Response* cmd_plant_set(const Command& command);
+
+                       /**
+                        * Maneja el comando plant/set_frequency.
+                        */
+                       Response* cmd_plant_set_frequency(const Command& command);
+
+                       /**
+                        * Maneja el comando plant/start.
                         */
-                       HTTPResponse* cmd_plant_set(const Command& command);
+                       Response* cmd_plant_start(const Command& command);
 
                        /**
                         * Maneja el comando plant/stop.
                         */
-                       HTTPResponse* cmd_plant_stop(const Command& command);
+                       Response* cmd_plant_stop(const Command& command);
+
+                       /**
+                        * Maneja el comando plant/remove.
+                        */
+                       Response* cmd_plant_remove(const Command& command);
 
                public:
 
@@ -137,11 +156,21 @@ namespace Server {
                        /**
                         * Constructor.
                         *
+                        * \param port Puerto en el cual escuchar.
+                        */
+                       Server(const Connection::Port& port = 7522) throw(sockerr);
+
+                       /**
+                        * Agrega una planta al servidor.
+                        *
+                        * \param name     Nombre que utilizará el servidor para identificar
+                        *                 a la planta.
                         * \param filename Nombre del archivo con la planta a cargar.
-                        * \param port     Puerto en el cual escuchar.
+                        * \return true si se agregó la planta, false si ya existía una
+                        *         planta con ese nombre.
                         */
-                       Server(const std::string& plant_filename,
-                                       const Connection::Port& port = 7522) throw(sockerr);
+                       bool add_plant(const std::string& name,
+                                       const std::string& filename);
 
                        /**
                         * Maneja los comandos recibidos por las conexiones.