Varios cambios:

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

diff --git a/Server/src/transmitter.cpp b/Server/src/transmitter.cpp
index 4211e51a0cc866828efaf6bdba632af6de24259a..4348da6d80e01c07f118fde1a6460ff689079c3d 100644 (file)
--- a/Server/src/transmitter.cpp
+++ b/Server/src/transmitter.cpp
@@ -26,6 +26,7 @@
 //
 
 #include "plaqui/server/transmitter.h"
 //
 
 #include "plaqui/server/transmitter.h"

+#include <glibmm/timer.h>

 #include <socket++/sockinet.h>
 #include <string>
 #ifdef DEBUG
 #include <socket++/sockinet.h>
 #include <string>
 #ifdef DEBUG


@@ -40,33 +41,56 @@ 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
 }
 

-/// \todo debría conectarse en real_run() (?)
-Transmitter::Transmitter(string host, int port):
-               Connection(sockbuf::sock_dgram) {
+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
-               << " | port = " << port << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": _host = " << _host
+               << " | _port = " << _port << endl;

 #endif // DEBUG
 #endif // DEBUG

-       // FIXME - deberia ir en run().

        socket->connect(host.c_str(), port);
        socket->connect(host.c_str(), port);

+       // 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) {
 #ifdef DEBUG
 }
 
 /// \todo debría dar una excepción (?)
 void Transmitter::real_run(void) {
 #ifdef DEBUG

-       // FIXME - debería tirar una excepción?
-       if (!socket->is_open()) {
-               cerr << "No se pudo conectar a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << endl;
-       } else {
-               cerr << "Conectado a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": real_run()." << endl;
+#endif // DEBUG
+       // No hace nada, porque solo actua cuando se manda algo con send().
+       while (!stop()) {
+               Glib::usleep(500000); // 1/2 segundo

        }
        }

+}
+
+void Transmitter::send(const string& data) {
+#ifdef DEBUG
+       cerr << __FILE__ << "(" << __LINE__ << ")" 
+               << ": send()." << endl;
+//             << ": send(data = " << data << ")." << endl;

 #endif // DEBUG
 #endif // DEBUG

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

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