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

v4.05-9416-beta

Browse Source
This commit is contained in:
dnobori
2014-02-06 01:36:42 +09:00
parent 8920d01a37
commit bb853cc18b
306 changed files with 523 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Cedar/Admin.c
View File

@ -12,6 +12,8 @@
// http://www.softether.org/
//
// Author: Daiyuu Nobori
// Contributors:
// - ELIN (https://github.com/el1n)
// Comments: Tetsuo Sugiyama, Ph.D.
//
//

20
src/Cedar/Cedar.h
View File

@ -114,10 +114,10 @@
// Version number
#define CEDAR_VER 404
#define CEDAR_VER 405
// Build Number
#define CEDAR_BUILD 9412
#define CEDAR_BUILD 9416
// Beta number
//#define BETA_NUMBER 3
@ -137,11 +137,11 @@
// Specifies the build date
#define BUILD_DATE_Y 2014
#define BUILD_DATE_M 1
#define BUILD_DATE_D 15
#define BUILD_DATE_HO 17
#define BUILD_DATE_MI 22
#define BUILD_DATE_SE 14
#define BUILD_DATE_M 2
#define BUILD_DATE_D 6
#define BUILD_DATE_HO 0
#define BUILD_DATE_MI 36
#define BUILD_DATE_SE 26
// Tolerable time difference
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)
@ -708,12 +708,12 @@
#ifdef UNIX_MACOS
#ifdef NO_VLAN
#define TAP_MACOS_FILENAME "/dev/tap0"
#else
#else // NO_VLAN
#define TAP_MACOS_FILENAME "tap"
#endif
#endif // NO_VLAN
#define TAP_MACOS_DIR "/dev/"
#define TAP_MACOS_NUMBER (16)
#endif
#endif // UNIX_MACOS

17
src/Cedar/Client.c
View File

@ -12,6 +12,8 @@
// http://www.softether.org/
//
// Author: Daiyuu Nobori
// Contributors:
// - nattoheaven (https://github.com/nattoheaven)
// Comments: Tetsuo Sugiyama, Ph.D.
//
//
@ -7462,7 +7464,7 @@ bool CtDisableVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *vlan)
CiSetError(c, ERR_NOT_SUPPORTED);
return false;
}
#endif
#endif // NO_VLAN
// Check whether the virtual LAN card with the specified name is not
// being used by one or more accounts
@ -7615,7 +7617,7 @@ bool CtEnableVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *vlan)
CiSetError(c, ERR_NOT_SUPPORTED);
return false;
}
#endif
#endif // NO_VLAN
// Search the virtual LAN card
LockList(c->UnixVLanList);
@ -7713,7 +7715,7 @@ bool CtDeleteVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *d)
CiSetError(c, ERR_NOT_SUPPORTED);
return false;
}
#endif
#endif // NO_VLAN
// Check whether the virtual LAN card with the specified name is not
// being used by one or more accounts
@ -8287,7 +8289,7 @@ bool CtCreateVLan(CLIENT *c, RPC_CLIENT_CREATE_VLAN *create)
CiSetError(c, ERR_NOT_SUPPORTED);
return false;
}
#endif
#endif // NO_VLAN
// Check whether the specified name is valid or not
if (IsSafeStr(create->DeviceName) == false)
@ -9812,7 +9814,7 @@ bool CiReadSettingFromCfg(CLIENT *c, FOLDER *root)
if (OS_IS_UNIX(GetOsInfo()->OsType)
#ifdef NO_VLAN
&& GetOsInfo()->OsType != OSTYPE_MACOS_X
#endif
#endif // NO_VLAN
)
{
// Read the UNIX version virtual LAN card list (except MacOS)
@ -9844,8 +9846,7 @@ bool CiReadSettingFromCfg(CLIENT *c, FOLDER *root)
Add(c->UnixVLanList, uv);
#endif // OS_UNIX
}
#endif
#endif // NO_VLAN
CiLoadAccountDatabase(c, db);
if (CfgGetByte(root, "EncryptedPassword", c->EncryptedPassword, SHA1_SIZE) == false)
@ -10354,7 +10355,7 @@ void CiWriteSettingToCfg(CLIENT *c, FOLDER *root)
if (OS_IS_UNIX(GetOsInfo()->OsType)
#ifdef NO_VLAN
&& GetOsInfo()->OsType != OSTYPE_MACOS_X
#endif
#endif // NO_VLAN
)
{
vlan = CfgCreateFolder(root, "UnixVLan");

4
src/Cedar/VLanUnix.c
View File

@ -12,6 +12,8 @@
// http://www.softether.org/
//
// Author: Daiyuu Nobori
// Contributors:
// - nattoheaven (https://github.com/nattoheaven)
// Comments: Tetsuo Sugiyama, Ph.D.
//
//
@ -538,7 +540,7 @@ int UnixCreateTapDeviceEx(char *name, char *prefix, UCHAR *mac_address)
close(s);
}
#endif
#endif // UNIX_MACOS
#ifdef UNIX_SOLARIS
// Create a tap for Solaris
{

17
src/Cedar/WinUi.c
View File

@ -3729,9 +3729,22 @@ UINT AboutDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *param
CombinePathW(path, sizeof(path), MsGetExeDirNameW(), L"vpnsetup.exe");
if (MsExecuteW(path, L"/language:yes") == false)
if (IsFileExistsW(path))
{
MsgBox(hWnd, MB_ICONEXCLAMATION, _UU("SW_CHILD_PROCESS_ERROR"));
// with Installer
if (MsExecuteW(path, L"/language:yes") == false)
{
MsgBox(hWnd, MB_ICONEXCLAMATION, _UU("SW_CHILD_PROCESS_ERROR"));
}
}
else
{
// without Installer
CombinePathW(path, sizeof(path), MsGetExeDirNameW(), L"lang.config");
if (MsExecuteW(path, L"") == false)
{
MsgBox(hWnd, MB_ICONEXCLAMATION, _UU("SW_CHILD_PROCESS_ERROR"));
}
}
}
break;