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

Merge pull request #23 from el1n/autoconnect

Browse Source 
Client Manager supporting /hostname and /password
This commit is contained in:
Daiyuu Nobori 2014-02-17 01:05:37 +09:00
commit bad6a4c22b
2 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/Cedar/CM.c
View File

@ -11743,7 +11743,7 @@ RETRY:
// Attempt to connect // Attempt to connect
if ((cm->Client = CcConnectRpc( if ((cm->Client = CcConnectRpc(
cm->server_name == NULL ? "localhost" : cm->server_name, cm->server_name == NULL ? "localhost" : cm->server_name,
"", &bad_pass, &no_remote, cm->StartupMode == false ? 0 : 60000)) == NULL) cm->password == NULL ? "" : cm->password, &bad_pass, &no_remote, cm->StartupMode == false ? 0 : 60000)) == NULL)
{ {
if (no_remote) if (no_remote)
{ {
@ -11799,9 +11799,54 @@ RETRY:
void MainCM() void MainCM()
{ {
// If there is /remote in the argument, show the screen of the remote connection // If there is /remote in the argument, show the screen of the remote connection
char *cmdline = GetCommandLineStr(); TOKEN_LIST *cmdline = GetCommandLineToken();
if (StrCmpi(cmdline, "/remote") == 0) UINT i = 0;
bool isRemote = false;
if (cm->server_name != NULL)
{
Free(cm->server_name);
}
cm->server_name = NULL;
if (cm->password != NULL)
{
Free(cm->password);
}
cm->password = NULL;
for(i = 0; i < cmdline->NumTokens; ++i)
{
if (StrCmpi(cmdline->Token[i], "/remote") == 0)
{
isRemote = true;
}
else if (StrCmpi(cmdline->Token[i], "/hostname") == 0 && i + 1 < cmdline->NumTokens)
{
isRemote = true;
if (cm->server_name != NULL)
{
Free(cm->server_name);
}
cm->server_name = CopyStr(cmdline->Token[++i]);
}
else if (StrCmpi(cmdline->Token[i], "/password") == 0 && i + 1 < cmdline->NumTokens)
{
if (cm->password != NULL)
{
Free(cm->password);
}
cm->password = CopyStr(cmdline->Token[++i]);
}
else if (StrCmpi(cmdline->Token[i], "/startup") == 0)
{
// Startup mode
cm->StartupMode = true;
}
}
if (isRemote && cm->server_name == NULL)
{ {
char *hostname = RemoteDlg(NULL, CM_REG_KEY, ICO_VPN, _UU("CM_TITLE"), _UU("CM_REMOTE_TITLE"), NULL); char *hostname = RemoteDlg(NULL, CM_REG_KEY, ICO_VPN, _UU("CM_TITLE"), _UU("CM_REMOTE_TITLE"), NULL);
if (hostname == NULL) if (hostname == NULL)
@ -11819,13 +11864,7 @@ void MainCM()
} }
} }
if (StrCmpi(cmdline, "/startup") == 0) FreeToken(cmdline);
{
// Startup mode
cm->StartupMode = true;
}
Free(cmdline);
if (IsZero(cm->ShortcutKey, SHA1_SIZE) == false) if (IsZero(cm->ShortcutKey, SHA1_SIZE) == false)
{ {

1
src/Cedar/CMInner.h
View File

@ -136,6 +136,7 @@ typedef struct CM
HWND hStatusBar; HWND hStatusBar;
REMOTE_CLIENT *Client; REMOTE_CLIENT *Client;
char *server_name; char *server_name;
char *password;
wchar_t *import_file_name; wchar_t *import_file_name;
bool HideStatusBar; bool HideStatusBar;
bool HideTrayIcon; bool HideTrayIcon;