diff options
Diffstat (limited to 'src/Cedar/Interop_SSTP.c')
| -rw-r--r-- | src/Cedar/Interop_SSTP.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Cedar/Interop_SSTP.c b/src/Cedar/Interop_SSTP.c index d4a6c14c..6ea60473 100644 --- a/src/Cedar/Interop_SSTP.c +++ b/src/Cedar/Interop_SSTP.c @@ -3,9 +3,9 @@ //
// SoftEther VPN Server, Client and Bridge are free software under GPLv2.
//
-// Copyright (c) 2012-2014 Daiyuu Nobori.
-// Copyright (c) 2012-2014 SoftEther VPN Project, University of Tsukuba, Japan.
-// Copyright (c) 2012-2014 SoftEther Corporation.
+// Copyright (c) 2012-2016 Daiyuu Nobori.
+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.
+// Copyright (c) 2012-2016 SoftEther Corporation.
//
// All Rights Reserved.
//
@@ -118,6 +118,7 @@ static bool g_no_sstp = false; // Get the SSTP disabling flag
bool GetNoSstp()
{
+
return g_no_sstp;
}
@@ -1175,8 +1176,9 @@ bool ProcessSstpHttps(CEDAR *cedar, SOCK *s, SOCK_EVENT *se) // Wait for the next state change
if (state_changed == false)
{
+ UINT select_time = SELECT_TIME;
UINT r = GetNextIntervalForInterrupt(sstp->Interrupt);
- WaitSockEvent(se, MIN(r, SELECT_TIME));
+ WaitSockEvent(se, MIN(r, select_time));
}
}
|