rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Increased ssl error rate limit from 60 to 50000 #4650 

@speaker, a 50k limit seems a bit insane, but it seems to be the only
way to get my Mac client to establish a connection :-/
This commit is contained in:
Nick Bolton 2015-05-26 14:00:50 +01:00
parent e96cead732
commit 3dc3d5b309
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/plugin/ns/SecureSocket.cpp
View File

@ -37,7 +37,9 @@
#define MAX_ERROR_SIZE 65535 #define MAX_ERROR_SIZE 65535
enum { enum {
kMaxRetryCount = 60 // this limit seems extremely high, but mac client seem to generate around
// 20,000 errors before they establish a connection (wtf?)
kMaxRetryCount = 50000
}; };
static const char kFingerprintDirName[] = "SSL/Fingerprints"; static const char kFingerprintDirName[] = "SSL/Fingerprints";
@ -402,17 +404,11 @@ SecureSocket::checkResult(int status, int& retry)
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
case SSL_ERROR_WANT_CONNECT: case SSL_ERROR_WANT_CONNECT:
case SSL_ERROR_WANT_ACCEPT: case SSL_ERROR_WANT_ACCEPT:
retry += 1; // it seems like these sort of errors are part of openssl's normal behavior,
// If there are a lot of retrys, it's worth warning about // so we should expect a very high amount of these. sleeping doesn't seem to
if ( retry % 5 == 0 ) { // help... maybe you just have to swallow the errors (yuck).
LOG((CLOG_DEBUG "ssl retry occurred, error=%d, attempt=%d", errorCode, retry)); retry++;
} LOG((CLOG_DEBUG2 "passive ssl error, error=%d, attempt=%d", errorCode, retry));
else if ( retry == (maxRetry() / 2) ) {
LOG((CLOG_WARN "ssl retry occurred, error=%d, attempt=%d", errorCode, retry));
}
else {
LOG((CLOG_DEBUG2 "ssl retry occurred, error=%d, attempt=%d", errorCode, retry));
}
break; break;
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
@ -448,7 +444,7 @@ SecureSocket::checkResult(int status, int& retry)
// If the retry max would exceed the allowed, treat it as a fatal error // If the retry max would exceed the allowed, treat it as a fatal error
if (retry > maxRetry()) { if (retry > maxRetry()) {
LOG((CLOG_ERR "ssl retry limit exceeded: %d", retry)); LOG((CLOG_ERR "passive ssl error limit exceeded: %d", retry));
isFatal(true); isFatal(true);
} }