diff --git a/libretroshare/src/pqi/pqissl.cc b/libretroshare/src/pqi/pqissl.cc index 9190cd465..4ef60fcac 100644 --- a/libretroshare/src/pqi/pqissl.cc +++ b/libretroshare/src/pqi/pqissl.cc @@ -96,7 +96,7 @@ pqissl::pqissl(pqissllistener *l, PQInterface *parent, p3AuthMgr *am, p3ConnectM net_attempt(0), net_failure(0), net_unreachable(0), sameLAN(false), n_read_zero(0), mConnectDelay(0), mConnectTS(0), - mConnectTimeout(0), mTimeoutTS(0), quietShutdown(false), + mConnectTimeout(0), mTimeoutTS(0), /**************** PQI_USE_XPGP ******************/ #if defined(PQI_USE_XPGP) @@ -213,19 +213,14 @@ int pqissl::reset() out << "\tssl_con: " << ssl_connection << std::endl; out << std::endl; - bool neededReset = false; + bool neededReset = false; - if (ssl_connection != NULL && sockfd > 0) + if (ssl_connection != NULL) { out << "pqissl::reset() Shutting down SSL Connection"; out << std::endl; - if (quietShutdown) { - ssl_connection->quiet_shutdown; - } else { - SSL_shutdown(ssl_connection); - } + SSL_shutdown(ssl_connection); - quietShutdown = false; neededReset = true; } @@ -1379,7 +1374,6 @@ int pqissl::senddata(void *data, int len) out << std::endl; std::cerr << out.str() ; rslog(RSL_ALERT, pqisslzone, out.str()); - quietShutdown = true; reset(); return -1; } @@ -1499,8 +1493,7 @@ int pqissl::readdata(void *data, int len) out << "Socket Closed Abruptly.... Resetting PQIssl"; out << std::endl; rslog(RSL_ALERT, pqisslzone, out.str()); - quietShutdown = true; - reset(); + reset(); std::cerr << out.str() << std::endl ; return -1; } diff --git a/libretroshare/src/pqi/pqissl.h b/libretroshare/src/pqi/pqissl.h index 20100a9d2..6269432ce 100644 --- a/libretroshare/src/pqi/pqissl.h +++ b/libretroshare/src/pqi/pqissl.h @@ -203,7 +203,6 @@ virtual int net_internal_fcntl_nonblock(int fd) { return unix_fcntl_nonblock(fd) time_t mConnectTS; uint32_t mConnectTimeout; time_t mTimeoutTS; - bool quietShutdown; /* Need Certificate specific functions here! */ /**************** PQI_USE_XPGP ******************/