- Se arregla el bug de ControlClient::get_host() y ControlClient::get_port().

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

diff --git a/Server/src/receiver.cpp b/Server/src/receiver.cpp
index 9667e8c4b326b9d1ef178cadd304c3ab7fe543f1..c381c7d6d104683c32e745d43bde76280099281e 100644 (file)
--- a/Server/src/receiver.cpp
+++ b/Server/src/receiver.cpp
@@ -30,33 +30,42 @@
 #      include <iostream>
 #endif // DEBUG
 
 #      include <iostream>
 #endif // DEBUG
 

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

 #ifdef DEBUG
 #ifdef DEBUG

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

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

-PlaQui::Server::Receiver::Receiver(int port, std::string host):
-               ServerConnection(sockbuf::sock_dgram) {
+Receiver::Receiver(int port, string host): Connection(sockbuf::sock_dgram) {

 #ifdef DEBUG
 #ifdef DEBUG

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

 #endif // DEBUG
        // FIXME - deberia ir en run().
        socket->bind(port);
 }
 
 #endif // DEBUG
        // FIXME - deberia ir en run().
        socket->bind(port);
 }
 

-void PlaQui::Server::Receiver::real_run(void) {
+void Receiver::real_run(void) {

 #ifdef DEBUG
 #ifdef DEBUG

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

 #endif // DEBUG
        // FIXME - debería tirar una excepción?
        if (!socket->is_open()) {
 #endif // DEBUG
        // FIXME - debería tirar una excepción?
        if (!socket->is_open()) {

-               std::cerr << "No se pudo conectar a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << std::endl;
+               cerr << "No se pudo conectar a " << socket->peerhost() <<
+                       ":" << socket->peerport() << "." << endl;

        } else {
        } else {

-               std::cerr << "Conectado a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << std::endl;
+               cerr << "Conectado a " << socket->peerhost() <<
+                       ":" << socket->peerport() << "." << endl;

        }
 }
 
        }
 }
 

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