From 994a9433fe3cfe085bc97fa89ca937aca36418c2 Mon Sep 17 00:00:00 2001
From: Adam Potolsky <realspkr@gmail.com>
Date: Wed, 20 May 2015 12:08:25 -0700
Subject: [PATCH] Converting retry to a counter #4650

---
 src/lib/plugin/ns/SecureSocket.cpp | 33 ++++++++++++++++++++----------
 src/lib/plugin/ns/SecureSocket.h   |  2 +-
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/lib/plugin/ns/SecureSocket.cpp b/src/lib/plugin/ns/SecureSocket.cpp
index ad75e3c4..dd2937ca 100644
--- a/src/lib/plugin/ns/SecureSocket.cpp
+++ b/src/lib/plugin/ns/SecureSocket.cpp
@@ -111,7 +111,9 @@ SecureSocket::secureRead(void* buffer, UInt32 n)
 		LOG((CLOG_DEBUG2 "reading secure socket"));
 		r = SSL_read(m_ssl->m_ssl, buffer, n);
 		
-		bool fatal, retry;
+		bool fatal;
+		static int retry;
+
 		checkResult(r, fatal, retry);
 		
 		if (retry) {
@@ -130,7 +132,9 @@ SecureSocket::secureWrite(const void* buffer, UInt32 n)
 		LOG((CLOG_DEBUG2 "writing secure socket"));
 		r = SSL_write(m_ssl->m_ssl, buffer, n);
 		
-		bool fatal, retry;
+		bool fatal;
+		static int retry;
+
 		checkResult(r, fatal, retry);
 
 		if (retry) {
@@ -253,7 +257,9 @@ SecureSocket::secureAccept(int socket)
 	LOG((CLOG_DEBUG2 "accepting secure socket"));
 	int r = SSL_accept(m_ssl->m_ssl);
 	
-	bool fatal, retry;
+	bool fatal;
+	static int retry;
+
 	checkResult(r, fatal, retry);
 
 	if (fatal) {
@@ -263,12 +269,13 @@ SecureSocket::secureAccept(int socket)
 		ARCH->sleep(1);
 	}
 
-	m_secureReady = !retry;
+	m_secureReady = (0 == retry) ? true : false;
+
 	if (m_secureReady) {
 		LOG((CLOG_INFO "accepted secure socket"));
 	}
 
-	return retry;
+	return !m_secureReady;
 }
 
 bool
@@ -282,7 +289,9 @@ SecureSocket::secureConnect(int socket)
 	LOG((CLOG_DEBUG2 "connecting secure socket"));
 	int r = SSL_connect(m_ssl->m_ssl);
 	
-	bool fatal, retry;
+	bool fatal;
+	static int retry;
+
 	checkResult(r, fatal, retry);
 
 	if (fatal) {
@@ -291,7 +300,7 @@ SecureSocket::secureConnect(int socket)
 		return false;
 	}
 
-	m_secureReady = !retry;
+	m_secureReady = (0 == retry) ? true : false;
 
 	if (m_secureReady) {
 		if (verifyCertFingerprint()) {
@@ -306,7 +315,7 @@ SecureSocket::secureConnect(int socket)
 		}
 	}
 
-	return retry;
+	return !m_secureReady;
 }
 
 bool
@@ -332,22 +341,23 @@ SecureSocket::showCertificate()
 }
 
 void
-SecureSocket::checkResult(int n, bool& fatal, bool& retry)
+SecureSocket::checkResult(int n, bool& fatal, int& retry)
 {
 	// ssl errors are a little quirky. the "want" errors are normal and
 	// should result in a retry.
 
 	fatal = false;
-	retry = false;
 
 	int errorCode = SSL_get_error(m_ssl->m_ssl, n);
 	switch (errorCode) {
 	case SSL_ERROR_NONE:
+		retry = 0;
 		// operation completed
 		break;
 
 	case SSL_ERROR_ZERO_RETURN:
 		// connection closed
+		retry = 0;
 		LOG((CLOG_DEBUG2 "SSL connection has been closed"));
 		break;
 
@@ -356,7 +366,7 @@ SecureSocket::checkResult(int n, bool& fatal, bool& retry)
 	case SSL_ERROR_WANT_CONNECT:
 	case SSL_ERROR_WANT_ACCEPT:
 		LOG((CLOG_DEBUG2 "need to retry the same SSL function"));
-		retry = true;
+		retry += 1;
 		break;
 
 	case SSL_ERROR_SYSCALL:
@@ -391,6 +401,7 @@ SecureSocket::checkResult(int n, bool& fatal, bool& retry)
 	}
 
 	if (fatal) {
+		retry = 0;
 		showError();
 		disconnect();
 	}
diff --git a/src/lib/plugin/ns/SecureSocket.h b/src/lib/plugin/ns/SecureSocket.h
index 72bc51db..ba1f1df0 100644
--- a/src/lib/plugin/ns/SecureSocket.h
+++ b/src/lib/plugin/ns/SecureSocket.h
@@ -58,7 +58,7 @@ private:
 	bool				secureAccept(int s);
 	bool				secureConnect(int s);
 	bool				showCertificate();
-	void				checkResult(int n, bool& fatal, bool& retry);
+	void				checkResult(int n, bool& fatal, int& retry);
 	void				showError(const char* reason = NULL);
 	String				getError();
 	void				disconnect();