Se termina de poner prolijo Runnable:

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

diff --git a/Server/src/connection.cpp b/Server/src/connection.cpp
index 18b5909f25bb4df3d33a6b1732d4cd1afc7e5072..c355c86d0cf7e195627e69e5afd1c5a7870197e6 100644 (file)
--- a/Server/src/connection.cpp
+++ b/Server/src/connection.cpp
@@ -31,23 +31,75 @@
 #      include <iostream>
 #endif // DEBUG
 
-PlaQui::Server::Connection::~Connection(void) {
+using namespace std;
+
+namespace PlaQui {
+
+namespace Server {
+
+Connection::~Connection(void) {
 #ifdef DEBUG
-       std::cerr << __FILE__ << ": destructor." << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": destructor." << endl;
 #endif // DEBUG
 }
 
-PlaQui::Server::Connection::Connection(const sockbuf::sockdesc& sd):
+Connection::Connection(const sockbuf::sockdesc& sd):
                socket(sd) {
 #ifdef DEBUG
-       std::cerr << __FILE__ << ": sd = " << sd.sock << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": sd = " << sd.sock;
+#endif // DEBUG
+       host = socket->peerhost();
+       port = socket->peerport();
+#ifdef DEBUG
+       cerr << " | host = " << host << " | port = " << port << endl;
 #endif // DEBUG
 }
 
-PlaQui::Server::Connection::Connection(sockbuf::type type):
-               socket(type) {
+Connection::Connection(const sockbuf::type& type, const std::string& host,
+               const Port& port): socket(type), host(host), port(port) {
 #ifdef DEBUG
-       std::cerr << __FILE__ << ": type = " << type << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": type = " << type << " | host = " << host
+               << " | port = " << port << endl;
 #endif // DEBUG
 }
 
+Connection::Connection(const std::string& host, const Port& port):
+               host(host), port(port) {
+#ifdef DEBUG
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": host = " << host << " | port = " << port << endl;
+#endif // DEBUG
+}
+
+void Connection::finish(void) {
+#ifdef DEBUG
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": finish();" << endl;
+#endif // DEBUG
+       //socket_mutex.lock();
+       try {
+               socket->shutdown(sockbuf::shut_readwrite);
+               // FIXME socket->close(sockbuf::shut_readwrite);
+               // close(socket->sd());
+       } catch (const sockerr& e) {
+               signal_error().emit(e.serrno(), e.errstr());
+       }
+       //socket_mutex.unlock();
+       Runnable::finish();
+}
+
+const string& Connection::get_host(void) const {
+       return host;
+}
+
+const Connection::Port& Connection::get_port(void) const {
+       return port;
+}
+
+} // namespace Server
+
+} // namespace PlaQui
+