]> git.llucax.com Git - z.facultad/75.42/plaqui.git/blobdiff - Server/src/server.cpp
projects / z.facultad / 75.42 / plaqui.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 375087a169f7de12dfa894ba62e5d3cdf3ee460c..d4dd52a42a0c26707dab7567870c1e39afd8681f 100644 (file)
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -93,109 +93,138 @@ bool Server::stop_transmission(string host, int port) {
 
 /// \todo Implementar.
 void Server::on_control_command_received(const Command& command,
 
 /// \todo Implementar.
 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
-       HTTPResponse response(HTTPMessage::OK);
+       HTTPResponse* response;
+       //bool stop_controlserver = false;
        if (command.get_target() == "server") {
        if (command.get_target() == "server") {
-#ifdef DEBUG
-       cerr << __FILE__ <<  ": server" << endl;
-#endif // DEBUG
                if (command.get_command() == "status") {
                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());
+                       response = cmd_server_status();
                } else if (command.get_command() == "stop") {
                } else if (command.get_command() == "stop") {
-                       stop = true;
-                       response.set_body("El server se apagará en instantes...");
+                       finish();
+                       response = new HTTPResponse(HTTPMessage::OK,
+                                       "El server se apagará en instantes...");
                } else {
                } else {
-                       response.status_code = HTTPMessage::NOT_FOUND;
-                       response.set_body("Invalid command for 'server' taget!");
+                       response = new HTTPResponse(HTTPMessage::NOT_FOUND,
+                                       "Invalid command for 'server' taget!");
                }
        } else if (command.get_target() == "connection") {
                if (command.get_command() == "list") {
                }
        } 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());
+                       response = cmd_connection_list();
                } else if (command.get_command() == "stop") {
                } else if (command.get_command() == "stop") {
-                       // TODO server->finish();
-                       response.set_body("La conexión se cerrará en instantes...");
+                       response = cmd_connection_stop(command);
                } else {
                } else {
-                       response.status_code = HTTPMessage::NOT_FOUND;
-                       response.set_body("Invalid command for 'connection' taget!");
+                       response = new HTTPResponse(HTTPMessage::NOT_FOUND,
+                                       "Invalid command for 'connection' taget!");
                }
        } else if (command.get_target() == "transmission") {
                }
        } else if (command.get_target() == "transmission") {
+               response = new HTTPResponse(HTTPMessage::NOT_FOUND,
+                               "Invalid command for 'transmission' taget!");
        } else if (command.get_target() == "plant") {
        } else if (command.get_target() == "plant") {
+               response = new HTTPResponse(HTTPMessage::NOT_FOUND,
+                               "Invalid command for 'plant' taget!");
        } else {
        } else {
-               response.status_code = HTTPMessage::NOT_FOUND;
-               response.set_body("Invalid Target!");
+               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
        // FIXME
-       response.headers["Content-Type"] = "text/html; charset=iso-8859-1";
-       response.headers["Connection"] = "close";
-       server->send(response);
-       server->finish();
+       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 Server
Simulador de planta química (TP Final de Taller I)