debauchee/barrier
1
1
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2024-12-18 08:22:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Deleted accidentally committed file

Browse Source
This commit is contained in:
Jerry (Xinyu Hou) 2015-07-29 11:48:06 -07:00
parent fc600efdfe
commit 8a8f3601c4
1 changed files with 0 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
1.patch
View File

@ -1,96 +0,0 @@
diff --git a/src/lib/plugin/ns/SecureSocket.cpp b/src/lib/plugin/ns/SecureSocket.cpp
index 40c3f21..e02ba9d 100644
--- a/src/lib/plugin/ns/SecureSocket.cpp
+++ b/src/lib/plugin/ns/SecureSocket.cpp
@@ -35,12 +35,9 @@
//
#define MAX_ERROR_SIZE 65535
-
-enum {
- // this limit seems extremely high, but mac client seem to generate around
- // 50,000 errors before they establish a connection (wtf?)
- kMaxRetryCount = 100000
-};
+// RETRY_DELAY * MAX_RETRY = 10s
+#define MAX_RETRY 1000
+#define RETRY_DELAY 0.01f
enum {
kMsgSize = 128
@@ -61,8 +58,7 @@ SecureSocket::SecureSocket(
SocketMultiplexer* socketMultiplexer) :
TCPSocket(events, socketMultiplexer),
m_secureReady(false),
- m_fatal(false),
- m_maxRetry(kMaxRetryCount)
+ m_fatal(false)
{
}
@@ -72,8 +68,7 @@ SecureSocket::SecureSocket(
ArchSocket socket) :
TCPSocket(events, socketMultiplexer, socket),
m_secureReady(false),
- m_fatal(false),
- m_maxRetry(kMaxRetryCount)
+ m_fatal(false)
{
}
@@ -295,8 +290,7 @@ SecureSocket::secureAccept(int socket)
if (isFatal()) {
// tell user and sleep so the socket isn't hammered.
- LOG((CLOG_ERR "failed to accept secure socket"));
- LOG((CLOG_INFO "client connection may not be secure"));
+ LOG((CLOG_WARN "failed to accept secure socket"));
m_secureReady = false;
ARCH->sleep(1);
retry = 0;
@@ -318,6 +312,7 @@ SecureSocket::secureAccept(int socket)
if (retry > 0) {
LOG((CLOG_DEBUG2 "retry accepting secure socket"));
m_secureReady = false;
+ ARCH->sleep(RETRY_DELAY);
return 0;
}
@@ -351,6 +346,7 @@ SecureSocket::secureConnect(int socket)
if (retry > 0) {
LOG((CLOG_DEBUG2 "retry connect secure socket"));
m_secureReady = false;
+ ARCH->sleep(RETRY_DELAY);
return 0;
}
@@ -475,8 +471,8 @@ SecureSocket::checkResult(int status, int& retry)
}
// If the retry max would exceed the allowed, treat it as a fatal error
- if (retry > maxRetry()) {
- LOG((CLOG_ERR "passive ssl error limit exceeded: %d", retry));
+ if (retry > MAX_RETRY) {
+ LOG((CLOG_DEBUG "retry exceeded %d sec", RETRY_DELAY * MAX_RETRY));
isFatal(true);
}
diff --git a/src/lib/plugin/ns/SecureSocket.h b/src/lib/plugin/ns/SecureSocket.h
index 0c0f3b1..871e1e4 100644
--- a/src/lib/plugin/ns/SecureSocket.h
+++ b/src/lib/plugin/ns/SecureSocket.h
@@ -52,8 +52,6 @@ public:
int secureWrite(const void* buffer, int size, int& wrote);
void initSsl(bool server);
bool loadCertificates(String& CertFile);
- void maxRetry(int limit) { m_maxRetry = limit; };
- int maxRetry() const { return m_maxRetry; };
private:
// SSL
@@ -87,5 +85,4 @@ private:
Ssl* m_ssl;
bool m_secureReady;
bool m_fatal;
- int m_maxRetry;
};