AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-06-28 11:55:08 +03:00
Code Releases Activity

spelling: additional

Browse Source
This commit is contained in:
Josh Soref 2018-02-28 02:24:38 +00:00
parent 01673a1a9b
commit e4ca50c20e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Cedar/Cedar.h
View File

@ -274,7 +274,7 @@
#define MAX_RETRY_INTERVAL (300 * 1000) // Maximum retry interval #define MAX_RETRY_INTERVAL (300 * 1000) // Maximum retry interval
#define RETRY_INTERVAL_SPECIAL (60 * 1000) // Reconnection interval of a special case #define RETRY_INTERVAL_SPECIAL (60 * 1000) // Reconnection interval of a special case
#define MAX_ADDITONAL_CONNECTION_FAILED_COUNTER 16 // Allowable number that can be serially failed to additional connection #define MAX_ADDITIONAL_CONNECTION_FAILED_COUNTER 16 // Allowable number that can be serially failed to additional connection
#define ADDITIONAL_CONNECTION_COUNTER_RESET_INTERVAL (30 * 60 * 1000) // Reset period of additional connection failure counter #define ADDITIONAL_CONNECTION_COUNTER_RESET_INTERVAL (30 * 60 * 1000) // Reset period of additional connection failure counter
#define MAC_MIN_LIMIT_COUNT 3 // Minimum number of MAC addresses #define MAC_MIN_LIMIT_COUNT 3 // Minimum number of MAC addresses

6
src/Cedar/Protocol.c
View File

@ -6492,7 +6492,7 @@ SOCK *ClientConnectGetSocket(CONNECTION *c, bool additional_connect, bool no_tls
volatile bool *cancel_flag = NULL; volatile bool *cancel_flag = NULL;
void *hWnd; void *hWnd;
UINT nat_t_err = 0; UINT nat_t_err = 0;
bool is_additonal_rudp_session = false; bool is_additional_rudp_session = false;
UCHAR uc = 0; UCHAR uc = 0;
IP ret_ip; IP ret_ip;
// Validate arguments // Validate arguments
@ -6508,7 +6508,7 @@ SOCK *ClientConnectGetSocket(CONNECTION *c, bool additional_connect, bool no_tls
if (sess != NULL) if (sess != NULL)
{ {
cancel_flag = &sess->CancelConnect; cancel_flag = &sess->CancelConnect;
is_additonal_rudp_session = sess->IsRUDPSession; is_additional_rudp_session = sess->IsRUDPSession;
} }
hWnd = c->hWndForUI; hWnd = c->hWndForUI;
@ -6552,7 +6552,7 @@ SOCK *ClientConnectGetSocket(CONNECTION *c, bool additional_connect, bool no_tls
// If additional_connect == false, enable trying to NAT-T connection // If additional_connect == false, enable trying to NAT-T connection
// If additional_connect == true, follow the IsRUDPSession setting in this session // If additional_connect == true, follow the IsRUDPSession setting in this session
s = TcpIpConnectEx(host_for_direct_connection, port_for_direct_connection, s = TcpIpConnectEx(host_for_direct_connection, port_for_direct_connection,
(bool *)cancel_flag, hWnd, &nat_t_err, (additional_connect ? (!is_additonal_rudp_session) : false), (bool *)cancel_flag, hWnd, &nat_t_err, (additional_connect ? (!is_additional_rudp_session) : false),
true, no_tls, &ret_ip); true, no_tls, &ret_ip);
} }
} }

2
src/Cedar/Session.c
View File

@ -980,7 +980,7 @@ void ClientAdditionalConnectChance(SESSION *s)
return; return;
} }
if (s->IsRUDPSession && (s->Connection->AdditionalConnectionFailedCounter > MAX_ADDITONAL_CONNECTION_FAILED_COUNTER)) if (s->IsRUDPSession && (s->Connection->AdditionalConnectionFailedCounter > MAX_ADDITIONAL_CONNECTION_FAILED_COUNTER))
{ {
// Not to make a large amount of repeated connection retry within a certain time in the case of R-UDP session // Not to make a large amount of repeated connection retry within a certain time in the case of R-UDP session
return; return;