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 d4306e3ab0f16193e2c3756a0fa518d645268429..4348da6d80e01c07f118fde1a6460ff689079c3d 100644 (file)
--- a/Server/src/transmitter.cpp
+++ b/Server/src/transmitter.cpp
@@ -26,25 +26,74 @@
 //
 
 #include "plaqui/server/transmitter.h"
 //
 
 #include "plaqui/server/transmitter.h"

+#include <glibmm/timer.h>

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

+#ifdef DEBUG
+#      include <iostream>
+#endif // DEBUG

 
 

-using namespace Plaqui;
+using namespace std;

 
 

-Transmitter::Transmitter(std::string host, int port):
-               Connection(sockbuf::sock_dgram) {
-       // FIXME - deberia ir en run().
+namespace PlaQui {
+
+namespace Server {
+
+Transmitter::~Transmitter(void) {
+#ifdef DEBUG
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": destructor." << endl;
+#endif // DEBUG
+}
+
+Transmitter::Transmitter(const string& _host, const Connection::Port& _port)
+               throw(sockerr): Connection(sockbuf::sock_dgram, _host, _port) {
+#ifdef DEBUG
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": _host = " << _host
+               << " | _port = " << _port << endl;
+#endif // DEBUG

        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) {
 void Transmitter::real_run(void) {

-       // FIXME - debería tirar una excepción?
-       if (!socket->is_open()) {
-               std::cerr << "No se pudo conectar a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << std::endl;
-       } else {
-               std::cerr << "Conectado a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << std::endl;
+#ifdef DEBUG
+       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
+       if (stop()) {
+               return;
+       }
+       try {
+               socket << data << flush;
+       } catch (const sockerr& e) {
+               signal_error().emit(e.serrno(), e.errstr());
+               stop(true);

        }
 }
 
        }
 }
 

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