diff options
| author | Nils Maier <maierman@web.de> | 2013-09-22 05:28:22 +0200 |
|---|---|---|
| committer | Nils Maier <maierman@web.de> | 2013-09-30 13:53:21 +0200 |
| commit | 00dd83b461d03fabdc83a5c9fc4a6009acc8da4a (patch) | |
| tree | 7b322a2b2bfa946299b6bc8fef02774aba1b3956 /src/SocketCore.cc | |
| parent | 3f1d293ed1634a6bf97262d9f1c30b47461b725b (diff) | |
Implement WinTLS
Diffstat (limited to 'src/SocketCore.cc')
| -rw-r--r-- | src/SocketCore.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/SocketCore.cc b/src/SocketCore.cc index 1b4018b8..79a4a916 100644 --- a/src/SocketCore.cc +++ b/src/SocketCore.cc @@ -779,7 +779,7 @@ void SocketCore::readData(void* data, size_t& len) ret = tlsSession_->readData(data, len); if(ret < 0) { if(ret != TLS_ERR_WOULDBLOCK) { - throw DL_RETRY_EX(fmt(EX_SOCKET_SEND, + throw DL_RETRY_EX(fmt(EX_SOCKET_RECV, tlsSession_->getLastErrorString().c_str())); } if(tlsSession_->checkDirection() == TLS_WANT_READ) { @@ -814,6 +814,7 @@ bool SocketCore::tlsHandshake(TLSContext* tlsctx, const std::string& hostname) wantWrite_ = false; switch(secure_) { case A2_TLS_NONE: + A2_LOG_DEBUG("Creating TLS session"); tlsSession_.reset(TLSSession::make(tlsctx)); rv = tlsSession_->init(sockfd_); if(rv != TLS_ERR_OK) { @@ -835,6 +836,7 @@ bool SocketCore::tlsHandshake(TLSContext* tlsctx, const std::string& hostname) secure_ = A2_TLS_HANDSHAKING; // Fall through case A2_TLS_HANDSHAKING: + A2_LOG_DEBUG("TLS Handshaking"); if(tlsctx->getSide() == TLS_CLIENT) { rv = tlsSession_->tlsConnect(hostname, handshakeError); } else { @@ -857,6 +859,7 @@ bool SocketCore::tlsHandshake(TLSContext* tlsctx, const std::string& hostname) } return false; default: + A2_LOG_DEBUG("TLS else"); break; } return true; |