X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/b92547a5de3a3fb4f14a2bea4a4e776b8da3cb5c..0521515ee87033f2bcdce2cffcafbecc960a71a6:/Server/src/transmitter.cpp diff --git a/Server/src/transmitter.cpp b/Server/src/transmitter.cpp index 4211e51..9d0e24d 100644 --- a/Server/src/transmitter.cpp +++ b/Server/src/transmitter.cpp @@ -26,6 +26,7 @@ // #include "plaqui/server/transmitter.h" +#include #include #include #ifdef DEBUG @@ -40,33 +41,55 @@ namespace Server { Transmitter::~Transmitter(void) { #ifdef DEBUG - cerr << __FILE__ << ": destructor." << endl; + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": destructor." << endl; #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 - cerr << __FILE__ << ": host = " << host - << " | port = " << port << endl; + cerr << __FILE__ << "(" << __LINE__ << ")" + << ": _host = " << _host + << " | _port = " << _port << endl; #endif // DEBUG - // FIXME - deberia ir en run(). 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) throw() { #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 + if (stop()) { + return; + } + try { + socket << data << flush; + } catch (const sockerr& e) { + signal_error().emit(e.serrno(), e.errstr()); + stop(true); + } } } // namespace Server