suppressed misleading ssl error.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1091 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-03-20 23:43:24 +00:00
parent 631e3b303e
commit a311814714

View File

@ -1420,12 +1420,11 @@ int pqissl::readdata(void *data, int len)
if (tmppktlen <= 0) // probably needs a reset. if (tmppktlen <= 0) // probably needs a reset.
{ {
std::ostringstream out; std::ostringstream out;
out << "pqissl::readdata()";
out << " No Data Read ... Probably a Bad Connection" << std::endl;
int error = SSL_get_error(ssl_connection, tmppktlen); int error = SSL_get_error(ssl_connection, tmppktlen);
unsigned long err2 = ERR_get_error(); unsigned long err2 = ERR_get_error();
printSSLError(ssl_connection, tmppktlen, error, err2, out); //printSSLError(ssl_connection, tmppktlen, error, err2, out);
if ((error == SSL_ERROR_ZERO_RETURN) && (err2 == 0)) if ((error == SSL_ERROR_ZERO_RETURN) && (err2 == 0))
{ {
@ -1482,9 +1481,9 @@ int pqissl::readdata(void *data, int len)
} }
else if (error == SSL_ERROR_WANT_READ) // SSL_WANT_READ is not a crittical error. It's just a sign that else if (error == SSL_ERROR_WANT_READ) // SSL_WANT_READ is not a crittical error. It's just a sign that
{ // the internal SSL buffer is not ready to accept more data. So -1 { // the internal SSL buffer is not ready to accept more data. So -1
out << "SSL_read() SSL_ERROR_WANT_READ"; // is returned, and the connexion will be retried as is on next // out << "SSL_read() SSL_ERROR_WANT_READ"; // is returned, and the connexion will be retried as is on next
out << std::endl; // call of readdata(). // out << std::endl; // call of readdata().
rslog(RSL_ALERT, pqisslzone, out.str()); // rslog(RSL_ALERT, pqisslzone, out.str());
return -1; return -1;
} }
else else