diff options
author | dnobori <da.git@softether.co.jp> | 2014-10-22 20:00:30 +0400 |
---|---|---|
committer | dnobori <da.git@softether.co.jp> | 2014-10-22 20:00:30 +0400 |
commit | 2b3a4d0b757e3c46f175c0a0df66a84ffbe2b39c (patch) | |
tree | 10506fa43d54b301f0dc4ee70121c6250a43a4a4 /src/Cedar | |
parent | 10d4b2c43ddc9fcc2f318c76e3d66f11ef383fad (diff) |
v4.11-9506-beta
Diffstat (limited to 'src/Cedar')
-rw-r--r-- | src/Cedar/Cedar.h | 13 | ||||
-rw-r--r-- | src/Cedar/Connection.c | 4 | ||||
-rw-r--r-- | src/Cedar/Server.c | 5 |
3 files changed, 16 insertions, 6 deletions
diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h index 2f6c7ef9..c0ea610e 100644 --- a/src/Cedar/Cedar.h +++ b/src/Cedar/Cedar.h @@ -135,10 +135,10 @@ // Version number
-#define CEDAR_VER 410
+#define CEDAR_VER 411
// Build Number
-#define CEDAR_BUILD 9505
+#define CEDAR_BUILD 9506
// Beta number
//#define BETA_NUMBER 3
@@ -159,10 +159,10 @@ // Specifies the build date
#define BUILD_DATE_Y 2014
#define BUILD_DATE_M 10
-#define BUILD_DATE_D 3
-#define BUILD_DATE_HO 17
-#define BUILD_DATE_MI 55
-#define BUILD_DATE_SE 4
+#define BUILD_DATE_D 22
+#define BUILD_DATE_HO 19
+#define BUILD_DATE_MI 51
+#define BUILD_DATE_SE 55
// Tolerable time difference
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)
@@ -1051,6 +1051,7 @@ typedef struct CEDAR UINT QueueBudget; // Queue budget
LOCK *FifoBudgetLock; // Fifo budget lock
UINT FifoBudget; // Fifo budget
+ bool AcceptOnlyTls; // Accept only TLS (Disable SSL)
} CEDAR;
// Type of CEDAR
diff --git a/src/Cedar/Connection.c b/src/Cedar/Connection.c index 51075c8b..b67c7235 100644 --- a/src/Cedar/Connection.c +++ b/src/Cedar/Connection.c @@ -3137,6 +3137,10 @@ void ConnectionAccept(CONNECTION *c) // Start the SSL communication
Debug("StartSSL()\n");
+ if (c->Cedar->AcceptOnlyTls)
+ {
+ s->AcceptOnlyTls = true;
+ }
if (StartSSL(s, x, k) == false)
{
// Failed
diff --git a/src/Cedar/Server.c b/src/Cedar/Server.c index 0023b7ad..161c6760 100644 --- a/src/Cedar/Server.c +++ b/src/Cedar/Server.c @@ -6094,6 +6094,9 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f) // Disable session reconnect
SetGlobalServerFlag(GSF_DISABLE_SESSION_RECONNECT, CfgGetBool(f, "DisableSessionReconnect"));
+
+ // AcceptOnlyTls
+ c->AcceptOnlyTls = CfgGetBool(f, "AcceptOnlyTls");
}
Unlock(c->lock);
@@ -6398,6 +6401,8 @@ void SiWriteServerCfg(FOLDER *f, SERVER *s) CfgAddBool(f, "DisableGetHostNameWhenAcceptTcp", s->DisableGetHostNameWhenAcceptTcp);
CfgAddBool(f, "DisableCoreDumpOnUnix", s->DisableCoreDumpOnUnix);
+ CfgAddBool(f, "AcceptOnlyTls", c->AcceptOnlyTls);
+
// Disable session reconnect
CfgAddBool(f, "DisableSessionReconnect", GetGlobalServerFlag(GSF_DISABLE_SESSION_RECONNECT));
}
|