arregle un poquito la and

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

diff --git a/Server/src/connection.cpp b/Server/src/connection.cpp
index a8f17ea3c2521d02a2a46c1d0046789d6e51a61f..75915c96918ff34ab05e7ccd18d1d23c95eb2949 100644 (file)
--- a/Server/src/connection.cpp
+++ b/Server/src/connection.cpp
@@ -39,14 +39,16 @@ namespace Server {
 
 Connection::~Connection(void) {
 #ifdef DEBUG
 
 Connection::~Connection(void) {
 #ifdef DEBUG

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

 #endif // DEBUG
 }
 
 Connection::Connection(const sockbuf::sockdesc& sd):
                socket(sd) {
 #ifdef DEBUG
 #endif // DEBUG
 }
 
 Connection::Connection(const sockbuf::sockdesc& sd):
                socket(sd) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": sd = " << sd.sock;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": sd = " << sd.sock;

 #endif // DEBUG
        host = socket->peerhost();
        port = socket->peerport();
 #endif // DEBUG
        host = socket->peerhost();
        port = socket->peerport();


@@ -58,7 +60,8 @@ Connection::Connection(const sockbuf::sockdesc& sd):
 Connection::Connection(const sockbuf::type& type, const std::string& host,
                const Port& port): socket(type), host(host), port(port) {
 #ifdef DEBUG
 Connection::Connection(const sockbuf::type& type, const std::string& host,
                const Port& port): socket(type), host(host), port(port) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": type = " << type << " | host = " << host
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": type = " << type << " | host = " << host

                << " | port = " << port << endl;
 #endif // DEBUG
 }
                << " | port = " << port << endl;
 #endif // DEBUG
 }


@@ -66,13 +69,22 @@ Connection::Connection(const sockbuf::type& type, const std::string& host,
 Connection::Connection(const std::string& host, const Port& port):
                host(host), port(port) {
 #ifdef DEBUG
 Connection::Connection(const std::string& host, const Port& port):
                host(host), port(port) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": host = " << host << " | port = " << port << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": host = " << host << " | port = " << port << endl;

 #endif // DEBUG
 }
 
 void Connection::finish(bool attach) {
 #endif // DEBUG
 }
 
 void Connection::finish(bool attach) {

+#ifdef DEBUG
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": finish(attach = " << attach << ")." << endl;
+#endif // DEBUG

        //socket_mutex.lock();
        //socket_mutex.lock();

-       socket->shutdown(sockbuf::shut_readwrite);
+       try {
+               socket->shutdown(sockbuf::shut_readwrite);
+       } catch (const sockerr& e) {
+               error(e.serrno(), e.errstr());
+       }

        //socket_mutex.unlock();
        Runnable::finish(attach);
 }
        //socket_mutex.unlock();
        Runnable::finish(attach);
 }