diff options
Diffstat (limited to 'src/Cedar/Server.c')
| -rw-r--r-- | src/Cedar/Server.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/Cedar/Server.c b/src/Cedar/Server.c index 191fc147..feb486e9 100644 --- a/src/Cedar/Server.c +++ b/src/Cedar/Server.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2016 Daiyuu Nobori.
-// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2016 SoftEther Corporation.
+// Copyright (c) Daiyuu Nobori, Ph.D..
+// Copyright (c) SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -923,7 +923,11 @@ void SiWriteSysLog(SERVER *s, char *typestr, char *hubname, wchar_t *message) // Date and time
LocalTime(&st);
- GetDateTimeStrMilli(datetime, sizeof(datetime), &st);
+ if(s->StrictSyslogDatetimeFormat){
+ GetDateTimeStrRFC3164(datetime, sizeof(datetime), &st, GetCurrentTimezone());
+ }else{
+ GetDateTimeStrMilli(datetime, sizeof(datetime), &st);
+ }
if (IsEmptyStr(hubname) == false)
{
@@ -936,6 +940,8 @@ void SiWriteSysLog(SERVER *s, char *typestr, char *hubname, wchar_t *message) machinename, datetime, typestr, message);
}
+ Debug("Syslog send: %S\n",tmp);
+
SendSysLog(s->Syslog, tmp);
}
@@ -6177,6 +6183,8 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f) c->SslAcceptSettings.Tls_Disable1_0 = CfgGetBool(f, "Tls_Disable1_0");
c->SslAcceptSettings.Tls_Disable1_1 = CfgGetBool(f, "Tls_Disable1_1");
c->SslAcceptSettings.Tls_Disable1_2 = CfgGetBool(f, "Tls_Disable1_2");
+
+ s->StrictSyslogDatetimeFormat = CfgGetBool(f, "StrictSyslogDatetimeFormat");
}
Unlock(c->lock);
@@ -6492,6 +6500,8 @@ void SiWriteServerCfg(FOLDER *f, SERVER *s) // Disable session reconnect
CfgAddBool(f, "DisableSessionReconnect", GetGlobalServerFlag(GSF_DISABLE_SESSION_RECONNECT));
+
+ CfgAddBool(f, "StrictSyslogDatetimeFormat", s->StrictSyslogDatetimeFormat);
}
Unlock(c->lock);
}
@@ -11067,7 +11077,3 @@ SERVER *SiNewServerEx(bool bridge, bool in_client_inner_server, bool relay_serve return s;
}
-
-// Developed by SoftEther VPN Project at University of Tsukuba in Japan.
-// Department of Computer Science has dozens of overly-enthusiastic geeks.
-// Join us: http://www.tsukuba.ac.jp/english/admission/
|