se validan valores del tanque

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

diff --git a/Server/src/transmitter.cpp b/Server/src/transmitter.cpp
index de940f98c187097db7a050c543e96876781c0b8c..9d0e24df263c02503e4a867ed8d75563ad5517ab 100644 (file)
--- a/Server/src/transmitter.cpp
+++ b/Server/src/transmitter.cpp
@@ -41,41 +41,55 @@ namespace Server {
 
 Transmitter::~Transmitter(void) {
 #ifdef DEBUG
 
 Transmitter::~Transmitter(void) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": destructor." << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": destructor." << endl;

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

-Transmitter::Transmitter(string& _host, Connection::Port& _port):
-               Connection(sockbuf::sock_dgram, _host, _port) {
+Transmitter::Transmitter(const string& _host, const Connection::Port& _port)
+               throw(sockerr): Connection(sockbuf::sock_dgram, _host, _port) {

 #ifdef DEBUG
 #ifdef DEBUG

-       cerr << __FILE__ << ": _host = " << _host
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": _host = " << _host

                << " | _port = " << _port << endl;
 #endif // DEBUG
        socket->connect(host.c_str(), port);
                << " | _port = " << _port << endl;
 #endif // DEBUG
        socket->connect(host.c_str(), port);

-       // Reasigno el host y puerto bien, tanto de este objeto como los que se
-       // environ para indicar su valor correcto.
-       host  = socket->peerhost();
-       port  = socket->peerport();
-       _host = socket->peerhost();
-       _port = socket->peerport();
+       // Reasigno el host y puerto bien.
+       host = socket->peerhost();
+       port = socket->peerport();
+#ifdef DEBUG
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": (real) host = " << _host
+               << " | port = " << _port << endl;
+#endif // DEBUG

 }
 
 }
 

-/// \todo debría dar una excepción (?)
-void Transmitter::real_run(void) {
+void Transmitter::real_run(void) throw() {

 #ifdef DEBUG
 #ifdef DEBUG

-       cerr << __FILE__ << ": real_run()." << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": real_run()." << endl;

 #endif // DEBUG
        // No hace nada, porque solo actua cuando se manda algo con send().
 #endif // DEBUG
        // No hace nada, porque solo actua cuando se manda algo con send().

-       while (!stop) {
-               Glib::usleep(1000);
+       while (!stop()) {
+               Glib::usleep(500000); // 1/2 segundo

        }
 }
 
 void Transmitter::send(const string& data) {
 #ifdef DEBUG
        }
 }
 
 void Transmitter::send(const string& data) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": send(data = " << data << ")." << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")" 
+               << ": send()." << endl;
+//             << ": send(data = " << data << ")." << endl;

 #endif // DEBUG
 #endif // DEBUG

-       socket << data << flush;
+       if (stop()) {
+               return;
+       }
+       try {
+               socket << data << flush;
+       } catch (const sockerr& e) {
+               signal_error().emit(e.serrno(), e.errstr());
+               stop(true);
+       }

 }
 
 } // namespace Server
 }
 
 } // namespace Server