]> 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 bug reportado por ricky.
[z.facultad/75.42/plaqui.git] / Server / src / server.cpp
diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 73963babf8597e797f4a99d451992a1f9c114e85..37f5c1c75b7d26d7ca1e6d763d6a21a2ee02f36b 100644 (file)
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -100,44 +100,109 @@ void Server::on_control_command_received(const Command& command,
                << ", args = [" << String::join(command.get_args(), ", ") << "])"
                << endl;
 #endif // DEBUG
                << ", args = [" << String::join(command.get_args(), ", ") << "])"
                << endl;
 #endif // DEBUG
-       // TODO, seguir aca!
-       stringstream response_xml;
-       response_xml << "<html>" << endl;
-       response_xml << "    <head>" << endl;
-       response_xml << "        <title>PlaQui v0.4</title>" << endl;
-       response_xml << "    </head>" << endl;
-       response_xml << "    <body>" << endl;
-       response_xml << "        <h1>PlaQui</h1>" << endl;
-       response_xml << "        <p>versión 0.4</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;
+       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!");
        }
        }
-       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;
-       HTTPResponse response(HTTPMessage::OK, response_xml.str());
+       // FIXME
        response.headers["Content-Type"] = "text/html; charset=iso-8859-1";
        response.headers["Content-Type"] = "text/html; charset=iso-8859-1";
-       //response.headers["Connection"] = "close";
-               server->send(response);
-       }
+       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 Server
 
Simulador de planta química (TP Final de Taller I)