1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-07-07 08:14:58 +03:00

v4.05-9423-beta

This commit is contained in:
dnobori
2014-02-18 20:09:33 +09:00
parent a832506f35
commit 496167ee81
286 changed files with 294 additions and 276 deletions

View File

@ -117,7 +117,7 @@
#define CEDAR_VER 405
// Build Number
#define CEDAR_BUILD 9422
#define CEDAR_BUILD 9423
// Beta number
//#define BETA_NUMBER 3
@ -138,10 +138,10 @@
// Specifies the build date
#define BUILD_DATE_Y 2014
#define BUILD_DATE_M 2
#define BUILD_DATE_D 17
#define BUILD_DATE_HO 1
#define BUILD_DATE_MI 29
#define BUILD_DATE_SE 56
#define BUILD_DATE_D 18
#define BUILD_DATE_HO 19
#define BUILD_DATE_MI 9
#define BUILD_DATE_SE 44
// Tolerable time difference
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)

View File

@ -139,6 +139,12 @@ bool SuInstallDriverInner(bool force)
return false;
}
if (MsIsServiceRunning("RemoteAccess"))
{
// Remote Access service is running
return false;
}
CombinePathW(tmp_dir, sizeof(tmp_dir), MsGetWindowsDirW(), L"Temp");
MakeDirExW(tmp_dir);

View File

@ -2468,13 +2468,8 @@ void SiLoadInitialConfiguration(SERVER *s)
{
// Enable VPN-over-ICMP" and VPN-over-DNS for default setting
s->EnableVpnOverIcmp = SiCanOpenVpnOverIcmpPort();
s->EnableVpnOverDns = SiCanOpenVpnOverDnsPort();
#ifdef OS_WIN32
// Over-DNS is disabled on Windows by default
s->EnableVpnOverIcmp = false;
s->EnableVpnOverDns = false;
#endif // OS_WIN32
}
}
@ -5687,7 +5682,7 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f)
}
else
{
s->EnableVpnOverIcmp = SiCanOpenVpnOverIcmpPort();;
s->EnableVpnOverIcmp = false;
}
// Enable the VPN-over-DNS
@ -5697,7 +5692,7 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f)
}
else
{
s->EnableVpnOverDns = SiCanOpenVpnOverDnsPort();
s->EnableVpnOverDns = false;
}
}