agrego las compuertas pero todavia no hacen nada, ademas tengo un conflicto con el...

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

diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 134bcf517f9f1d386c1d8a75ea648c744a651e5d..37f5c1c75b7d26d7ca1e6d763d6a21a2ee02f36b 100644 (file)
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -29,62 +29,182 @@
 #include "plaqui/server/connection.h"
 #include "plaqui/server/controlserver.h"
 #include <sigc++/class_slot.h>
 #include "plaqui/server/connection.h"
 #include "plaqui/server/controlserver.h"
 #include <sigc++/class_slot.h>

+// FIXME - sacar sstream (a menos que se necesite)
+#include <sstream>

 #ifdef DEBUG
 #ifdef DEBUG

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

 #      include <iostream>
 #endif // DEBUG
 
 #      include <iostream>
 #endif // DEBUG
 

-PlaQui::Server::Server::~Server(void) {
+using namespace std;
+
+namespace PlaQui {
+
+namespace Server {
+
+Server::~Server(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ <<  ": destructor." << std::endl;
+       cerr << __FILE__ <<  ": destructor." << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-PlaQui::Server::Server::Server(int port):
+Server::Server(int port):

                TCPServer(port) {
 #ifdef DEBUG
                TCPServer(port) {
 #ifdef DEBUG

-       std::cerr << __FILE__ <<  ": port = " << port << std::endl;
+       cerr << __FILE__ <<  ": port = " << port << endl;

 #endif // DEBUG
 }
 
 /// \todo Implementar.
 #endif // DEBUG
 }
 
 /// \todo Implementar.

-bool PlaQui::Server::Server::start_transmission(std::string host, int port) {
+bool Server::start_transmission(string host, int port) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ <<  ": start_transmission(host = " << host
-               << " | port = " << port << ")" << std::endl;
+       cerr << __FILE__ <<  ": start_transmission(host = " << host
+               << " | port = " << port << ")" << endl;

 #endif // DEBUG
        // TODO
        return false;
 }
                        
 #endif // DEBUG
        // TODO
        return false;
 }
                        

-PlaQui::Server::Connection* PlaQui::Server::Server::new_connection(
+Connection* Server::new_connection(

                const sockbuf::sockdesc& sd) {
 #ifdef DEBUG
                const sockbuf::sockdesc& sd) {
 #ifdef DEBUG

-       std::cerr << __FILE__ <<  ": new_connection(sd = " << sd.sock << ")"
-               << std::endl;
+       cerr << __FILE__ <<  ": new_connection(sd = " << sd.sock << ")"
+               << endl;

 #endif // DEBUG
        ControlServer* connection = new ControlServer(sd);
        // TODO verificar si el new se hace bien? no creo.
        connection->signal_command_received().connect(
 #endif // DEBUG
        ControlServer* connection = new ControlServer(sd);
        // TODO verificar si el new se hace bien? no creo.
        connection->signal_command_received().connect(

-                       SigC::slot_class(*this, &Server::on_control_command_received));
+                       SigC::bind<ControlServer*>(
+                               SigC::slot_class(*this, &Server::on_control_command_received),
+                               connection));

        // TODO: 
        return connection;
 }
 
 /// \todo Implementar.
        // TODO: 
        return connection;
 }
 
 /// \todo Implementar.

-bool PlaQui::Server::Server::stop_transmission(std::string host, int port) {
+bool Server::stop_transmission(string host, int port) {

 #ifdef DEBUG
 #ifdef DEBUG

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

 #endif // DEBUG
        // TODO
        return false;
 }
 
 /// \todo Implementar.
 #endif // DEBUG
        // TODO
        return false;
 }
 
 /// \todo Implementar.

-void PlaQui::Server::Server::on_control_command_received(void* command) {
+void Server::on_control_command_received(const Command& command,
+               ControlServer* server) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ <<  ": on_control_command_received(command = "
-               << command << ")" << std::endl;
+       cerr << __FILE__ <<  ": on_control_command_received(target = "
+               << command.get_target() << ", command = " << command.get_command()
+               << ", args = [" << String::join(command.get_args(), ", ") << "])"
+               << endl;

 #endif // DEBUG
 #endif // DEBUG

+       HTTPResponse response(HTTPMessage::OK);
+       if (command.get_target() == "server") {
+#ifdef DEBUG
+       cerr << __FILE__ <<  ": server" << endl;
+#endif // DEBUG
+               if (command.get_command() == "status") {
+                       // FIXME
+                       stringstream response_xml;
+                       response_xml << "<html>" << endl;
+                       response_xml << "    <head>" << endl;
+                       response_xml << "        <title>PlaQui v0.6</title>" << endl;
+                       response_xml << "    </head>" << endl;
+                       response_xml << "    <body>" << endl;
+                       response_xml << "        <h1>PlaQui</h1>" << endl;
+                       response_xml << "        <p>versión 0.6</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.status_code = HTTPMessage::OK;
+                       response.set_body(response_xml.str());
+               } else if (command.get_command() == "stop") {
+                       stop = true;
+                       response.set_body("El server se apagará en instantes...");
+               } else {
+                       response.status_code = HTTPMessage::NOT_FOUND;
+                       response.set_body("Invalid command for 'server' taget!");
+               }
+       } else if (command.get_target() == "connection") {
+               if (command.get_command() == "list") {
+                       // FIXME
+                       TCPServer::ConnectionInfoList cil = get_connected();
+                       stringstream response_xml;
+                       response_xml << "<html>" << endl;
+                       response_xml << "    <head>" << endl;
+                       response_xml << "        <title>PlaQui v0.6</title>" << endl;
+                       response_xml << "    </head>" << endl;
+                       response_xml << "    <body>" << endl;
+                       response_xml << "        <h1>PlaQui</h1>" << endl;
+                       response_xml << "        <p>versión 0.6</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/disconnect/"
+                                       << 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;
+                       response.status_code = HTTPMessage::OK;
+                       response.set_body(response_xml.str());
+               } else if (command.get_command() == "stop") {
+                       // TODO server->finish();
+                       response.set_body("La conexión se cerrará en instantes...");
+               } else {
+                       response.status_code = HTTPMessage::NOT_FOUND;
+                       response.set_body("Invalid command for 'connection' taget!");
+               }
+       } else if (command.get_target() == "transmission") {
+                       response.status_code = HTTPMessage::NOT_FOUND;
+                       response.set_body("Invalid command for 'transmission' taget!");
+       } else if (command.get_target() == "plant") {
+                       response.status_code = HTTPMessage::NOT_FOUND;
+                       response.set_body("Invalid command for 'plant' taget!");
+       } else {
+               response.status_code = HTTPMessage::NOT_FOUND;
+               response.set_body("Invalid Target!");
+       }
+       // FIXME
+       response.headers["Content-Type"] = "text/html; charset=iso-8859-1";
+       response.headers["Connection"] = "close";
+       server->send(response);
+       // FIXME con timeout no debería ser necesario. Verificar cabecera Connection
+       // para saber si hay que finish()earlo o no.
+       // server->finish();

 }
 
 }
 

+} // namespace Server
+
+} // namespace PlaQui
+