Se pone mas prolijo el tema de la respuesta.

[z.facultad/75.42/plaqui.git] / Server / include / plaqui / server / server.h

diff --git a/Server/include/plaqui/server/server.h b/Server/include/plaqui/server/server.h
index f8757e7f62c997f1a0b4c79cb59b77b4ee5ebf9c..20458bbcd6e7693a56df4d37fb1e6264bf3a7ae5 100644 (file)
--- a/Server/include/plaqui/server/server.h
+++ b/Server/include/plaqui/server/server.h
@@ -30,9 +30,10 @@
 
 #include "plaqui/server/tcpserver.h"
 #include "plaqui/server/controlserver.h"
 
 #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/plant.h"
 #include "plaqui/server/command.h"

+#include "plaqui/server/response.h"

 #include <socket++/sockinet.h>
 #include <string>
 #include <map>
 #include <socket++/sockinet.h>
 #include <string>
 #include <map>


@@ -81,54 +82,69 @@ namespace Server {
                        virtual Connection* new_connection(const sockbuf::sockdesc& sd);
 
                        /**
                        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.
                         */
 
                        /**
                         * Maneja el comando connection/list.
                         */

-                       HTTPResponse* cmd_connection_list(void);
+                       Response* cmd_connection_list(void);

 
                        /**
                         * Maneja el comando connection/stop.
                         */
 
                        /**
                         * Maneja el comando connection/stop.
                         */

-                       HTTPResponse* cmd_connection_stop(const Command& command);
+                       Response* cmd_connection_stop(const Command& command);

 
                        /**
                         * Maneja el comando transmission/list.
                         */
 
                        /**
                         * Maneja el comando transmission/list.
                         */

-                       HTTPResponse* cmd_transmission_list(void);
+                       Response* cmd_transmission_list(void);

 
                        /**
                         * Maneja el comando transmission/start.
                         */
 
                        /**
                         * Maneja el comando transmission/start.
                         */

-                       HTTPResponse* cmd_transmission_start(const Command& command);
+                       Response* cmd_transmission_start(const Command& command);

 
                        /**
                         * Maneja el comando transmission/stop.
                         */
 
                        /**
                         * Maneja el comando transmission/stop.
                         */

-                       HTTPResponse* cmd_transmission_stop(const Command& command);
+                       Response* cmd_transmission_stop(const Command& command);

 
                        /**
                         * Maneja el comando plant/list.
                         */
 
                        /**
                         * Maneja el comando plant/list.
                         */

-                       HTTPResponse* cmd_plant_list(void);
+                       Response* cmd_plant_list(void);

 
                        /**
                         * Maneja el comando plant/get.
                         */
 
                        /**
                         * 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.
                         */
 
                        /**
                         * 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:
 
 
                public:
 


@@ -140,8 +156,8 @@ namespace Server {
                        /**
                         * Constructor.
                         *
                        /**
                         * Constructor.
                         *

-                        * \param filename Nombre del archivo con la planta a cargar.
-                        * \param port     Puerto en el cual escuchar.
+                        * \param plant_filename Nombre del archivo con la planta a cargar.
+                        * \param port           Puerto en el cual escuchar.

                         */
                        Server(const std::string& plant_filename,
                                        const Connection::Port& port = 7522) throw(sockerr);
                         */
                        Server(const std::string& plant_filename,
                                        const Connection::Port& port = 7522) throw(sockerr);