github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

gnutls: Handle GNUTLS_E_INTERRUPTED as well as GNUTLS_E_AGAIN

pull/186/head
Tatsuhiro Tsujikawa 2014-01-08 23:01:36 +09:00
parent 2f02946b70
commit 3c789294b7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/LibgnutlsTLSSession.cc
View File

@ -134,7 +134,7 @@ int GnuTLSSession::closeConnection()
rv_ = gnutls_bye(sslSession_, GNUTLS_SHUT_WR); rv_ = gnutls_bye(sslSession_, GNUTLS_SHUT_WR);
if(rv_ == GNUTLS_E_SUCCESS) { if(rv_ == GNUTLS_E_SUCCESS) {
return TLS_ERR_OK; return TLS_ERR_OK;
} else if(rv_ == GNUTLS_E_AGAIN) { } else if(rv_ == GNUTLS_E_AGAIN || rv_ == GNUTLS_E_INTERRUPTED) {
return TLS_ERR_WOULDBLOCK; return TLS_ERR_WOULDBLOCK;
} else { } else {
return TLS_ERR_ERROR; return TLS_ERR_ERROR;
@ -155,7 +155,7 @@ ssize_t GnuTLSSession::writeData(const void* data, size_t len)
ssize_t ret = rv_; ssize_t ret = rv_;
rv_ = 0; rv_ = 0;
return ret; return ret;
} else if(rv_ == GNUTLS_E_AGAIN) { } else if(rv_ == GNUTLS_E_AGAIN || rv_ == GNUTLS_E_INTERRUPTED) {
return TLS_ERR_WOULDBLOCK; return TLS_ERR_WOULDBLOCK;
} else { } else {
return TLS_ERR_ERROR; return TLS_ERR_ERROR;
@ -170,7 +170,7 @@ ssize_t GnuTLSSession::readData(void* data, size_t len)
ssize_t ret = rv_; ssize_t ret = rv_;
rv_ = 0; rv_ = 0;
return ret; return ret;
} else if(rv_ == GNUTLS_E_AGAIN) { } else if(rv_ == GNUTLS_E_AGAIN || rv_ == GNUTLS_E_INTERRUPTED) {
return TLS_ERR_WOULDBLOCK; return TLS_ERR_WOULDBLOCK;
} else { } else {
return TLS_ERR_ERROR; return TLS_ERR_ERROR;
@ -183,7 +183,7 @@ int GnuTLSSession::tlsConnect(const std::string& hostname,
handshakeErr = ""; handshakeErr = "";
rv_ = gnutls_handshake(sslSession_); rv_ = gnutls_handshake(sslSession_);
if(rv_ < 0) { if(rv_ < 0) {
if(rv_ == GNUTLS_E_AGAIN) { if(rv_ == GNUTLS_E_AGAIN || rv_ == GNUTLS_E_INTERRUPTED) {
return TLS_ERR_WOULDBLOCK; return TLS_ERR_WOULDBLOCK;
} else { } else {
return TLS_ERR_ERROR; return TLS_ERR_ERROR;
@ -282,7 +282,7 @@ int GnuTLSSession::tlsAccept()
rv_ = gnutls_handshake(sslSession_); rv_ = gnutls_handshake(sslSession_);
if(rv_ == GNUTLS_E_SUCCESS) { if(rv_ == GNUTLS_E_SUCCESS) {
return TLS_ERR_OK; return TLS_ERR_OK;
} else if(rv_ == GNUTLS_E_AGAIN) { } else if(rv_ == GNUTLS_E_AGAIN || rv_ == GNUTLS_E_INTERRUPTED) {
return TLS_ERR_WOULDBLOCK; return TLS_ERR_WOULDBLOCK;
} else { } else {
return TLS_ERR_ERROR; return TLS_ERR_ERROR;