Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 08:29:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Bad SSL Timeout code.

Browse Source 
* Added TS check to SSL_RETURN_ZERO code. 
	- Existing code was dependent on tick rate. (could kill connection in 2-3 seconds)
	- If nothing is received within 15 seconds - the connection will be killed.
  * Removed "No send if RETURN_ZERO" check. 
	- This causes deadlocks and kills connections.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3287 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-07-13 12:13:56 +00:00
parent 728d755af8
commit 31c9832978
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libretroshare/src/pqi/pqissl.cc
View File

@ -63,6 +63,8 @@ const int PQISSL_UDP_FLAG = 0x02;
***********/ ***********/
static const int PQISSL_MAX_READ_ZERO_COUNT = 20; static const int PQISSL_MAX_READ_ZERO_COUNT = 20;
static const time_t PQISSL_MAX_READ_ZERO_TIME = 15; // 15 seconds of no data => reset. (atm HeartBeat pkt sent 5 secs)
static const int PQISSL_SSL_CONNECT_TIMEOUT = 30; static const int PQISSL_SSL_CONNECT_TIMEOUT = 30;
/********** PQI SSL STUFF ****************************************** /********** PQI SSL STUFF ******************************************
@ -97,7 +99,7 @@ pqissl::pqissl(pqissllistener *l, PQInterface *parent, p3ConnectMgr *cm)
readpkt(NULL), pktlen(0), readpkt(NULL), pktlen(0),
attempt_ts(0), attempt_ts(0),
net_attempt(0), net_failure(0), net_unreachable(0), net_attempt(0), net_failure(0), net_unreachable(0),
sameLAN(false), n_read_zero(0), sameLAN(false), n_read_zero(0), mReadZeroTS(0),
mConnectDelay(0), mConnectTS(0), mConnectDelay(0), mConnectTS(0),
mConnectTimeout(0), mTimeoutTS(0), mConnMgr(cm) mConnectTimeout(0), mTimeoutTS(0), mConnMgr(cm)
@ -238,6 +240,7 @@ int pqissl::reset()
ssl_connection = NULL; ssl_connection = NULL;
sameLAN = false; sameLAN = false;
n_read_zero = 0; n_read_zero = 0;
mReadZeroTS = 0;
total_len = 0 ; total_len = 0 ;
mTimeoutTS = 0; mTimeoutTS = 0;
@ -1454,21 +1457,26 @@ int pqissl::readdata(void *data, int len)
* and ZERO error.... we catch this case by counting how many times * and ZERO error.... we catch this case by counting how many times
* it occurs in a row (cos the other one will not). * it occurs in a row (cos the other one will not).
*/ */
if (n_read_zero == 0)
{
/* first read_zero */
mReadZeroTS = time(NULL);
}
++n_read_zero; ++n_read_zero;
out << "ssl read : SSL_ERROR_ZERO_RETURN -- Blocking the writing process while waiting for more information."; out << "ssl read : SSL_ERROR_ZERO_RETURN : nReadZero: " << n_read_zero;
out << std::endl;
out << " Has socket closed been properly closed? nReadZero: " << n_read_zero;
out << std::endl; out << std::endl;
if (PQISSL_MAX_READ_ZERO_COUNT < n_read_zero) if ((PQISSL_MAX_READ_ZERO_COUNT < n_read_zero)
&& (time(NULL) - mReadZeroTS > PQISSL_MAX_READ_ZERO_TIME))
{ {
out << "Count passed Limit, shutting down!"; out << "Count passed Limit, shutting down!";
out << " ReadZero Age: " << time(NULL) - mReadZeroTS;
reset(); reset();
} }
rslog(RSL_ALERT, pqisslzone, out.str()); rslog(RSL_ALERT, pqisslzone, out.str());
// std::cerr << out.str() << std::endl ; std::cerr << out.str() << std::endl ;
return -1; return -1;
} }
@ -1619,11 +1627,6 @@ bool pqissl::moretoread()
bool pqissl::cansend() bool pqissl::cansend()
{ {
if (n_read_zero > 0) {
rslog(RSL_ALERT, pqisslzone,
"pqissl::cansend() read socket returns 0, so we don't wanna send know.");
return false;
}
rslog(RSL_DEBUG_ALL, pqisslzone, rslog(RSL_DEBUG_ALL, pqisslzone,
"pqissl::cansend() polling socket!"); "pqissl::cansend() polling socket!");

1
libretroshare/src/pqi/pqissl.h
View File

@ -189,6 +189,7 @@ virtual int net_internal_fcntl_nonblock(int fd) { return unix_fcntl_nonblock(fd)
bool sameLAN; /* flag use to allow high-speed transfers */ bool sameLAN; /* flag use to allow high-speed transfers */
int n_read_zero; /* a counter to determine if the connection is really dead */ int n_read_zero; /* a counter to determine if the connection is really dead */
time_t mReadZeroTS; /* timestamp of first READ_ZERO occurance */
int ssl_connect_timeout; /* timeout to ensure that we don't get stuck (can happen on udp!) */ int ssl_connect_timeout; /* timeout to ensure that we don't get stuck (can happen on udp!) */