Se corrige un bug.

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

diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 1206b1c16ea7a8670284fb352b5ca1d0ddc50add..d4dd52a42a0c26707dab7567870c1e39afd8681f 100644 (file)
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -26,40 +26,208 @@
 //
 
 #include "plaqui/server/server.h"
 //
 
 #include "plaqui/server/server.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
 

-using namespace PlaQui::Server;
+using namespace std;
+
+namespace PlaQui {
+
+namespace Server {
+
+Server::~Server(void) {
+#ifdef DEBUG
+       cerr << __FILE__ <<  ": destructor." << endl;
+#endif // DEBUG
+}

 
 Server::Server(int port):
 
 Server::Server(int port):

-               socket(sockbuf::sock_stream) {
-       socket.bind(port);
+               TCPServer(port) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << "Escuchando en " << socket.localhost() <<
-               ":" << socket.localport() << "." << std::endl;
+       cerr << __FILE__ <<  ": port = " << port << endl;

 #endif // DEBUG
 #endif // DEBUG

-       socket.listen();

 }
 
 }
 

-bool Server::start_transmission(std::string host, int port) {
+/// \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;
 }
        // TODO
        return false;
 }

+                       
+Connection* Server::new_connection(
+               const sockbuf::sockdesc& sd) {
+#ifdef DEBUG
+       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(
+                       SigC::bind<ControlServer*>(
+                               SigC::slot_class(*this, &Server::on_control_command_received),
+                               connection));
+       // TODO: 
+       return connection;
+}

 
 

-bool Server::stop_transmission(std::string host, int port) {
+/// \todo Implementar.
+bool Server::stop_transmission(string host, int port) {
+#ifdef DEBUG
+       cerr << __FILE__ <<  ": stop_transmission(host = " << host
+               << " | port = " << port << ")" << endl;
+#endif // DEBUG

        // TODO
        return false;
 }
 
        // TODO
        return false;
 }
 

-void Server::real_run(void) {
-       // FIXME se tiene que ir a la clase para poder frenarlo desde afuera.
-       bool stop = false;
-       ControlServer* control_server;
-       while (!stop) {
-               control_server = new ControlServer(socket.accept());
-               controllers.push_back(control_server);
-               control_server->run();
+/// \todo Implementar.
+void Server::on_control_command_received(const Command& command,
+               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
+       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") {
+               response = new HTTPResponse(HTTPMessage::NOT_FOUND,
+                               "Invalid command for 'transmission' taget!");
+       } else if (command.get_target() == "plant") {
+               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;
+       response_xml << "        <title>PlaQui v0.7</title>" << endl;
+       response_xml << "    </head>" << endl;
+       response_xml << "    <body>" << endl;
+       response_xml << "        <h1>PlaQui</h1>" << endl;
+       response_xml << "        <p>versión 0.7</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;
+       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.7</title>" << endl;
+       response_xml << "    </head>" << endl;
+       response_xml << "    <body>" << endl;
+       response_xml << "        <h1>PlaQui</h1>" << endl;
+       response_xml << "        <p>versión 0.7</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]);
+       }
+}
+
+} // namespace Server
+
+} // namespace PlaQui
+