AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00
Code Releases Activity

Merge PR #665: src/Cedar/Client.c: remove redundant "if" statement, unused variable

Browse Source
This commit is contained in:
Davide Beatrici 2018-08-22 20:53:29 +02:00 committed by GitHub
commit 2b855c8db7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Cedar/Client.c
View File

@ -497,13 +497,11 @@ bool CnIsCnServiceReady()
// Check whether the notification service is already running // Check whether the notification service is already running
bool CnCheckAlreadyExists(bool lock) bool CnCheckAlreadyExists(bool lock)
{ {
bool ret = false;
#ifdef OS_WIN32 #ifdef OS_WIN32
ret = Win32CnCheckAlreadyExists(lock); return Win32CnCheckAlreadyExists(lock);
#else
return false;
#endif #endif
return ret;
} }
typedef struct CNC_STATUS_PRINTER_WINDOW_PARAM typedef struct CNC_STATUS_PRINTER_WINDOW_PARAM
@ -9091,7 +9089,6 @@ void CiSetVLanToDefault(CLIENT *c)
} }
#else // OS_WIN32 #else // OS_WIN32
{ {
UINT i;
UNIX_VLAN *v; UNIX_VLAN *v;
LockList(c->UnixVLanList); LockList(c->UnixVLanList);
@ -9163,16 +9160,8 @@ void CiInitConfiguration(CLIENT *c)
// Clear the password // Clear the password
Hash(c->EncryptedPassword, "", 0, true); Hash(c->EncryptedPassword, "", 0, true);
// Initialize the client configuration // Initialize the client configuration
if (OS_IS_WINDOWS(GetOsInfo()->OsType)) // Disable remote management
{
// Disable remote management in Windows
c->Config.AllowRemoteConfig = false; c->Config.AllowRemoteConfig = false;
}
else
{
// Disable the remote management also in case of UNIX
c->Config.AllowRemoteConfig = false;
}
StrCpy(c->Config.KeepConnectHost, sizeof(c->Config.KeepConnectHost), CLIENT_DEFAULT_KEEPALIVE_HOST); StrCpy(c->Config.KeepConnectHost, sizeof(c->Config.KeepConnectHost), CLIENT_DEFAULT_KEEPALIVE_HOST);
c->Config.KeepConnectPort = CLIENT_DEFAULT_KEEPALIVE_PORT; c->Config.KeepConnectPort = CLIENT_DEFAULT_KEEPALIVE_PORT;
c->Config.KeepConnectProtocol = CONNECTION_UDP; c->Config.KeepConnectProtocol = CONNECTION_UDP;