X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ab9300aaf1217f0c3b45dd5f1f1fdc1c5e5bd1be..2f5c973fdf3f7fb25b13996b66d566c58066f6a0:/Server/src/server.cpp

diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 134bcf5..a05285a 100644
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -30,37 +30,44 @@
 #include "plaqui/server/controlserver.h"
 #include <sigc++/class_slot.h>
 #ifdef DEBUG
+#	include "plaqui/server/string.h"
 #	include <iostream>
 #endif // DEBUG
 
-PlaQui::Server::Server::~Server(void) {
+using namespace std;
+
+namespace PlaQui {
+
+namespace Server {
+
+Server::~Server(void) {
 #ifdef DEBUG
-	std::cerr << __FILE__ <<  ": destructor." << std::endl;
+	cerr << __FILE__ <<  ": destructor." << endl;
 #endif // DEBUG
 }
 
-PlaQui::Server::Server::Server(int port):
+Server::Server(int port):
 		TCPServer(port) {
 #ifdef DEBUG
-	std::cerr << __FILE__ <<  ": port = " << port << std::endl;
+	cerr << __FILE__ <<  ": port = " << port << endl;
 #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
-	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;
 }
 			
-PlaQui::Server::Connection* PlaQui::Server::Server::new_connection(
+Connection* Server::new_connection(
 		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.
@@ -71,20 +78,26 @@ PlaQui::Server::Connection* PlaQui::Server::Server::new_connection(
 }
 
 /// \todo Implementar.
-bool PlaQui::Server::Server::stop_transmission(std::string host, int port) {
+bool Server::stop_transmission(string host, int port) {
 #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.
-void PlaQui::Server::Server::on_control_command_received(void* command) {
+void Server::on_control_command_received(const Command& command) {
 #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
 }
 
+} // namespace Server
+
+} // namespace PlaQui
+