diff options
| author | dnobori <da.git@softether.co.jp> | 2014-02-16 22:16:50 +0400 |
|---|---|---|
| committer | dnobori <da.git@softether.co.jp> | 2014-02-16 22:16:50 +0400 |
| commit | e8ce5fa014737874eee79894af99f35b91b02574 (patch) | |
| tree | 07fe12941e2e46a3ec81b976a681b64607ba63b3 /src/Cedar | |
| parent | bad6a4c22baf11b855e2afbf3e9960ef7d013a50 (diff) | |
v4.05-9422-beta
Diffstat (limited to 'src/Cedar')
| -rw-r--r-- | src/Cedar/CM.c | 2 | ||||
| -rw-r--r-- | src/Cedar/CMInner.h | 2 | ||||
| -rw-r--r-- | src/Cedar/Cedar.h | 8 | ||||
| -rw-r--r-- | src/Cedar/SW.c | 10 | ||||
| -rw-r--r-- | src/Cedar/SeLowUser.c | 30 |
5 files changed, 44 insertions, 8 deletions
diff --git a/src/Cedar/CM.c b/src/Cedar/CM.c index 7d8194fb..3181f7cb 100644 --- a/src/Cedar/CM.c +++ b/src/Cedar/CM.c @@ -12,6 +12,8 @@ // http://www.softether.org/
//
// Author: Daiyuu Nobori
+// Contributors:
+// - ELIN (https://github.com/el1n)
// Comments: Tetsuo Sugiyama, Ph.D.
//
//
diff --git a/src/Cedar/CMInner.h b/src/Cedar/CMInner.h index 82d9365c..06e95196 100644 --- a/src/Cedar/CMInner.h +++ b/src/Cedar/CMInner.h @@ -12,6 +12,8 @@ // http://www.softether.org/
//
// Author: Daiyuu Nobori
+// Contributors:
+// - ELIN (https://github.com/el1n)
// Comments: Tetsuo Sugiyama, Ph.D.
//
//
diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h index 4db881d6..fa32e89a 100644 --- a/src/Cedar/Cedar.h +++ b/src/Cedar/Cedar.h @@ -117,7 +117,7 @@ #define CEDAR_VER 405
// Build Number
-#define CEDAR_BUILD 9418
+#define CEDAR_BUILD 9422
// 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 6
+#define BUILD_DATE_D 17
#define BUILD_DATE_HO 1
-#define BUILD_DATE_MI 58
-#define BUILD_DATE_SE 47
+#define BUILD_DATE_MI 29
+#define BUILD_DATE_SE 56
// Tolerable time difference
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)
diff --git a/src/Cedar/SW.c b/src/Cedar/SW.c index 331dc6c0..bcbb45c8 100644 --- a/src/Cedar/SW.c +++ b/src/Cedar/SW.c @@ -3113,7 +3113,15 @@ bool SwInstallMain(SW *sw, WIZARD_PAGE *wp, SW_COMPONENT *c) if (c->InstallService && sw->IsSystemMode)
{
// Not to install in the case of the VPN Client
- //if (c->Id != SW_CMP_VPN_CLIENT)
+ bool install_su = false;
+
+ if (c->Id != SW_CMP_VPN_CLIENT)
+ {
+ install_su = true;
+ }
+
+
+ if (install_su)
{
SwPerformPrint(wp, _UU("SW_PERFORM_MSG_INSTALL_SELOW"));
diff --git a/src/Cedar/SeLowUser.c b/src/Cedar/SeLowUser.c index 9af2eaea..aec38410 100644 --- a/src/Cedar/SeLowUser.c +++ b/src/Cedar/SeLowUser.c @@ -230,9 +230,33 @@ bool SuInstallDriverInner(bool force) // Get whether the current OS is supported by SeLow
bool SuIsSupportedOs()
{
- // At present, this doesn't support any OS.
- return false;
- //return MsIsWindows7();
+ if (MsRegReadIntEx2(REG_LOCAL_MACHINE, SL_REG_KEY_NAME, "DisableSeLow", false, true) != 0)
+ {
+ // Force disable
+ return false;
+ }
+
+ // If the Su driver is currently running,
+ // then return true.
+ if (MsIsServiceRunning(SL_PROTOCOL_NAME))
+ {
+ return true;
+ }
+
+ // Currently Windows 8.1 or later are supported
+ if (MsIsWindows81() == false)
+ {
+ return false;
+ }
+
+ // If Microsoft Routing and Remote Access service is running,
+ // then return false.
+ if (MsIsServiceRunning("RemoteAccess"))
+ {
+ return false;
+ }
+
+ return true;
}
// Write the next packet to the driver
|