diff --git a/ChangeLog b/ChangeLog
index 33a8525a..17610a2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@ Allow specifying cipher suites instead of single ciphers. PR #343
Add parameter "ListenIP" to server configuration (vpn_server.config). PR #202
cppcheck findings. PR #275
Add DhParamBits configuration to set Diffie-Hellman parameters. PR #129
-Fix log msg for IKE with agressive exchange mode. PR #425
+Fix log msg for IKE with aggressive exchange mode. PR #425
Fixes 11 vulnerabilities found by Max Planck Institute for Molecular Genetics and Mr. Guido Vranken. PR #419
Fixed the bug which occurs the L2TP/IPsec connection error with Android Oreo, etc. PR #405
build documentation refactoring. PR #395
@@ -22,7 +22,7 @@ Upgraded OpenSSL to 1.0.2l.
Source code is now compatible with OpenSSL 1.1.x. Supports DHE-RSA-CHACHA 20-POLY 1305 and ECDHE-RSA-CHACHA 20-POLY 1305, which are new encryption methods of TLS 1.2. (In order to use this new function, you need to recompile yourself using OpenSSL 1.1.x.)
TrafficServer / TrafficClient function (The traffic throughput measurement function) is now multithreaded and compatible with about 10 Gbps using NIC with the RSS feature.
Changed the default algorithm for SSL from RC4-MD5 to AES128-SHA.
-Fixed a bug that occurr wrong checksum recalculation in special case of the TCP-MSS clamp processing.
+Fixed a bug that occur wrong checksum recalculation in special case of the TCP-MSS clamp processing.
Fixed the calculation interval of update interval of DHCP client packet issued by kernel mode virtual NAT function of SecureNAT function.
Driver upgrade and DLL name change with Crypto ID support of USB security token.
Fixed a problem that CPU sleep processing was not performed when the wait time of the Select () function was INFINITE on Mac OS X.
@@ -102,13 +102,13 @@ Added the compatibility with Cisco 800 series routers (e.g. Cisco 841M) on the L
Added the support the compatibility to YAMAHA RTX series routers on the L2TPv3 over IPsec protocol.
-Added the support for EAP and PEAP. SoftEther VPN Server can now speak RFC3579 (EAP) or Protected EAP (PEAP) to request user authentications to the RADIUS server with the MS-CHAPv2 mechanism. If this function is enabled, all requests from L2TP VPN clients which contain MS-CHAPv2 authentication data will be converted automatically to EAP or PEAP when it is transferred to the RADIUS server. You must enable this function manually for each of Virtual Hubs. To enable the function converting from MS-CHAPv2 to EAP, set the "RadiusConvertAllMsChapv2AuthRequestToEap" value to "true" in the vpn_server.config. To enable the functin converting from MS-CHAPv2 to PEAP, set both "RadiusConvertAllMsChapv2AuthRequestToEap" and "RadiusUsePeapInsteadOfEap" options to "true".
+Added the support for EAP and PEAP. SoftEther VPN Server can now speak RFC3579 (EAP) or Protected EAP (PEAP) to request user authentications to the RADIUS server with the MS-CHAPv2 mechanism. If this function is enabled, all requests from L2TP VPN clients which contain MS-CHAPv2 authentication data will be converted automatically to EAP or PEAP when it is transferred to the RADIUS server. You must enable this function manually for each of Virtual Hubs. To enable the function converting from MS-CHAPv2 to EAP, set the "RadiusConvertAllMsChapv2AuthRequestToEap" value to "true" in the vpn_server.config. To enable the function converting from MS-CHAPv2 to PEAP, set both "RadiusConvertAllMsChapv2AuthRequestToEap" and "RadiusUsePeapInsteadOfEap" options to "true".
SoftEther VPN 4.19 Build 9578 Beta (September 15, 2015)
Solved the problem that kernel mode drivers do not pass the general tests of "Driver Verifier Manager" in Windows 10.
SoftEther VPN 4.18 Build 9570 RTM (July 26, 2015)
-Compabible with Windows 10.
+Compatible with Windows 10.
Solved the problem that the customized language setting on the "lang.config" file.
config sometimes corrupts in the rare condition.
@@ -279,7 +279,7 @@ Whole English UI texts are checked and corrected by a native speaker of English.
SoftEther VPN 4.03 Build 9411 (January 7, 2014)
Modified the source-code tree. In the build 9408, some C# build-utility source codes were missing. In this build, full set of all source codes including the BuildUtil program are appended. No functional differences between this build and the last build.
-SoftEther VPN 4.03 Build 9408 (Jaunary 4, 2014)
+SoftEther VPN 4.03 Build 9408 (January 4, 2014)
SoftEther VPN became open source software from this build. More details on this page. Note that the major version 3.xx was skipped for internal reason of our project. So this open-sourced new version starts with major version 4.xx.
SoftEther VPN 2.00 Build 9387 (September 16, 2013)
@@ -345,7 +345,7 @@ Improvement of the stability of UDP-based communication.
Fixed a problem: SecureNAT's connectivity polling packet interval was too short.
SoftEther VPN 1.00 Build 9035 RC2 Fix8 (March 26, 2013)
-Fixed a crash bug: While you are changeing the X.509 server certificate, if a new SSL-VPN connection is being made, the new connection attempt will cause the crash because lack of critical section locking. However this bug was very rare. We found it in the heavy stress test.
+Fixed a crash bug: While you are changing the X.509 server certificate, if a new SSL-VPN connection is being made, the new connection attempt will cause the crash because lack of critical section locking. However this bug was very rare. We found it in the heavy stress test.
SoftEther VPN 1.00 Build 9033 RC2 Fix7 (March 22, 2013)
Fixed a minor bug.
diff --git a/README.md b/README.md
index 02f7025d..f56cf03a 100644
--- a/README.md
+++ b/README.md
@@ -145,7 +145,7 @@ from GitHub. You may make your own fork project from our project.
- libssl-dev
- zlib1g-dev
-### 2. Redhat/CentOS
+### 2. Red Hat/CentOS
- gcc
- openssl-devel
- make
diff --git a/THIRD_PARTY.TXT b/THIRD_PARTY.TXT
index 7dba27e3..6846f45e 100644
--- a/THIRD_PARTY.TXT
+++ b/THIRD_PARTY.TXT
@@ -606,7 +606,7 @@ This package is an SSL implementation written by Eric Young
Netscapes SSL.
This library is free for commercial and non-commercial use as long as the
-following conditions are aheared to. The following conditions apply to all
+following conditions are adhered to. The following conditions apply to all
code found in this distribution, be it the RC4, RSA, lhash, DES, etc., code;
not just the SSL code. The SSL documentation included with this distribution
is covered by the same copyright terms except that the holder is Tim Hudson
diff --git a/WARNING.TXT b/WARNING.TXT
index 01c37e0a..3fda535d 100644
--- a/WARNING.TXT
+++ b/WARNING.TXT
@@ -80,9 +80,9 @@ the destination hostname which is specified on the VPN-client side to disable
VPN over ICMP / DNS functions.
1.5. VPN Azure Cloud Service
-If your SoftEther VPN Server is placed behind the NAT or firwall, and by some
+If your SoftEther VPN Server is placed behind the NAT or firewall, and by some
reason you cannot use NAT Traversal function, Dynamic DNS function or VPN over
-ICMP/DNS function, you can use VPN Azure Clouse Service. SoftEther Corporation
+ICMP/DNS function, you can use VPN Azure Cloud Service. SoftEther Corporation
operates VPN Azure Cloud on Internet. After the VPN Server makes a connection
to the VPN Azure Cloud, the hostname "abc.vpnazure.net" ( "abc" is a unique
hostname) can be specified to connect to the VPN Server via the VPN Azure
diff --git a/centos/README.md b/centos/README.md
index a75f335f..facf0957 100644
--- a/centos/README.md
+++ b/centos/README.md
@@ -14,7 +14,7 @@ You can also have it start automatically:
## Files
-This project containts the following files to build an RPM of SoftEther VPN:
+This project contains the following files to build an RPM of SoftEther VPN:
* SPEC/softethervpn.spec - The main spec file
* SOURCES/fix-makefiles.sh - Script that modifies the original makefiles so it properly makes with BUILDROOT.
diff --git a/src/BuildUtil/BuildUtilCommands.cs b/src/BuildUtil/BuildUtilCommands.cs
index 96c5d523..1858a3c0 100644
--- a/src/BuildUtil/BuildUtilCommands.cs
+++ b/src/BuildUtil/BuildUtilCommands.cs
@@ -142,7 +142,7 @@ namespace BuildUtil
"All [yes|no] [/NORMALIZESRC:yes|no] [/IGNOREERROR:yes|no] [/DEBUG:yes|no] [/SERIAL:yes|no]",
"Builds all sources and releases all packages.",
"[yes|no]:Specify 'yes' if you'd like to increment the build number.",
- "NORMALIZESRC:Specity 'yes' if you'd like to normalize the build infomations in the source codes and resource scripts.",
+ "NORMALIZESRC:Specity 'yes' if you'd like to normalize the build informations in the source codes and resource scripts.",
"IGNOREERROR:Specify yes if you'd like to ignore the child process to show the error message.",
"SERIAL:Specify yes not to use parallel mode.",
"DEBUG:Specity yes to enable debug mode. (UNIX only)"
@@ -945,7 +945,7 @@ namespace BuildUtil
"BuildWin32 [yes|no] [/NORMALIZESRC:yes|no]",
"Builds all executable files for win32 and HamCore for all OS.",
"[yes|no]:Specify 'yes' if you'd like to increment the build number.",
- "NORMALIZESRC:Specity 'yes' if you'd like to normalize the build infomations in the source codes and resource scripts."
+ "NORMALIZESRC:Specity 'yes' if you'd like to normalize the build informations in the source codes and resource scripts."
)]
static int BuildWin32(ConsoleService c, string cmdName, string str)
{
diff --git a/src/BuildUtil/CoreUtil/Cache.cs b/src/BuildUtil/CoreUtil/Cache.cs
index d8a5c37f..43225371 100644
--- a/src/BuildUtil/CoreUtil/Cache.cs
+++ b/src/BuildUtil/CoreUtil/Cache.cs
@@ -296,11 +296,11 @@ namespace CoreUtil
{
bool do_delete = false;
long now = Tick64.Value;
- long delete_inveral = expireSpan.Milliseconds / 10;
+ long delete_interval = expireSpan.Milliseconds / 10;
lock (lockObj)
{
- if (last_deleted == 0 || now > (last_deleted + delete_inveral))
+ if (last_deleted == 0 || now > (last_deleted + delete_interval))
{
last_deleted = now;
do_delete = true;
diff --git a/src/BuildUtil/CoreUtil/Console.cs b/src/BuildUtil/CoreUtil/Console.cs
index 07204d13..bedeac42 100644
--- a/src/BuildUtil/CoreUtil/Console.cs
+++ b/src/BuildUtil/CoreUtil/Console.cs
@@ -1129,12 +1129,12 @@ namespace CoreUtil
}
else if (candidate.Count >= 2)
{
- this.write(Str.FormatC(Resources.CON_AMBIGIOUS_CMD, cmd_name));
- this.write(Resources.CON_AMBIGIOUS_CMD_1);
+ this.write(Str.FormatC(Resources.CON_AMBIGUOUS_CMD, cmd_name));
+ this.write(Resources.CON_AMBIGUOUS_CMD_1);
string[] candidateArray = candidate.ToArray();
PrintCandidateHelp(null, candidateArray, 1, cmdList);
- this.write(Resources.CON_AMBIGIOUS_CMD_2);
+ this.write(Resources.CON_AMBIGUOUS_CMD_2);
this.retCode = ConsoleErrorCode.ERR_BAD_COMMAND_OR_PARAM;
}
@@ -1552,14 +1552,14 @@ namespace CoreUtil
{
if (candidate.Length >= 2)
{
- this.write(Str.FormatC(Resources.CON_AMBIGIOUS_PARAM,
+ this.write(Str.FormatC(Resources.CON_AMBIGUOUS_PARAM,
param_list[i]));
- this.write(Str.FormatC(Resources.CON_AMBIGIOUS_PARAM_1,
+ this.write(Str.FormatC(Resources.CON_AMBIGUOUS_PARAM_1,
cmdName));
PrintCandidateHelp(cmdName, candidate, 1, this.currentCmdList);
- this.write(Resources.CON_AMBIGIOUS_PARAM_2);
+ this.write(Resources.CON_AMBIGUOUS_PARAM_2);
ok = false;
}
diff --git a/src/BuildUtil/CoreUtil/MultiLang.cs b/src/BuildUtil/CoreUtil/MultiLang.cs
index e938e5fa..926691e2 100644
--- a/src/BuildUtil/CoreUtil/MultiLang.cs
+++ b/src/BuildUtil/CoreUtil/MultiLang.cs
@@ -257,7 +257,7 @@ public class MultiLang
public readonly Page Page;
public readonly HttpRequest Request;
public readonly HttpResponse Response;
- public readonly bool IsUrlModefied;
+ public readonly bool IsUrlModified;
public readonly string OriginalUrl;
public readonly string PhysicalUrl;
public readonly bool IsFilenameModified;
@@ -394,7 +394,7 @@ public class MultiLang
this.IsSSL = isSsl;
this.Host = host;
- this.IsUrlModefied = Str.StrToBool((string)Request.Headers["SEISAPI_MODIFIED_URL"]);
+ this.IsUrlModified = Str.StrToBool((string)Request.Headers["SEISAPI_MODIFIED_URL"]);
this.OriginalUrl = (string)Request.Headers["SEISAPI_ORIGINAL_URL"];
int i;
@@ -404,7 +404,7 @@ public class MultiLang
this.OriginalUrl = this.OriginalUrl.Substring(0, i);
}
- if (Str.IsEmptyStr(this.OriginalUrl) || this.IsUrlModefied == false)
+ if (Str.IsEmptyStr(this.OriginalUrl) || this.IsUrlModified == false)
{
this.OriginalUrl = AspUtil.RemoveDefaultHtml(AspUtil.GetCurrentRequestUrl(Page));
}
diff --git a/src/BuildUtil/CoreUtil/Secure.cs b/src/BuildUtil/CoreUtil/Secure.cs
index 457ce1fc..63abd1c3 100644
--- a/src/BuildUtil/CoreUtil/Secure.cs
+++ b/src/BuildUtil/CoreUtil/Secure.cs
@@ -872,7 +872,7 @@ namespace CoreUtil
RevocationCheckNone = 16,
RevocationCheckEndCert = 32,
RevocationCheckChain = 64,
- RecovationCheckChainExcludeRoot = 128,
+ RevocationCheckChainExcludeRoot = 128,
Safer = 256,
HashOnly = 512,
UseDefaultOSVerCheck = 1024,
diff --git a/src/BuildUtil/CoreUtil/Util.cs b/src/BuildUtil/CoreUtil/Util.cs
index 19c094f0..6635695d 100644
--- a/src/BuildUtil/CoreUtil/Util.cs
+++ b/src/BuildUtil/CoreUtil/Util.cs
@@ -255,7 +255,7 @@ namespace CoreUtil
return DefaultLanguage;
}
- public static CoreLanguageClass GetLangugageClassByEnum(CoreLanguage lang)
+ public static CoreLanguageClass GetLanguageClassByEnum(CoreLanguage lang)
{
foreach (CoreLanguageClass c in LanguageList)
{
diff --git a/src/BuildUtil/CoreUtil/ZLib.cs b/src/BuildUtil/CoreUtil/ZLib.cs
index 2612eb60..c20781b2 100644
--- a/src/BuildUtil/CoreUtil/ZLib.cs
+++ b/src/BuildUtil/CoreUtil/ZLib.cs
@@ -4309,7 +4309,7 @@ namespace CoreUtil.Internal
/// Performs an unsigned bitwise right shift with the specified number
///
/// Number to operate on
- /// Ammount of bits to shift
+ /// Amount of bits to shift
/// The resulting number from the shift operation
public static int URShift(int number, int bits)
{
@@ -4323,7 +4323,7 @@ namespace CoreUtil.Internal
/// Performs an unsigned bitwise right shift with the specified number
///
/// Number to operate on
- /// Ammount of bits to shift
+ /// Amount of bits to shift
/// The resulting number from the shift operation
public static int URShift(int number, long bits)
{
@@ -4334,7 +4334,7 @@ namespace CoreUtil.Internal
/// Performs an unsigned bitwise right shift with the specified number
///
/// Number to operate on
- /// Ammount of bits to shift
+ /// Amount of bits to shift
/// The resulting number from the shift operation
public static long URShift(long number, int bits)
{
@@ -4348,7 +4348,7 @@ namespace CoreUtil.Internal
/// Performs an unsigned bitwise right shift with the specified number
///
/// Number to operate on
- /// Ammount of bits to shift
+ /// Amount of bits to shift
/// The resulting number from the shift operation
public static long URShift(long number, long bits)
{
@@ -4358,7 +4358,7 @@ namespace CoreUtil.Internal
/*******************************/
/// Reads a number of characters from the current source Stream and writes the data to the target array at the specified index.
/// The source Stream to read from.
- /// Contains the array of characteres read from the source Stream.
+ /// Contains the array of characters read from the source Stream.
/// The starting index of the target array.
/// The maximum number of characters to read from the source Stream.
/// The number of characters read. The number will be less than or equal to count depending on the data available in the source Stream. Returns -1 if the end of the stream is reached.
@@ -4383,7 +4383,7 @@ namespace CoreUtil.Internal
/// Reads a number of characters from the current source TextReader and writes the data to the target array at the specified index.
/// The source TextReader to read from
- /// Contains the array of characteres read from the source TextReader.
+ /// Contains the array of characters read from the source TextReader.
/// The starting index of the target array.
/// The maximum number of characters to read from the source TextReader.
/// The number of characters read. The number will be less than or equal to count depending on the data available in the source TextReader. Returns -1 if the end of the stream is reached.
@@ -4915,7 +4915,7 @@ namespace CoreUtil.Internal
{
if ((z.avail_in == 0) && (!nomoreinput))
{
- // if buffer is empty and more input is avaiable, refill it
+ // if buffer is empty and more input is available, refill it
z.next_in_index = 0;
z.avail_in = SupportClass.ReadInput(in_Renamed, buf, 0, bufsize); //(bufsize
- /// [j]入力が完了したら [OK] ボタンを、入力をキャンセルするには [キャンセル] ボタンをクリックしてください。[e]Please click the "OK" button after you complete filling all nessesary fields. To cancel inputting, click the "Cancel" button.[/] に類似しているローカライズされた文字列を検索します。
+ /// [j]入力が完了したら [OK] ボタンを、入力をキャンセルするには [キャンセル] ボタンをクリックしてください。[e]Please click the "OK" button after you complete filling all necessary fields. To cancel inputting, click the "Cancel" button.[/] に類似しているローカライズされた文字列を検索します。
///
internal static string CDF_TEXT_OK {
get {
@@ -904,9 +904,9 @@ namespace BuildUtil.Properties {
///
/// Input the port number: に類似しているローカライズされた文字列を検索します。
///
- internal static string CMD_PROPMT_PORT {
+ internal static string CMD_PROMPT_PORT {
get {
- return ResourceManager.GetString("CMD_PROPMT_PORT", resourceCulture);
+ return ResourceManager.GetString("CMD_PROMPT_PORT", resourceCulture);
}
}
@@ -949,54 +949,54 @@ namespace BuildUtil.Properties {
///
/// "%S": The command-name is ambiguous. に類似しているローカライズされた文字列を検索します。
///
- internal static string CON_AMBIGIOUS_CMD {
+ internal static string CON_AMBIGUOUS_CMD {
get {
- return ResourceManager.GetString("CON_AMBIGIOUS_CMD", resourceCulture);
+ return ResourceManager.GetString("CON_AMBIGUOUS_CMD", resourceCulture);
}
}
///
/// The specified command name matches the following multiple commands. に類似しているローカライズされた文字列を検索します。
///
- internal static string CON_AMBIGIOUS_CMD_1 {
+ internal static string CON_AMBIGUOUS_CMD_1 {
get {
- return ResourceManager.GetString("CON_AMBIGIOUS_CMD_1", resourceCulture);
+ return ResourceManager.GetString("CON_AMBIGUOUS_CMD_1", resourceCulture);
}
}
///
/// Please re-specify the command name more strictly. に類似しているローカライズされた文字列を検索します。
///
- internal static string CON_AMBIGIOUS_CMD_2 {
+ internal static string CON_AMBIGUOUS_CMD_2 {
get {
- return ResourceManager.GetString("CON_AMBIGIOUS_CMD_2", resourceCulture);
+ return ResourceManager.GetString("CON_AMBIGUOUS_CMD_2", resourceCulture);
}
}
///
/// "%S": The parameter name is ambiguous. に類似しているローカライズされた文字列を検索します。
///
- internal static string CON_AMBIGIOUS_PARAM {
+ internal static string CON_AMBIGUOUS_PARAM {
get {
- return ResourceManager.GetString("CON_AMBIGIOUS_PARAM", resourceCulture);
+ return ResourceManager.GetString("CON_AMBIGUOUS_PARAM", resourceCulture);
}
}
///
/// The specified parameter name matches with the following parameters that can be specified as a parameter of command "%S". に類似しているローカライズされた文字列を検索します。
///
- internal static string CON_AMBIGIOUS_PARAM_1 {
+ internal static string CON_AMBIGUOUS_PARAM_1 {
get {
- return ResourceManager.GetString("CON_AMBIGIOUS_PARAM_1", resourceCulture);
+ return ResourceManager.GetString("CON_AMBIGUOUS_PARAM_1", resourceCulture);
}
}
///
/// Please re-specify the parameter name more strictly. に類似しているローカライズされた文字列を検索します。
///
- internal static string CON_AMBIGIOUS_PARAM_2 {
+ internal static string CON_AMBIGUOUS_PARAM_2 {
get {
- return ResourceManager.GetString("CON_AMBIGIOUS_PARAM_2", resourceCulture);
+ return ResourceManager.GetString("CON_AMBIGUOUS_PARAM_2", resourceCulture);
}
}
diff --git a/src/BuildUtil/Properties/Resources.resx b/src/BuildUtil/Properties/Resources.resx
index 9d8a9056..7f831794 100644
--- a/src/BuildUtil/Properties/Resources.resx
+++ b/src/BuildUtil/Properties/Resources.resx
@@ -283,7 +283,7 @@
[j]エラーが発生しました。内容を見直してください。修正する場合は [修正する] ボタンをクリックしてください。[e]An error has been occurred. Please confirm the fields. To modify it, click the "Modify" button.[/]
- [j]入力が完了したら [OK] ボタンを、入力をキャンセルするには [キャンセル] ボタンをクリックしてください。[e]Please click the "OK" button after you complete filling all nessesary fields. To cancel inputting, click the "Cancel" button.[/]
+ [j]入力が完了したら [OK] ボタンを、入力をキャンセルするには [キャンセル] ボタンをクリックしてください。[e]Please click the "OK" button after you complete filling all necessary fields. To cancel inputting, click the "Cancel" button.[/][j]時刻が入力されていません。[e]Time is empty.[/]
@@ -371,7 +371,7 @@ IP アドレスは 192.168.0.1 のように 10 進数をドットで区切って
Enter a value:
-
+
Input the port number:
@@ -386,22 +386,22 @@ IP アドレスは 192.168.0.1 のように 10 進数をドットで区切って
There is no description for this parameter.
-
+
"%S": The command-name is ambiguous.
-
+
The specified command name matches the following multiple commands.
-
+
Please re-specify the command name more strictly.
-
+
"%S": The parameter name is ambiguous.
-
+
The specified parameter name matches with the following parameters that can be specified as a parameter of command "%S".
-
+
Please re-specify the parameter name more strictly.
diff --git a/src/Cedar/Account.c b/src/Cedar/Account.c
index 68e94bab..9bbeaf9c 100644
--- a/src/Cedar/Account.c
+++ b/src/Cedar/Account.c
@@ -1180,7 +1180,7 @@ void CleanupUser(USER *u)
ReleaseGroup(u->Group);
}
- // Free authntication data
+ // Free authentication data
FreeAuthData(u->AuthType, u->AuthData);
if (u->Policy)
@@ -1194,7 +1194,7 @@ void CleanupUser(USER *u)
Free(u);
}
-// Free authntication data
+// Free authentication data
void FreeAuthData(UINT authtype, void *authdata)
{
AUTHPASSWORD *pw = (AUTHPASSWORD *)authdata;
diff --git a/src/Cedar/Admin.c b/src/Cedar/Admin.c
index f1495a23..82fc6f2a 100644
--- a/src/Cedar/Admin.c
+++ b/src/Cedar/Admin.c
@@ -465,7 +465,7 @@ PACK *AdminDispatch(RPC *rpc, char *name, PACK *p)
DECLARE_RPC("DeleteHub", RPC_DELETE_HUB, StDeleteHub, InRpcDeleteHub, OutRpcDeleteHub)
DECLARE_RPC("GetHubRadius", RPC_RADIUS, StGetHubRadius, InRpcRadius, OutRpcRadius)
DECLARE_RPC("SetHubRadius", RPC_RADIUS, StSetHubRadius, InRpcRadius, OutRpcRadius)
- DECLARE_RPC_EX("EnumConnection", RPC_ENUM_CONNECTION, StEnumConnection, InRpcEnumConnection, OutRpcEnumConnection, FreeRpcEnumConnetion)
+ DECLARE_RPC_EX("EnumConnection", RPC_ENUM_CONNECTION, StEnumConnection, InRpcEnumConnection, OutRpcEnumConnection, FreeRpcEnumConnection)
DECLARE_RPC("DisconnectConnection", RPC_DISCONNECT_CONNECTION, StDisconnectConnection, InRpcDisconnectConnection, OutRpcDisconnectConnection)
DECLARE_RPC("GetConnectionInfo", RPC_CONNECTION_INFO, StGetConnectionInfo, InRpcConnectionInfo, OutRpcConnectionInfo)
DECLARE_RPC("SetHubOnline", RPC_SET_HUB_ONLINE, StSetHubOnline, InRpcSetHubOnline, OutRpcSetHubOnline)
@@ -644,7 +644,7 @@ DECLARE_SC_EX("EnumHub", RPC_ENUM_HUB, ScEnumHub, InRpcEnumHub, OutRpcEnumHub, F
DECLARE_SC("DeleteHub", RPC_DELETE_HUB, ScDeleteHub, InRpcDeleteHub, OutRpcDeleteHub)
DECLARE_SC("GetHubRadius", RPC_RADIUS, ScGetHubRadius, InRpcRadius, OutRpcRadius)
DECLARE_SC("SetHubRadius", RPC_RADIUS, ScSetHubRadius, InRpcRadius, OutRpcRadius)
-DECLARE_SC_EX("EnumConnection", RPC_ENUM_CONNECTION, ScEnumConnection, InRpcEnumConnection, OutRpcEnumConnection, FreeRpcEnumConnetion)
+DECLARE_SC_EX("EnumConnection", RPC_ENUM_CONNECTION, ScEnumConnection, InRpcEnumConnection, OutRpcEnumConnection, FreeRpcEnumConnection)
DECLARE_SC("DisconnectConnection", RPC_DISCONNECT_CONNECTION, ScDisconnectConnection, InRpcDisconnectConnection, OutRpcDisconnectConnection)
DECLARE_SC("GetConnectionInfo", RPC_CONNECTION_INFO, ScGetConnectionInfo, InRpcConnectionInfo, OutRpcConnectionInfo)
DECLARE_SC("SetHubOnline", RPC_SET_HUB_ONLINE, ScSetHubOnline, InRpcSetHubOnline, OutRpcSetHubOnline)
@@ -6075,7 +6075,7 @@ UINT StGetLinkStatus(ADMIN *a, RPC_LINK_STATUS *t)
return ERR_OBJECT_NOT_FOUND;
}
- // Get status infomation from session
+ // Get status information from session
Lock(k->lock);
{
sess = k->ClientSession;
@@ -7580,7 +7580,7 @@ UINT StEnumConnection(ADMIN *a, RPC_ENUM_CONNECTION *t)
SERVER_ADMIN_ONLY;
- FreeRpcEnumConnetion(t);
+ FreeRpcEnumConnection(t);
Zero(t, sizeof(RPC_ENUM_CONNECTION));
LockList(c->ConnectionList);
@@ -11507,7 +11507,7 @@ void OutRpcEnumConnection(PACK *p, RPC_ENUM_CONNECTION *t)
PackAddIntEx(p, "Type", e->Type, i, t->NumConnection);
}
}
-void FreeRpcEnumConnetion(RPC_ENUM_CONNECTION *t)
+void FreeRpcEnumConnection(RPC_ENUM_CONNECTION *t)
{
// Validate arguments
if (t == NULL)
@@ -13402,7 +13402,7 @@ UINT AdminAccept(CONNECTION *c, PACK *p)
StrCpy(hubname, sizeof(hubname), "");
}
- // Cehck source IP address
+ // Check source IP address
if (CheckAdminSourceAddress(sock, hubname) == false)
{
SLog(c->Cedar, "LA_IP_DENIED", c->Name);
diff --git a/src/Cedar/Admin.h b/src/Cedar/Admin.h
index 86f7dfc0..9dd0f26d 100644
--- a/src/Cedar/Admin.h
+++ b/src/Cedar/Admin.h
@@ -172,7 +172,7 @@ struct RPC_SERVER_STATUS
UINT NumTcpConnectionsLocal; // Number of Local TCP connections
UINT NumTcpConnectionsRemote; // Number of remote TCP connections
UINT NumHubTotal; // Total number of HUBs
- UINT NumHubStandalone; // Nymber of stand-alone HUB
+ UINT NumHubStandalone; // Number of stand-alone HUB
UINT NumHubStatic; // Number of static HUBs
UINT NumHubDynamic; // Number of Dynamic HUBs
UINT NumSessionsTotal; // Total number of sessions
@@ -1355,7 +1355,7 @@ void InRpcDeleteHub(RPC_DELETE_HUB *t, PACK *p);
void OutRpcDeleteHub(PACK *p, RPC_DELETE_HUB *t);
void InRpcEnumConnection(RPC_ENUM_CONNECTION *t, PACK *p);
void OutRpcEnumConnection(PACK *p, RPC_ENUM_CONNECTION *t);
-void FreeRpcEnumConnetion(RPC_ENUM_CONNECTION *t);
+void FreeRpcEnumConnection(RPC_ENUM_CONNECTION *t);
void InRpcDisconnectConnection(RPC_DISCONNECT_CONNECTION *t, PACK *p);
void OutRpcDisconnectConnection(PACK *p, RPC_DISCONNECT_CONNECTION *t);
void InRpcConnectionInfo(RPC_CONNECTION_INFO *t, PACK *p);
diff --git a/src/Cedar/BridgeUnix.c b/src/Cedar/BridgeUnix.c
index 7d272742..54b76cdf 100644
--- a/src/Cedar/BridgeUnix.c
+++ b/src/Cedar/BridgeUnix.c
@@ -648,7 +648,7 @@ ETH *OpenEthLinux(char *name, bool local, bool tapmode, char *tapaddr)
if (local == false)
{
- // Enable promiscious mode
+ // Enable promiscuous mode
Zero(&ifr, sizeof(ifr));
StrCpy(ifr.ifr_name, sizeof(ifr.ifr_name), name);
if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0)
@@ -935,7 +935,7 @@ ETH *OpenEthSolaris(char *name, bool local, bool tapmode, char *tapaddr)
}
// Attach to the device
- if (DlipAttatchRequest(fd, devid) == false)
+ if (DlipAttachRequest(fd, devid) == false)
{
// Failed
close(fd);
@@ -1104,7 +1104,7 @@ bool DlipBindRequest(int fd)
}
// Attach to the device
-bool DlipAttatchRequest(int fd, UINT devid)
+bool DlipAttachRequest(int fd, UINT devid)
{
dl_attach_req_t req;
struct strbuf ctl;
diff --git a/src/Cedar/BridgeUnix.h b/src/Cedar/BridgeUnix.h
index 7f9b0890..a768ad0f 100644
--- a/src/Cedar/BridgeUnix.h
+++ b/src/Cedar/BridgeUnix.h
@@ -227,7 +227,7 @@ void EthSendIpPacketInnerIpRaw(ETH *e, void *data, UINT size, USHORT protocol);
#ifdef UNIX_SOLARIS
// Function prototype for Solaris
-bool DlipAttatchRequest(int fd, UINT devid);
+bool DlipAttachRequest(int fd, UINT devid);
bool DlipReceiveAck(int fd);
bool DlipPromiscuous(int fd, UINT level);
bool DlipBindRequest(int fd);
diff --git a/src/Cedar/CM.c b/src/Cedar/CM.c
index d85559ae..673bda69 100644
--- a/src/Cedar/CM.c
+++ b/src/Cedar/CM.c
@@ -631,7 +631,7 @@ void CmRefreshEasy()
SendMessage(cm->hEasyWnd, WM_CM_EASY_REFRESH, 0, 0);
}
-// Initialze the Simple Connect Manager
+// Initialize the Simple Connect Manager
void CmEasyDlgInit(HWND hWnd, CM_EASY_DLG *d)
{
HFONT hFontForList;
@@ -4480,7 +4480,7 @@ UINT CmMainWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *p
// Specify the notification service to the foreground process
void CmSetForegroundProcessToCnService()
{
- if (cm->MenuPopuping)
+ if (cm->PopupMenuOpen)
{
return;
}
@@ -4657,7 +4657,7 @@ void CmShowTrayMenu(HWND hWnd)
return;
}
- cm->MenuPopuping = true;
+ cm->PopupMenuOpen = true;
locked = cm->CmSetting.LockMode;
easy = cm->CmSetting.EasyMode;
@@ -4786,7 +4786,7 @@ void CmShowTrayMenu(HWND hWnd)
DestroyMenu(h);
- cm->MenuPopuping = false;
+ cm->PopupMenuOpen = false;
}
// Hide or show the main window
@@ -9393,8 +9393,8 @@ void CmPrintStatusToListViewEx(LVB *b, RPC_CLIENT_GET_CONNECTION_STATUS *s, bool
GetDateTimeStrEx64(tmp, sizeof(tmp), SystemToLocal64(s->StartTime), NULL);
LvInsertAdd(b, 0, NULL, 2, _UU("CM_ST_START_TIME"), tmp);
- GetDateTimeStrEx64(tmp, sizeof(tmp), SystemToLocal64(s->FirstConnectionEstablisiedTime), NULL);
- LvInsertAdd(b, 0, NULL, 2, _UU("CM_ST_FIRST_ESTAB_TIME"), s->FirstConnectionEstablisiedTime == 0 ? _UU("CM_ST_NONE") : tmp);
+ GetDateTimeStrEx64(tmp, sizeof(tmp), SystemToLocal64(s->FirstConnectionEstablishedTime), NULL);
+ LvInsertAdd(b, 0, NULL, 2, _UU("CM_ST_FIRST_ESTAB_TIME"), s->FirstConnectionEstablishedTime == 0 ? _UU("CM_ST_NONE") : tmp);
if (s->Connected)
{
@@ -9404,7 +9404,7 @@ void CmPrintStatusToListViewEx(LVB *b, RPC_CLIENT_GET_CONNECTION_STATUS *s, bool
if (server_mode == false)
{
- UniFormat(tmp, sizeof(tmp), _UU("CM_ST_NUM_STR"), s->NumConnectionsEatablished);
+ UniFormat(tmp, sizeof(tmp), _UU("CM_ST_NUM_STR"), s->NumConnectionsEstablished);
LvInsertAdd(b, 0, NULL, 2, _UU("CM_ST_NUM_ESTABLISHED"), tmp);
}
@@ -10386,7 +10386,7 @@ void CmRefreshAccountListEx2(HWND hWnd, bool easy, bool style_changed)
UINT num_connecting = 0, num_connected = 0;
wchar_t tmp[MAX_SIZE];
wchar_t new_inserted_item[MAX_ACCOUNT_NAME_LEN + 1];
- bool select_new_insteted_item = true;
+ bool select_new_inserted_item = true;
// Validate arguments
if (hWnd == NULL)
{
@@ -10435,7 +10435,7 @@ void CmRefreshAccountListEx2(HWND hWnd, bool easy, bool style_changed)
if (LvNum(hWnd, L_ACCOUNT) == 0)
{
- select_new_insteted_item = false;
+ select_new_inserted_item = false;
}
// Enumerate the account list
@@ -10573,7 +10573,7 @@ void CmRefreshAccountListEx2(HWND hWnd, bool easy, bool style_changed)
CiFreeClientEnumAccount(&a);
- if (select_new_insteted_item)
+ if (select_new_inserted_item)
{
if (UniStrLen(new_inserted_item) >= 1)
{
diff --git a/src/Cedar/CMInner.h b/src/Cedar/CMInner.h
index b789df46..2d2820da 100644
--- a/src/Cedar/CMInner.h
+++ b/src/Cedar/CMInner.h
@@ -208,7 +208,7 @@ typedef struct CM
bool CheckedAndShowedAdminPackMessage;
INSTANCE *StartupMutex;
bool BadProcessChecked;
- bool MenuPopuping;
+ bool PopupMenuOpen;
WINUI_UPDATE *Update;
} CM;
diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index 1352bcea..853e361b 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -274,7 +274,7 @@
#define MAX_RETRY_INTERVAL (300 * 1000) // Maximum retry interval
#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 MAC_MIN_LIMIT_COUNT 3 // Minimum number of MAC addresses
diff --git a/src/Cedar/CedarType.h b/src/Cedar/CedarType.h
index 7ae8fd9f..65163cf0 100644
--- a/src/Cedar/CedarType.h
+++ b/src/Cedar/CedarType.h
@@ -680,7 +680,7 @@ typedef struct IPC IPC;
typedef struct IPC_ARP IPC_ARP;
typedef struct IPC_ASYNC IPC_ASYNC;
typedef struct IPC_PARAM IPC_PARAM;
-typedef struct IPC_DHCP_RELESAE_QUEUE IPC_DHCP_RELESAE_QUEUE;
+typedef struct IPC_DHCP_RELEASE_QUEUE IPC_DHCP_RELEASE_QUEUE;
typedef struct IPC_MSCHAP_V2_AUTHINFO IPC_MSCHAP_V2_AUTHINFO;
diff --git a/src/Cedar/Client.c b/src/Cedar/Client.c
index a5eaaf2c..6bb9948b 100644
--- a/src/Cedar/Client.c
+++ b/src/Cedar/Client.c
@@ -235,7 +235,7 @@ void CiGetCurrentMachineHashOld(void *data)
}
#ifdef OS_WIN32
- // Priduct ID
+ // Product ID
product_id = MsRegReadStr(REG_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", "ProductId");
if (product_id == NULL)
{
@@ -3377,7 +3377,7 @@ UINT CcEnumAccount(REMOTE_CLIENT *r, RPC_CLIENT_ENUM_ACCOUNT *e)
return err;
}
-// Unset the startup flag of the accout
+// Unset the startup flag of the account
UINT CcRemoveStartupAccount(REMOTE_CLIENT *r, RPC_CLIENT_DELETE_ACCOUNT *a)
{
PACK *ret, *p;
@@ -5000,14 +5000,14 @@ void InRpcClientGetConnectionStatus(RPC_CLIENT_GET_CONNECTION_STATUS *s, PACK *p
s->ServerPort = PackGetInt(p, "ServerPort");
s->ServerProductVer = PackGetInt(p, "ServerProductVer");
s->ServerProductBuild = PackGetInt(p, "ServerProductBuild");
- s->NumConnectionsEatablished = PackGetInt(p, "NumConnectionsEatablished");
+ s->NumConnectionsEstablished = PackGetInt(p, "NumConnectionsEstablished");
s->MaxTcpConnections = PackGetInt(p, "MaxTcpConnections");
s->NumTcpConnections = PackGetInt(p, "NumTcpConnections");
s->NumTcpConnectionsUpload = PackGetInt(p, "NumTcpConnectionsUpload");
s->NumTcpConnectionsDownload = PackGetInt(p, "NumTcpConnectionsDownload");
s->StartTime = PackGetInt64(p, "StartTime");
- s->FirstConnectionEstablisiedTime = PackGetInt64(p, "FirstConnectionEstablisiedTime");
+ s->FirstConnectionEstablishedTime = PackGetInt64(p, "FirstConnectionEstablishedTime");
s->CurrentConnectionEstablishTime = PackGetInt64(p, "CurrentConnectionEstablishTime");
s->TotalSendSize = PackGetInt64(p, "TotalSendSize");
s->TotalRecvSize = PackGetInt64(p, "TotalRecvSize");
@@ -5073,7 +5073,7 @@ void OutRpcClientGetConnectionStatus(PACK *p, RPC_CLIENT_GET_CONNECTION_STATUS *
PackAddInt(p, "ServerPort", c->ServerPort);
PackAddInt(p, "ServerProductVer", c->ServerProductVer);
PackAddInt(p, "ServerProductBuild", c->ServerProductBuild);
- PackAddInt(p, "NumConnectionsEatablished", c->NumConnectionsEatablished);
+ PackAddInt(p, "NumConnectionsEstablished", c->NumConnectionsEstablished);
PackAddInt(p, "HalfConnection", c->HalfConnection);
PackAddInt(p, "QoS", c->QoS);
PackAddInt(p, "MaxTcpConnections", c->MaxTcpConnections);
@@ -5091,7 +5091,7 @@ void OutRpcClientGetConnectionStatus(PACK *p, RPC_CLIENT_GET_CONNECTION_STATUS *
PackAddBool(p, "IsMonitorMode", c->IsMonitorMode);
PackAddInt64(p, "StartTime", c->StartTime);
- PackAddInt64(p, "FirstConnectionEstablisiedTime", c->FirstConnectionEstablisiedTime);
+ PackAddInt64(p, "FirstConnectionEstablishedTime", c->FirstConnectionEstablishedTime);
PackAddInt64(p, "CurrentConnectionEstablishTime", c->CurrentConnectionEstablishTime);
PackAddInt64(p, "TotalSendSize", c->TotalSendSize);
PackAddInt64(p, "TotalRecvSize", c->TotalRecvSize);
@@ -5152,7 +5152,7 @@ void CiNotifyMain(CLIENT *c, SOCK *s)
return;
}
- // Register a Cencel
+ // Register a Cancel
cancel = NewCancel();
LockList(c->NotifyCancelList);
{
@@ -6088,9 +6088,9 @@ void CiGetSessionStatus(RPC_CLIENT_GET_CONNECTION_STATUS *st, SESSION *s)
// Connection start time
st->StartTime = TickToTime(s->CreatedTime);
// Connection completion time of the first connection
- st->FirstConnectionEstablisiedTime = TickToTime(s->FirstConnectionEstablisiedTime);
+ st->FirstConnectionEstablishedTime = TickToTime(s->FirstConnectionEstablishedTime);
// Number of connections have been established so far
- st->NumConnectionsEatablished = s->NumConnectionsEatablished;
+ st->NumConnectionsEstablished = s->NumConnectionsEstablished;
}
Unlock(s->lock);
}
diff --git a/src/Cedar/Client.h b/src/Cedar/Client.h
index 9e2f2ffe..03715ea9 100644
--- a/src/Cedar/Client.h
+++ b/src/Cedar/Client.h
@@ -427,9 +427,9 @@ struct RPC_CLIENT_GET_CONNECTION_STATUS
X *ServerX; // Server certificate
X *ClientX; // Client certificate
UINT64 StartTime; // Connection start time
- UINT64 FirstConnectionEstablisiedTime; // Connection completion time of the first connection
+ UINT64 FirstConnectionEstablishedTime; // Connection completion time of the first connection
UINT64 CurrentConnectionEstablishTime; // Connection completion time of this connection
- UINT NumConnectionsEatablished; // Number of connections have been established so far
+ UINT NumConnectionsEstablished; // Number of connections have been established so far
bool HalfConnection; // Half-connection
bool QoS; // VoIP / QoS
UINT MaxTcpConnections; // Maximum number of the TCP connections
diff --git a/src/Cedar/Command.c b/src/Cedar/Command.c
index 51d9affe..ef0ea6fb 100644
--- a/src/Cedar/Command.c
+++ b/src/Cedar/Command.c
@@ -6161,7 +6161,7 @@ UINT PcAccountRetrySet(CONSOLE *c, char *cmd_name, wchar_t *str, void *param)
{
{"[name]", CmdPrompt, _UU("CMD_AccountCreate_Prompt_Name"), CmdEvalNotEmpty, NULL},
{"NUM", CmdPrompt, _UU("CMD_AccountRetrySet_PROMPT_NUM"), CmdEvalNotEmpty, NULL},
- {"INTERVAL", CmdPrompt, _UU("CMD_AccountRetrySet_PROMPY_INTERVAL"), CmdEvalMinMax, &minmax},
+ {"INTERVAL", CmdPrompt, _UU("CMD_AccountRetrySet_PROMPT_INTERVAL"), CmdEvalMinMax, &minmax},
};
// Get the parameter list
@@ -8791,7 +8791,7 @@ UINT PsConnectionList(CONSOLE *c, char *cmd_name, wchar_t *str, void *param)
CtFree(ct, c);
- FreeRpcEnumConnetion(&t);
+ FreeRpcEnumConnection(&t);
FreeParamValueList(o);
@@ -14186,7 +14186,7 @@ bool EditPolicy(CONSOLE *c, POLICY *pol, char *name, char *value, bool cascade_m
if (cascade_mode && (PolicyIsSupportedForCascade(id) == false))
{
- UniFormat(tmp, sizeof(tmp), _UU("CMD_CascadePolicySet_Invalid_Name_For_Cadcade"), name);
+ UniFormat(tmp, sizeof(tmp), _UU("CMD_CascadePolicySet_Invalid_Name_For_Cascade"), name);
c->Write(c, tmp);
FreePack(p);
return false;
@@ -14421,8 +14421,8 @@ void CmdPrintStatusToListViewEx(CT *ct, RPC_CLIENT_GET_CONNECTION_STATUS *s, boo
GetDateTimeStrEx64(tmp, sizeof(tmp), SystemToLocal64(s->StartTime), NULL);
CtInsert(ct, _UU("CM_ST_START_TIME"), tmp);
- GetDateTimeStrEx64(tmp, sizeof(tmp), SystemToLocal64(s->FirstConnectionEstablisiedTime), NULL);
- CtInsert(ct, _UU("CM_ST_FIRST_ESTAB_TIME"), s->FirstConnectionEstablisiedTime == 0 ? _UU("CM_ST_NONE") : tmp);
+ GetDateTimeStrEx64(tmp, sizeof(tmp), SystemToLocal64(s->FirstConnectionEstablishedTime), NULL);
+ CtInsert(ct, _UU("CM_ST_FIRST_ESTAB_TIME"), s->FirstConnectionEstablishedTime == 0 ? _UU("CM_ST_NONE") : tmp);
if (s->Connected)
{
@@ -14432,7 +14432,7 @@ void CmdPrintStatusToListViewEx(CT *ct, RPC_CLIENT_GET_CONNECTION_STATUS *s, boo
if (server_mode == false)
{
- UniFormat(tmp, sizeof(tmp), _UU("CM_ST_NUM_STR"), s->NumConnectionsEatablished);
+ UniFormat(tmp, sizeof(tmp), _UU("CM_ST_NUM_STR"), s->NumConnectionsEstablished);
CtInsert(ct, _UU("CM_ST_NUM_ESTABLISHED"), tmp);
}
@@ -23121,7 +23121,7 @@ wchar_t *CmdPromptPort(CONSOLE *c, void *param)
}
else
{
- prompt_str = _UU("CMD_PROPMT_PORT");
+ prompt_str = _UU("CMD_PROMPT_PORT");
}
return c->ReadLine(c, prompt_str, true);
diff --git a/src/Cedar/Connection.c b/src/Cedar/Connection.c
index eb4f1005..af2bd27b 100644
--- a/src/Cedar/Connection.c
+++ b/src/Cedar/Connection.c
@@ -667,7 +667,7 @@ void WriteSendFifo(SESSION *s, TCPSOCK *ts, void *data, UINT size)
WriteFifo(ts->SendFifo, data, size);
}
-// Write data to the reception FIFO (automatic deccyption)
+// Write data to the reception FIFO (automatic decryption)
void WriteRecvFifo(SESSION *s, TCPSOCK *ts, void *data, UINT size)
{
// Validate arguments
@@ -892,7 +892,7 @@ void PutUDPPacketData(CONNECTION *c, void *data, UINT size)
block = NewBlock(tmp, size, 0);
// Insert Block
- InsertReveicedBlockToQueue(c, block, false);
+ InsertReceivedBlockToQueue(c, block, false);
}
}
@@ -909,7 +909,7 @@ void PutUDPPacketData(CONNECTION *c, void *data, UINT size)
}
// Add a block to the receive queue
-void InsertReveicedBlockToQueue(CONNECTION *c, BLOCK *block, bool no_lock)
+void InsertReceivedBlockToQueue(CONNECTION *c, BLOCK *block, bool no_lock)
{
SESSION *s;
// Validate arguments
@@ -1831,7 +1831,7 @@ void ConnectionReceive(CONNECTION *c, CANCEL *c1, CANCEL *c2)
else
{
// Add the data block to queue
- InsertReveicedBlockToQueue(c, b, true);
+ InsertReceivedBlockToQueue(c, b, true);
if ((current_packet_index % 32) == 0)
{
@@ -1914,7 +1914,7 @@ void ConnectionReceive(CONNECTION *c, CANCEL *c1, CANCEL *c2)
else
{
// Add the data block to queue
- InsertReveicedBlockToQueue(c, block, true);
+ InsertReceivedBlockToQueue(c, block, true);
if ((current_packet_index % 32) == 0)
{
@@ -1979,7 +1979,7 @@ void ConnectionReceive(CONNECTION *c, CANCEL *c1, CANCEL *c2)
else
{
// Add the data block to queue
- InsertReveicedBlockToQueue(c, block, true);
+ InsertReceivedBlockToQueue(c, block, true);
if ((current_packet_index % 32) == 0)
{
@@ -2208,7 +2208,7 @@ DISCONNECT_THIS_TCP:
else
{
// Add the data block to queue
- InsertReveicedBlockToQueue(c, block, true);
+ InsertReceivedBlockToQueue(c, block, true);
if ((current_packet_index % 32) == 0)
{
@@ -2477,7 +2477,7 @@ DISCONNECT_THIS_TCP:
else
{
// Add the data block to queue
- InsertReveicedBlockToQueue(c, block, true);
+ InsertReceivedBlockToQueue(c, block, true);
}
num++;
if (num >= MAX_SEND_SOCKET_QUEUE_NUM)
@@ -2558,7 +2558,7 @@ DISCONNECT_THIS_TCP:
}
else
{
- InsertReveicedBlockToQueue(c, block, true);
+ InsertReceivedBlockToQueue(c, block, true);
}
num++;
@@ -2675,7 +2675,7 @@ DISCONNECT_THIS_TCP:
}
else
{
- InsertReveicedBlockToQueue(c, block, true);
+ InsertReceivedBlockToQueue(c, block, true);
}
num++;
if (num >= MAX_SEND_SOCKET_QUEUE_NUM)
@@ -2690,7 +2690,7 @@ DISCONNECT_THIS_TCP:
else
{
ETH *e;
- // Bridge is stopped cureently
+ // Bridge is stopped currently
Select(NULL, SELECT_TIME, c1, NULL);
if (b->LastBridgeTry == 0 || (b->LastBridgeTry + BRIDGE_TRY_SPAN) <= Tick64())
diff --git a/src/Cedar/Connection.h b/src/Cedar/Connection.h
index e96ff8ff..eab8eada 100644
--- a/src/Cedar/Connection.h
+++ b/src/Cedar/Connection.h
@@ -352,7 +352,7 @@ void SendKeepAlive(CONNECTION *c, TCPSOCK *ts);
void DisconnectUDPSockets(CONNECTION *c);
void PutUDPPacketData(CONNECTION *c, void *data, UINT size);
void SendDataWithUDP(SOCK *s, CONNECTION *c);
-void InsertReveicedBlockToQueue(CONNECTION *c, BLOCK *block, bool no_lock);
+void InsertReceivedBlockToQueue(CONNECTION *c, BLOCK *block, bool no_lock);
void InitTcpSockRc4Key(TCPSOCK *ts, bool server_mode);
UINT TcpSockRecv(SESSION *s, TCPSOCK *ts, void *data, UINT size);
UINT TcpSockSend(SESSION *s, TCPSOCK *ts, void *data, UINT size);
diff --git a/src/Cedar/Console.c b/src/Cedar/Console.c
index ba2ec285..ec861a4e 100644
--- a/src/Cedar/Console.c
+++ b/src/Cedar/Console.c
@@ -933,11 +933,11 @@ RETRY:
wchar_t tmp[MAX_SIZE];
// There is more than one candidate
- UniFormat(tmp, sizeof(tmp), _UU("CON_AMBIGIOUS_CMD"), cmd_name);
+ UniFormat(tmp, sizeof(tmp), _UU("CON_AMBIGUOUS_CMD"), cmd_name);
c->Write(c, tmp);
- c->Write(c, _UU("CON_AMBIGIOUS_CMD_1"));
+ c->Write(c, _UU("CON_AMBIGUOUS_CMD_1"));
PrintCandidateHelp(c, NULL, candidate, 1);
- c->Write(c, _UU("CON_AMBIGIOUS_CMD_2"));
+ c->Write(c, _UU("CON_AMBIGUOUS_CMD_2"));
c->RetCode = ERR_BAD_COMMAND_OR_PARAM;
}
@@ -1338,14 +1338,14 @@ LIST *ParseCommandList(CONSOLE *c, char *cmd_name, wchar_t *command, PARAM param
wchar_t tmp[MAX_SIZE];
// There is more than one candidate
- UniFormat(tmp, sizeof(tmp), _UU("CON_AMBIGIOUS_PARAM"), param_list->Token[i]);
+ UniFormat(tmp, sizeof(tmp), _UU("CON_AMBIGUOUS_PARAM"), param_list->Token[i]);
c->Write(c, tmp);
- UniFormat(tmp, sizeof(tmp), _UU("CON_AMBIGIOUS_PARAM_1"), cmd_name);
+ UniFormat(tmp, sizeof(tmp), _UU("CON_AMBIGUOUS_PARAM_1"), cmd_name);
c->Write(c, tmp);
PrintCandidateHelp(c, cmd_name, candidate, 1);
- c->Write(c, _UU("CON_AMBIGIOUS_PARAM_2"));
+ c->Write(c, _UU("CON_AMBIGUOUS_PARAM_2"));
ok = false;
}
diff --git a/src/Cedar/DDNS.c b/src/Cedar/DDNS.c
index 447a2313..b1df1957 100644
--- a/src/Cedar/DDNS.c
+++ b/src/Cedar/DDNS.c
@@ -227,7 +227,7 @@ UINT DCChangeHostName(DDNS_CLIENT *c, char *hostname)
void DCThread(THREAD *thread, void *param)
{
DDNS_CLIENT *c;
- INTERRUPT_MANAGER *interrput;
+ INTERRUPT_MANAGER *interrupt;
UINT last_ip_hash = 0;
void *route_change_poller = NULL;
bool last_time_ip_changed = false;
@@ -243,7 +243,7 @@ void DCThread(THREAD *thread, void *param)
c = (DDNS_CLIENT *)param;
- interrput = NewInterruptManager();
+ interrupt = NewInterruptManager();
route_change_poller = NewRouteChange();
IsRouteChanged(route_change_poller);
@@ -346,7 +346,7 @@ void DCThread(THREAD *thread, void *param)
c->NextGetMyIpTick_IPv4 = Tick64() + (UINT64)next_interval;
- AddInterrupt(interrput, c->NextGetMyIpTick_IPv4);
+ AddInterrupt(interrupt, c->NextGetMyIpTick_IPv4);
}
// Self IPv6 address acquisition
@@ -381,7 +381,7 @@ void DCThread(THREAD *thread, void *param)
c->NextGetMyIpTick_IPv6 = Tick64() + (UINT64)next_interval;
- AddInterrupt(interrput, c->NextGetMyIpTick_IPv6);
+ AddInterrupt(interrupt, c->NextGetMyIpTick_IPv6);
}
}
@@ -419,7 +419,7 @@ void DCThread(THREAD *thread, void *param)
SiApplyAzureConfig(c->Cedar->Server, &st);
}
- AddInterrupt(interrput, c->NextRegisterTick_IPv4);
+ AddInterrupt(interrupt, c->NextRegisterTick_IPv4);
}
if (c->Halt)
@@ -454,10 +454,10 @@ void DCThread(THREAD *thread, void *param)
SiApplyAzureConfig(c->Cedar->Server, &st);
}
- AddInterrupt(interrput, c->NextRegisterTick_IPv6);
+ AddInterrupt(interrupt, c->NextRegisterTick_IPv6);
}
- interval = GetNextIntervalForInterrupt(interrput);
+ interval = GetNextIntervalForInterrupt(interrupt);
interval = MIN(interval, 1234);
if (n == 1)
@@ -490,7 +490,7 @@ void DCThread(THREAD *thread, void *param)
}
FreeRouteChange(route_change_poller);
- FreeInterruptManager(interrput);
+ FreeInterruptManager(interrupt);
}
// Command to update immediately
diff --git a/src/Cedar/EM.c b/src/Cedar/EM.c
index 58719a4b..71c3fbfe 100644
--- a/src/Cedar/EM.c
+++ b/src/Cedar/EM.c
@@ -781,7 +781,7 @@ void EmAddInit(HWND hWnd, EM_ADD *p)
// Edit mode (to obtain a configuration)
wchar_t tmp[MAX_PATH];
RPC_ADD_DEVICE t;
- Hide(hWnd, R_PROMISCUS);
+ Hide(hWnd, R_PROMISCUOUS);
Zero(&t, sizeof(t));
StrCpy(t.DeviceName, sizeof(t.DeviceName), p->DeviceName);
@@ -827,7 +827,7 @@ void EmAddOk(HWND hWnd, EM_ADD *p)
if (p->NewMode)
{
- t.NoPromiscus = IsChecked(hWnd, R_PROMISCUS);
+ t.NoPromiscuous = IsChecked(hWnd, R_PROMISCUOUS);
}
if (p->NewMode)
diff --git a/src/Cedar/EMInner.h b/src/Cedar/EMInner.h
index 7c2fcbcd..eb174d5d 100644
--- a/src/Cedar/EMInner.h
+++ b/src/Cedar/EMInner.h
@@ -114,7 +114,7 @@
// Constants
#define EM_REG_KEY "Software\\" GC_REG_COMPANY_NAME "\\EtherLogger\\Manager"
-// Innner structure
+// Inner structure
typedef struct EM_ADD
{
RPC *Rpc;
diff --git a/src/Cedar/EtherLog.c b/src/Cedar/EtherLog.c
index 5c65b2d1..c32421e7 100644
--- a/src/Cedar/EtherLog.c
+++ b/src/Cedar/EtherLog.c
@@ -444,7 +444,7 @@ UINT EtSetPassword(EL *e, RPC_SET_PASSWORD *t)
// Add a device
UINT EtAddDevice(EL *e, RPC_ADD_DEVICE *t)
{
- if (ElAddCaptureDevice(e, t->DeviceName, &t->LogSetting, t->NoPromiscus) == false)
+ if (ElAddCaptureDevice(e, t->DeviceName, &t->LogSetting, t->NoPromiscuous) == false)
{
return ERR_CAPTURE_DEVICE_ADD_ERROR;
}
@@ -485,7 +485,7 @@ UINT EtGetDevice(EL *e, RPC_ADD_DEVICE *t)
ret = ERR_NO_ERROR;
Copy(&t->LogSetting, &d->LogSetting, sizeof(HUB_LOG));
- t->NoPromiscus = d->NoPromiscus;
+ t->NoPromiscuous = d->NoPromiscuous;
}
}
UnlockList(e->DeviceList);
@@ -583,7 +583,7 @@ void InRpcAddDevice(RPC_ADD_DEVICE *t, PACK *p)
Zero(t, sizeof(RPC_ADD_DEVICE));
PackGetStr(p, "DeviceName", t->DeviceName, sizeof(t->DeviceName));
- t->NoPromiscus = PackGetInt(p, "NoPromiscus");
+ t->NoPromiscuous = PackGetInt(p, "NoPromiscuous");
t->LogSetting.PacketLogSwitchType = PackGetInt(p, "PacketLogSwitchType");
for (i = 0;i < NUM_PACKET_LOG;i++)
@@ -602,7 +602,7 @@ void OutRpcAddDevice(PACK *p, RPC_ADD_DEVICE *t)
}
PackAddStr(p, "DeviceName", t->DeviceName);
- PackAddInt(p, "NoPromiscus", t->NoPromiscus);
+ PackAddInt(p, "NoPromiscuous", t->NoPromiscuous);
PackAddInt(p, "PacketLogSwitchType", t->LogSetting.PacketLogSwitchType);
for (i = 0;i < NUM_PACKET_LOG;i++)
@@ -969,7 +969,7 @@ bool ElDeleteCaptureDevice(EL *e, char *name)
}
// Add a capture device
-bool ElAddCaptureDevice(EL *e, char *name, HUB_LOG *log, bool no_promiscus)
+bool ElAddCaptureDevice(EL *e, char *name, HUB_LOG *log, bool no_promiscuous)
{
EL_DEVICE *d, t;
// Validate arguments
@@ -995,7 +995,7 @@ bool ElAddCaptureDevice(EL *e, char *name, HUB_LOG *log, bool no_promiscus)
d = ZeroMalloc(sizeof(EL_DEVICE));
StrCpy(d->DeviceName, sizeof(d->DeviceName), name);
Copy(&d->LogSetting, log, sizeof(HUB_LOG));
- d->NoPromiscus = no_promiscus;
+ d->NoPromiscuous = no_promiscuous;
d->el = e;
Insert(e->DeviceList, d);
@@ -1091,7 +1091,7 @@ void ElSaveConfigToFolder(EL *e, FOLDER *root)
f = CfgCreateFolder(devices, d->DeviceName);
SiWriteHubLogCfgEx(f, &d->LogSetting, true);
- CfgAddBool(f, "NoPromiscusMode", d->NoPromiscus);
+ CfgAddBool(f, "NoPromiscuousMode", d->NoPromiscuous);
}
}
UnlockList(e->DeviceList);
@@ -1157,7 +1157,7 @@ void ElLoadConfigFromFolder(EL *e, FOLDER *root)
Zero(&g, sizeof(g));
SiLoadHubLogCfg(&g, f);
- ElAddCaptureDevice(e, name, &g, CfgGetBool(f, "NoPromiscusMode"));
+ ElAddCaptureDevice(e, name, &g, CfgGetBool(f, "NoPromiscuousMode"));
}
}
FreeToken(t);
diff --git a/src/Cedar/EtherLog.h b/src/Cedar/EtherLog.h
index beb707f6..593ecd55 100644
--- a/src/Cedar/EtherLog.h
+++ b/src/Cedar/EtherLog.h
@@ -133,7 +133,7 @@ struct RPC_ADD_DEVICE
{
char DeviceName[MAX_SIZE]; // Device name
HUB_LOG LogSetting; // Log settings
- bool NoPromiscus; // Without promiscuous mode
+ bool NoPromiscuous; // Without promiscuous mode
};
struct RPC_DELETE_DEVICE
@@ -173,7 +173,7 @@ struct EL_DEVICE
CANCEL *Cancel2; // Cancel 2
volatile bool Halt; // Halting flag
bool Active; // Running flag
- bool NoPromiscus; // Without promiscuous mode
+ bool NoPromiscuous; // Without promiscuous mode
LOG *Logger; // Logger
};
@@ -219,7 +219,7 @@ void ElLoadConfigFromFolder(EL *e, FOLDER *root);
void ElSaveConfig(EL *e);
void ElSaveConfigToFolder(EL *e, FOLDER *root);
int ElCompareDevice(void *p1, void *p2);
-bool ElAddCaptureDevice(EL *e, char *name, HUB_LOG *log, bool no_promiscus);
+bool ElAddCaptureDevice(EL *e, char *name, HUB_LOG *log, bool no_promiscuous);
bool ElDeleteCaptureDevice(EL *e, char *name);
bool ElSetCaptureDeviceLogSetting(EL *e, char *name, HUB_LOG *log);
void ElCaptureThread(THREAD *thread, void *param);
diff --git a/src/Cedar/Hub.c b/src/Cedar/Hub.c
index d5385b3a..a442ee21 100644
--- a/src/Cedar/Hub.c
+++ b/src/Cedar/Hub.c
@@ -1835,7 +1835,7 @@ ESCAPE:
return;
}
-// Eable / disable the SecureNAT
+// Enable / disable the SecureNAT
void EnableSecureNAT(HUB *h, bool enable)
{
EnableSecureNATEx(h, enable, false);
diff --git a/src/Cedar/Hub.h b/src/Cedar/Hub.h
index 85ccc3de..a6253976 100644
--- a/src/Cedar/Hub.h
+++ b/src/Cedar/Hub.h
@@ -348,7 +348,7 @@ struct ACCESS
UCHAR DstMacAddress[6]; // Destination MAC address
UCHAR DstMacMask[6]; // Destination MAC address mask
bool CheckTcpState; // The state of the TCP connection
- bool Established; // Establieshed(TCP)
+ bool Established; // Established(TCP)
UINT Delay; // Delay
UINT Jitter; // Jitter
UINT Loss; // Packet loss
diff --git a/src/Cedar/IPsec_IKE.c b/src/Cedar/IPsec_IKE.c
index 84055774..9c7bc425 100644
--- a/src/Cedar/IPsec_IKE.c
+++ b/src/Cedar/IPsec_IKE.c
@@ -206,7 +206,7 @@ void IPsecSendPacketByIPsecSa(IKE_SERVER *ike, IPSECSA *sa, UCHAR *data, UINT da
IPV4_SET_HEADER_LEN(&h, sizeof(IPV4_HEADER) / 4);
h.TotalLength = Endian16((USHORT)(data_size + sizeof(IPV4_HEADER)));
h.Identification = Endian16(c->TunnelSendIpId++);
- h.FlagsAndFlagmentOffset[0] = h.FlagsAndFlagmentOffset[1] = 0;
+ h.FlagsAndFragmentOffset[0] = h.FlagsAndFragmentOffset[1] = 0;
h.TimeToLive = DEFAULT_IP_TTL;
h.Protocol = protocol_id;
h.SrcIP = IPToUINT(&c->TunnelModeServerIP);
@@ -2839,7 +2839,7 @@ void ProcIkeAggressiveModePacketRecv(IKE_SERVER *ike, UDPPACKET *p, IKE_PACKET *
if ((caps.NatTraversalDraftIetf || caps.NatTraversalRfc3947) || (IsUdpPortOpened(ike->IPsec->UdpListener, &p->DstIP, IPSEC_PORT_IPSEC_ESP_RAW)))
{
- sa = FindIkeSaByEndPointAndInitiatorCookie(ike, &p->DstIP, p->DestPort, &p->SrcIP, p->SrcPort, header->InitiatorCookie, IKE_SA_AGRESSIVE_MODE);
+ sa = FindIkeSaByEndPointAndInitiatorCookie(ike, &p->DstIP, p->DestPort, &p->SrcIP, p->SrcPort, header->InitiatorCookie, IKE_SA_AGGRESSIVE_MODE);
if (sa == NULL)
{
@@ -2894,7 +2894,7 @@ void ProcIkeAggressiveModePacketRecv(IKE_SERVER *ike, UDPPACKET *p, IKE_PACKET *
IKE_PACKET_PAYLOAD *your_nat_d_2 = NULL;
// Create an IKE SA
- sa = NewIkeSa(ike, c, header->InitiatorCookie, IKE_SA_AGRESSIVE_MODE, &setting);
+ sa = NewIkeSa(ike, c, header->InitiatorCookie, IKE_SA_AGGRESSIVE_MODE, &setting);
Copy(&sa->Caps, &caps, sizeof(IKE_CAPS));
sa->State= IKE_SA_AM_STATE_1_SA;
Insert(ike->IkeSaList, sa);
@@ -3118,7 +3118,7 @@ void ProcIkeAggressiveModePacketRecv(IKE_SERVER *ike, UDPPACKET *p, IKE_PACKET *
header->ResponderCookie), true, header->InitiatorCookie, header->ResponderCookie);
}
- if (sa != NULL && sa->Mode == IKE_SA_AGRESSIVE_MODE)
+ if (sa != NULL && sa->Mode == IKE_SA_AGGRESSIVE_MODE)
{
IKE_PACKET *pr = NULL;
@@ -5757,7 +5757,7 @@ void ProcessIKEInterrupts(IKE_SERVER *ike)
while (ike->StateHasChanged);
// Maintenance of the thread list
- MainteThreadList(ike->ThreadList);
+ MaintainThreadList(ike->ThreadList);
/*Debug("ike->ThreadList: %u\n", LIST_NUM(ike->ThreadList));
{
UINT i;
diff --git a/src/Cedar/IPsec_IKE.h b/src/Cedar/IPsec_IKE.h
index 183f95fa..b3ec80c7 100644
--- a/src/Cedar/IPsec_IKE.h
+++ b/src/Cedar/IPsec_IKE.h
@@ -120,7 +120,7 @@
// State
#define IKE_SA_MAIN_MODE 0 // Main mode
-#define IKE_SA_AGRESSIVE_MODE 1 // Aggressive mode
+#define IKE_SA_AGGRESSIVE_MODE 1 // Aggressive mode
#define IKE_SA_MM_STATE_1_SA 0 // Main mode state 1 (SA exchange is complete. Wait for key exchange)
#define IKE_SA_MM_STATE_2_KEY 1 // Main mode state 2 (Key exchange is complete. Wait for exchange ID)
diff --git a/src/Cedar/IPsec_IPC.c b/src/Cedar/IPsec_IPC.c
index be6b7d41..a49a7c9a 100644
--- a/src/Cedar/IPsec_IPC.c
+++ b/src/Cedar/IPsec_IPC.c
@@ -561,7 +561,7 @@ IPC *NewIPC(CEDAR *cedar, char *client_name, char *postfix, char *hubname, char
ipc->ArpTable = NewList(IPCCmpArpTable);
// Create an IPv4 reception queue
- ipc->IPv4RecviedQueue = NewQueue();
+ ipc->IPv4ReceivedQueue = NewQueue();
return ipc;
@@ -601,7 +601,7 @@ IPC *NewIPCBySock(CEDAR *cedar, SOCK *s, void *mac_address)
ipc->ArpTable = NewList(IPCCmpArpTable);
// Create an IPv4 reception queue
- ipc->IPv4RecviedQueue = NewQueue();
+ ipc->IPv4ReceivedQueue = NewQueue();
ipc->FlushList = NewTubeFlushList();
@@ -671,7 +671,7 @@ void FreeIPC(IPC *ipc)
while (true)
{
- BLOCK *b = GetNext(ipc->IPv4RecviedQueue);
+ BLOCK *b = GetNext(ipc->IPv4ReceivedQueue);
if (b == NULL)
{
break;
@@ -680,7 +680,7 @@ void FreeIPC(IPC *ipc)
FreeBlock(b);
}
- ReleaseQueue(ipc->IPv4RecviedQueue);
+ ReleaseQueue(ipc->IPv4ReceivedQueue);
Free(ipc);
}
@@ -872,7 +872,7 @@ LABEL_RETRY_FOR_OPENVPN:
char tmp[64];
DHCP_OPTION_LIST req;
- IPC_DHCP_RELESAE_QUEUE *q;
+ IPC_DHCP_RELEASE_QUEUE *q;
// If the offered IP address is not used, place the address
// in release memo list to release at the end of this function
@@ -880,7 +880,7 @@ LABEL_RETRY_FOR_OPENVPN:
req.Opcode = DHCP_RELEASE;
req.ServerAddress = d->ParsedOptionList->ServerAddress;
- q = ZeroMalloc(sizeof(IPC_DHCP_RELESAE_QUEUE));
+ q = ZeroMalloc(sizeof(IPC_DHCP_RELEASE_QUEUE));
Copy(&q->Req, &req, sizeof(DHCP_OPTION_LIST));
q->TranId = tran_id;
Copy(q->MacAddress, ipc->MacAddress, 6);
@@ -994,7 +994,7 @@ LABEL_CLEANUP:
for (i = 0;i < LIST_NUM(release_list);i++)
{
- IPC_DHCP_RELESAE_QUEUE *q = LIST_DATA(release_list, i);
+ IPC_DHCP_RELEASE_QUEUE *q = LIST_DATA(release_list, i);
Copy(ipc->MacAddress, q->MacAddress, 6);
FreeDHCPv4Data(IPCSendDhcpRequest(ipc, NULL, q->TranId, &q->Req, 0, 0, NULL));
@@ -1456,7 +1456,7 @@ void IPCAssociateOnArpTable(IPC *ipc, IP *ip, UCHAR *mac_address)
}
}
-// Identifiy whether the MAC address is a normal unicast address
+// Identify whether the MAC address is a normal unicast address
bool IsValidUnicastMacAddress(UCHAR *mac)
{
// Validate arguments
@@ -1626,7 +1626,7 @@ void IPCProcessL3EventsEx(IPC *ipc, UINT64 now)
IPCAssociateOnArpTable(ipc, &ip_src, src_mac);
// Place in the reception queue
- InsertQueue(ipc->IPv4RecviedQueue, NewBlock(data, size, 0));
+ InsertQueue(ipc->IPv4ReceivedQueue, NewBlock(data, size, 0));
}
else
{
@@ -2086,7 +2086,7 @@ BLOCK *IPCRecvIPv4(IPC *ipc)
return NULL;
}
- b = GetNext(ipc->IPv4RecviedQueue);
+ b = GetNext(ipc->IPv4ReceivedQueue);
return b;
}
diff --git a/src/Cedar/IPsec_IPC.h b/src/Cedar/IPsec_IPC.h
index 718e7c1e..a4854e65 100644
--- a/src/Cedar/IPsec_IPC.h
+++ b/src/Cedar/IPsec_IPC.h
@@ -140,7 +140,7 @@ struct IPC_ARP
};
// DHCP release queue
-struct IPC_DHCP_RELESAE_QUEUE
+struct IPC_DHCP_RELEASE_QUEUE
{
DHCP_OPTION_LIST Req;
UINT TranId;
@@ -206,7 +206,7 @@ struct IPC
UCHAR MacAddress[6]; // MAC address
UCHAR Padding[2];
LIST *ArpTable; // ARP table
- QUEUE *IPv4RecviedQueue; // IPv4 reception queue
+ QUEUE *IPv4ReceivedQueue; // IPv4 reception queue
TUBE_FLUSH_LIST *FlushList; // Tube Flush List
UCHAR MsChapV2_ServerResponse[20]; // Server response
DHCP_CLASSLESS_ROUTE_TABLE ClasslessRoute; // Classless routing table
diff --git a/src/Cedar/IPsec_L2TP.c b/src/Cedar/IPsec_L2TP.c
index 4c9f1e7b..b33471ef 100644
--- a/src/Cedar/IPsec_L2TP.c
+++ b/src/Cedar/IPsec_L2TP.c
@@ -2562,7 +2562,7 @@ void L2TPProcessInterrupts(L2TP_SERVER *l2tp)
// Maintenance the thread list
if (l2tp->IkeServer == NULL)
{
- MainteThreadList(l2tp->ThreadList);
+ MaintainThreadList(l2tp->ThreadList);
//Debug("l2tp->ThreadList: %u\n", LIST_NUM(l2tp->ThreadList));
}
}
diff --git a/src/Cedar/Interop_SSTP.c b/src/Cedar/Interop_SSTP.c
index a929aaa7..597d234d 100644
--- a/src/Cedar/Interop_SSTP.c
+++ b/src/Cedar/Interop_SSTP.c
@@ -137,7 +137,7 @@ void SstpProcessControlPacket(SSTP_SERVER *s, SSTP_PACKET *p)
return;
}
- Debug("SSTP Control Packet Recv: Msg = %u, Num = %u\n", p->MessageType, LIST_NUM(p->AttibuteList));
+ Debug("SSTP Control Packet Recv: Msg = %u, Num = %u\n", p->MessageType, LIST_NUM(p->AttributeList));
switch (p->MessageType)
{
@@ -266,7 +266,7 @@ void SstpSendPacket(SSTP_SERVER *s, SSTP_PACKET *p)
if (p->IsControl)
{
- Debug("SSTP Control Packet Send: Msg = %u, Num = %u\n", p->MessageType, LIST_NUM(p->AttibuteList));
+ Debug("SSTP Control Packet Send: Msg = %u, Num = %u\n", p->MessageType, LIST_NUM(p->AttributeList));
}
else
{
@@ -438,7 +438,7 @@ SSTP_PACKET *SstpNewControlPacketWithAnAttribute(USHORT message_type, SSTP_ATTRI
if (a != NULL)
{
- Add(p->AttibuteList, a);
+ Add(p->AttributeList, a);
}
return p;
@@ -452,7 +452,7 @@ SSTP_PACKET *SstpNewControlPacket(USHORT message_type)
p->IsControl = true;
p->MessageType = message_type;
p->Version = SSTP_VERSION_1;
- p->AttibuteList = NewListFast(NULL);
+ p->AttributeList = NewListFast(NULL);
return p;
}
@@ -469,7 +469,7 @@ SSTP_PACKET *SstpNewDataPacket(UCHAR *data, UINT size)
return p;
}
-// Get the Attibute with the specified ID from SSTP packet
+// Get the Attribute with the specified ID from SSTP packet
SSTP_ATTRIBUTE *SstpFindAttribute(SSTP_PACKET *p, UCHAR attribute_id)
{
UINT i;
@@ -479,9 +479,9 @@ SSTP_ATTRIBUTE *SstpFindAttribute(SSTP_PACKET *p, UCHAR attribute_id)
return NULL;
}
- for (i = 0;i < LIST_NUM(p->AttibuteList);i++)
+ for (i = 0;i < LIST_NUM(p->AttributeList);i++)
{
- SSTP_ATTRIBUTE *a = LIST_DATA(p->AttibuteList, i);
+ SSTP_ATTRIBUTE *a = LIST_DATA(p->AttributeList, i);
if (a->AttributeId == attribute_id)
{
@@ -665,7 +665,7 @@ BUF *SstpBuildPacket(SSTP_PACKET *p)
Free(p->Data);
}
- ab = SstpBuildAttributeList(p->AttibuteList, p->MessageType);
+ ab = SstpBuildAttributeList(p->AttributeList, p->MessageType);
p->Data = ab->Buf;
p->DataSize = ab->Size;
Free(ab);
@@ -753,9 +753,9 @@ SSTP_PACKET *SstpParsePacket(UCHAR *data, UINT size)
if (p->IsControl)
{
// Parse the Attribute list
- p->AttibuteList = SstpParseAttributeList(p->Data, p->DataSize, p);
+ p->AttributeList = SstpParseAttributeList(p->Data, p->DataSize, p);
- if (p->AttibuteList == NULL)
+ if (p->AttributeList == NULL)
{
// Failure of parsing list
SstpFreePacket(p);
@@ -794,7 +794,7 @@ LIST *SstpParseAttributeList(UCHAR *data, UINT size, SSTP_PACKET *p)
data += sizeof(USHORT);
size -= sizeof(USHORT);
- // Attibutes List
+ // Attributes List
o = NewListFast(NULL);
while (LIST_NUM(o) < num)
@@ -874,7 +874,7 @@ SSTP_ATTRIBUTE *SstpParseAttribute(UCHAR *data, UINT size)
return a;
}
-// Release the Attibute
+// Release the Attribute
void SstpFreeAttribute(SSTP_ATTRIBUTE *a)
{
// Validate arguments
@@ -917,9 +917,9 @@ void SstpFreePacket(SSTP_PACKET *p)
return;
}
- if (p->AttibuteList != NULL)
+ if (p->AttributeList != NULL)
{
- SstpFreeAttributeList(p->AttibuteList);
+ SstpFreeAttributeList(p->AttributeList);
}
if (p->Data != NULL)
diff --git a/src/Cedar/Interop_SSTP.h b/src/Cedar/Interop_SSTP.h
index f6579a23..65ee2d6e 100644
--- a/src/Cedar/Interop_SSTP.h
+++ b/src/Cedar/Interop_SSTP.h
@@ -174,7 +174,7 @@
//// Type
-// SSTP Attibute
+// SSTP Attribute
struct SSTP_ATTRIBUTE
{
UCHAR AttributeId;
@@ -191,7 +191,7 @@ struct SSTP_PACKET
UCHAR *Data;
UINT DataSize;
USHORT MessageType;
- LIST *AttibuteList;
+ LIST *AttributeList;
};
// SSTP Server
diff --git a/src/Cedar/Layer3.c b/src/Cedar/Layer3.c
index eae37895..6a000c56 100644
--- a/src/Cedar/Layer3.c
+++ b/src/Cedar/Layer3.c
@@ -302,7 +302,7 @@ void L3RecvIp(L3IF *f, PKT *p, bool self)
ip->TimeToLive = 0xff;
// Recalculates the checksum
- ip->FlagsAndFlagmentOffset[0] = ip->FlagsAndFlagmentOffset[1] = 0;
+ ip->FlagsAndFragmentOffset[0] = ip->FlagsAndFragmentOffset[1] = 0;
icmp->Checksum = 0;
icmp->Type = ICMP_TYPE_ECHO_RESPONSE;
icmp->Checksum = IpChecksum(icmp, p->PacketSize - sizeof(MAC_HEADER) - header_size);
@@ -356,7 +356,7 @@ void L3RecvL2(L3IF *f, PKT *p)
return;
}
- // Ignore any packets except a unicast packet which is destinated other
+ // Ignore any packets except a unicast packet which is at destination
// or a packet which I sent
if (Cmp(p->MacAddressSrc, f->MacAddress, 6) == 0 ||
(p->BroadcastPacket == false && Cmp(p->MacAddressDest, f->MacAddress, 6) != 0))
diff --git a/src/Cedar/Link.c b/src/Cedar/Link.c
index 8f2a543b..d9aaf385 100644
--- a/src/Cedar/Link.c
+++ b/src/Cedar/Link.c
@@ -266,7 +266,7 @@ bool LinkPaPutPacket(SESSION *s, void *data, UINT size)
k->Flag1++;
if ((k->Flag1 % 32) == 0)
{
- // Ommit for performance
+ // Omit for performance
UINT current_num;
int diff;
@@ -313,7 +313,7 @@ bool LinkPaPutPacket(SESSION *s, void *data, UINT size)
}
else
{
- InsertReveicedBlockToQueue(server_connection, block, true);
+ InsertReceivedBlockToQueue(server_connection, block, true);
}
}
}
diff --git a/src/Cedar/Listener.c b/src/Cedar/Listener.c
index 55dc49db..cd55b0fe 100644
--- a/src/Cedar/Listener.c
+++ b/src/Cedar/Listener.c
@@ -562,7 +562,7 @@ void ListenerTCPMainLoop(LISTENER *r)
goto STOP;
}
- // Accpet loop
+ // Accept loop
while (true)
{
// Accept
diff --git a/src/Cedar/Logging.c b/src/Cedar/Logging.c
index f8251a33..4414c10d 100644
--- a/src/Cedar/Logging.c
+++ b/src/Cedar/Logging.c
@@ -1750,7 +1750,7 @@ char *PacketLogParseProc(RECORD *rec)
}
else if (p->L7.IkeHeader->ExchangeType == IKE_EXCHANGE_TYPE_AGGRESSIVE)
{
- t->Token[7] = CopyStr("AgressiveMode");
+ t->Token[7] = CopyStr("AggressiveMode");
}
{
@@ -2022,7 +2022,7 @@ char *PacketLogParseProc(RECORD *rec)
}
else if (p->L7.IkeHeader->ExchangeType == IKE_EXCHANGE_TYPE_AGGRESSIVE)
{
- t->Token[7] = CopyStr("AgressiveMode");
+ t->Token[7] = CopyStr("AggressiveMode");
}
{
diff --git a/src/Cedar/Nat.h b/src/Cedar/Nat.h
index 9fdcaa66..e0e39913 100644
--- a/src/Cedar/Nat.h
+++ b/src/Cedar/Nat.h
@@ -164,7 +164,7 @@ struct RPC_NAT_STATUS
char HubName[MAX_HUBNAME_LEN + 1]; // HUB name
UINT NumTcpSessions; // Number of TCP sessions
UINT NumUdpSessions; // Ntmber of UDP sessions
- UINT NumIcmpSessions; // Nymber of ICMP sessions
+ UINT NumIcmpSessions; // Number of ICMP sessions
UINT NumDnsSessions; // Number of DNS sessions
UINT NumDhcpClients; // Number of DHCP clients
bool IsKernelMode; // Whether kernel mode
diff --git a/src/Cedar/Protocol.c b/src/Cedar/Protocol.c
index 77f3c592..bbb5ce8a 100644
--- a/src/Cedar/Protocol.c
+++ b/src/Cedar/Protocol.c
@@ -1576,7 +1576,7 @@ bool ServerAccept(CONNECTION *c)
if (hub->ForceDisableComm)
{
- // Commnunication function is disabled
+ // Communication function is disabled
FreePack(p);
c->Err = ERR_SERVER_CANT_ACCEPT;
error_detail = "ERR_COMM_DISABLED";
@@ -1851,7 +1851,7 @@ bool ServerAccept(CONNECTION *c)
Add(o, "p");
Add(o, "guest");
Add(o, "anony");
- Add(o, "anonymouse");
+ Add(o, "anonymous");
Add(o, "password");
Add(o, "passwd");
Add(o, "pass");
@@ -4618,7 +4618,7 @@ void ClientCheckServerCertThread(THREAD *thread, void *param)
NoticeThreadInit(thread);
// Query for the selection to the user
- p->Ok = p->CheckCertProc(p->Connection->Session, p->Connection, p->ServerX, &p->Exipred);
+ p->Ok = p->CheckCertProc(p->Connection->Session, p->Connection, p->ServerX, &p->Expired);
p->UserSelected = true;
}
@@ -4764,7 +4764,7 @@ bool ClientCheckServerCert(CONNECTION *c, bool *expired)
if (expired != NULL)
{
- *expired = p->Exipred;
+ *expired = p->Expired;
}
ret = p->Ok;
@@ -6492,7 +6492,7 @@ SOCK *ClientConnectGetSocket(CONNECTION *c, bool additional_connect, bool no_tls
volatile bool *cancel_flag = NULL;
void *hWnd;
UINT nat_t_err = 0;
- bool is_additonal_rudp_session = false;
+ bool is_additional_rudp_session = false;
UCHAR uc = 0;
IP ret_ip;
// Validate arguments
@@ -6508,7 +6508,7 @@ SOCK *ClientConnectGetSocket(CONNECTION *c, bool additional_connect, bool no_tls
if (sess != NULL)
{
cancel_flag = &sess->CancelConnect;
- is_additonal_rudp_session = sess->IsRUDPSession;
+ is_additional_rudp_session = sess->IsRUDPSession;
}
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 == true, follow the IsRUDPSession setting in this session
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);
}
}
diff --git a/src/Cedar/Protocol.h b/src/Cedar/Protocol.h
index 9190bc7a..db7460c1 100644
--- a/src/Cedar/Protocol.h
+++ b/src/Cedar/Protocol.h
@@ -121,7 +121,7 @@ struct CHECK_CERT_THREAD_PROC
X *ServerX;
CHECK_CERT_PROC *CheckCertProc;
bool UserSelected;
- bool Exipred;
+ bool Expired;
bool Ok;
};
diff --git a/src/Cedar/Radius.c b/src/Cedar/Radius.c
index 34c0838c..5074e3c2 100644
--- a/src/Cedar/Radius.c
+++ b/src/Cedar/Radius.c
@@ -137,7 +137,7 @@ bool PeapClientSendMsChapv2AuthClientResponse(EAP_CLIENT *e, UCHAR *client_respo
msg1.Chap_Id = e->MsChapV2Challenge.Chap_Id;
msg1.Chap_Len = Endian16(54 + StrLen(e->Username));
msg1.Chap_ValueSize = 49;
- Copy(msg1.Chap_PeerChallange, client_challenge, 16);
+ Copy(msg1.Chap_PeerChallenge, client_challenge, 16);
Copy(msg1.Chap_NtResponse, client_response, 24);
Copy(msg1.Chap_Name, e->Username, MIN(StrLen(e->Username), 255));
@@ -757,7 +757,7 @@ bool EapClientSendMsChapv2AuthClientResponse(EAP_CLIENT *e, UCHAR *client_respon
eap1->Chap_Id = e->MsChapV2Challenge.Chap_Id;
eap1->Chap_Len = Endian16(54 + StrLen(e->Username));
eap1->Chap_ValueSize = 49;
- Copy(eap1->Chap_PeerChallange, client_challenge, 16);
+ Copy(eap1->Chap_PeerChallenge, client_challenge, 16);
Copy(eap1->Chap_NtResponse, client_response, 24);
Copy(eap1->Chap_Name, e->Username, MIN(StrLen(e->Username), 255));
diff --git a/src/Cedar/Radius.h b/src/Cedar/Radius.h
index a2d0dde6..eaae6c38 100644
--- a/src/Cedar/Radius.h
+++ b/src/Cedar/Radius.h
@@ -234,7 +234,7 @@ struct EAP_MSCHAPV2_RESPONSE
UCHAR Chap_Id;
USHORT Chap_Len;
UCHAR Chap_ValueSize; // = 49
- UCHAR Chap_PeerChallange[16];
+ UCHAR Chap_PeerChallenge[16];
UCHAR Chap_Reserved[8];
UCHAR Chap_NtResponse[24];
UCHAR Chap_Flags;
diff --git a/src/Cedar/SM.c b/src/Cedar/SM.c
index d94df78b..d656e007 100644
--- a/src/Cedar/SM.c
+++ b/src/Cedar/SM.c
@@ -3470,7 +3470,7 @@ void SmSetupDlgOnOk(HWND hWnd, SM_SETUP *s)
s->s->IPsecMessageDisplayed = true;
}
- // Confgure the VPN Azure if VPN Azure feature is available
+ // Configure the VPN Azure if VPN Azure feature is available
if (GetCapsBool(s->s->CapsList, "b_support_azure"))
{
SmAzure(hWnd, s->s, true);
@@ -9465,7 +9465,7 @@ void SmSessionDlgUpdate(HWND hWnd, SM_HUB *s)
if (s->p->ServerInfo.ServerBuildInt < 2844)
{
- // Old version doen't support for remote management of the sessions
+ // Old version doesn't support for remote management of the sessions
ok2 = ok;
}
@@ -13776,7 +13776,7 @@ void SmEditUserDlgOk(HWND hWnd, SM_EDIT_USER *s)
}
FreeRpcSetUser(&t);
- MsgBoxEx(hWnd, MB_ICONINFORMATION, _UU("SM_USER_CREEATE_OK"), u->Name);
+ MsgBoxEx(hWnd, MB_ICONINFORMATION, _UU("SM_USER_CREATE_OK"), u->Name);
}
else
{
@@ -16120,7 +16120,7 @@ void SmConnectionDlgRefresh(HWND hWnd, SM_SERVER *p)
LvInsertEnd(b, hWnd, L_LIST);
- FreeRpcEnumConnetion(&t);
+ FreeRpcEnumConnection(&t);
}
// Update the control
@@ -17571,7 +17571,7 @@ void SmEditHubOnOk(HWND hWnd, SM_EDIT_HUB *s)
{
if (CALL(hWnd, ScCreateHub(s->p->Rpc, &t)))
{
- MsgBoxEx(hWnd, MB_ICONINFORMATION, _UU("CM_EDIT_HUB_CREATER"), hubname);
+ MsgBoxEx(hWnd, MB_ICONINFORMATION, _UU("CM_EDIT_HUB_CREATED"), hubname);
EndDialog(hWnd, true);
}
}
diff --git a/src/Cedar/SW.c b/src/Cedar/SW.c
index 5b48cf15..6457ba7e 100644
--- a/src/Cedar/SW.c
+++ b/src/Cedar/SW.c
@@ -665,7 +665,7 @@ bool SwSfxCopyVgFiles(HWND hWnd, wchar_t *src, wchar_t *dst)
}
msg = L"The file \"%s\" was not found on the directory which the installer \"%s\" is located on.\r\n\r\n"
- L"To continue the installation, the file \"%s\" is required on the same direcotry.\r\n"
+ L"To continue the installation, the file \"%s\" is required on the same directory.\r\n"
L"If you have extracted the installer from a ZIP archive, you have to also extract the file \"%s\" from the ZIP archive together.";
MsgBoxEx(hWnd, MB_ICONINFORMATION, msg, srcfilename, exefilename, srcfilename, srcfilename);
@@ -1759,7 +1759,7 @@ UINT SwFinish(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, WIZARD *wizard,
return 0;
}
-// Error occuring screen
+// Error occurring screen
UINT SwError(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, WIZARD *wizard, WIZARD_PAGE *wizard_page, void *param)
{
SW *sw = (SW *)param;
@@ -4155,7 +4155,7 @@ L_RETRY_LINK:
{
// Show the error message if it fails
UINT msgret;
- UniFormat(tmp, sizeof(tmp), _UU("SW_PERFORM_MSG_CRAETE_LINK_ERROR"), lnk_fullpath);
+ UniFormat(tmp, sizeof(tmp), _UU("SW_PERFORM_MSG_CREATE_LINK_ERROR"), lnk_fullpath);
msgret = SwPerformMsgBox(wp, MB_ICONEXCLAMATION | MB_YESNO, tmp);
if (msgret == IDYES)
diff --git a/src/Cedar/Sam.c b/src/Cedar/Sam.c
index 20a52e18..d723f4de 100644
--- a/src/Cedar/Sam.c
+++ b/src/Cedar/Sam.c
@@ -473,7 +473,7 @@ void SecurePassword(void *secure_password, void *password, void *random)
}
// Generate 160bit random number
-void GenRamdom(void *random)
+void GenRandom(void *random)
{
// Validate arguments
if (random == NULL)
diff --git a/src/Cedar/Sam.h b/src/Cedar/Sam.h
index bd099dc5..8c298cf6 100644
--- a/src/Cedar/Sam.h
+++ b/src/Cedar/Sam.h
@@ -124,7 +124,7 @@ bool SamAuthUserByCert(HUB *h, char *username, X *x);
bool SamAuthUserByPlainPassword(CONNECTION *c, HUB *hub, char *username, char *password, bool ast, UCHAR *mschap_v2_server_response_20, RADIUS_LOGIN_OPTION *opt);
POLICY *SamGetUserPolicy(HUB *h, char *username);
-void GenRamdom(void *random);
+void GenRandom(void *random);
void SecurePassword(void *secure_password, void *password, void *random);
X *GetIssuerFromList(LIST *cert_list, X *cert);
diff --git a/src/Cedar/SeLowUser.c b/src/Cedar/SeLowUser.c
index 1e47e5e4..5cfeb6dd 100644
--- a/src/Cedar/SeLowUser.c
+++ b/src/Cedar/SeLowUser.c
@@ -839,7 +839,7 @@ LIST *SuGetAdapterList(SU *u)
return NULL;
}
- ret = NewList(SuCmpAdaterList);
+ ret = NewList(SuCmpAdapterList);
// Enumerate adapters
Zero(&u->AdapterInfoList, sizeof(u->AdapterInfoList));
@@ -869,7 +869,7 @@ LIST *SuGetAdapterList(SU *u)
}
// Comparison function of the adapter list
-int SuCmpAdaterList(void *p1, void *p2)
+int SuCmpAdapterList(void *p1, void *p2)
{
int r;
SU_ADAPTER_LIST *a1, *a2;
diff --git a/src/Cedar/SeLowUser.h b/src/Cedar/SeLowUser.h
index 97cd5500..7a0f0830 100644
--- a/src/Cedar/SeLowUser.h
+++ b/src/Cedar/SeLowUser.h
@@ -168,7 +168,7 @@ bool SuPutPacket(SU_ADAPTER *a, void *buf, UINT size);
SU_ADAPTER_LIST *SuAdapterInfoToAdapterList(SL_ADAPTER_INFO *info);
LIST *SuGetAdapterList(SU *u);
void SuFreeAdapterList(LIST *o);
-int SuCmpAdaterList(void *p1, void *p2);
+int SuCmpAdapterList(void *p1, void *p2);
bool SuInstallDriver(bool force);
bool SuInstallDriverInner(bool force);
diff --git a/src/Cedar/Server.c b/src/Cedar/Server.c
index 4f9d3a03..ba2ee9d5 100644
--- a/src/Cedar/Server.c
+++ b/src/Cedar/Server.c
@@ -1390,7 +1390,7 @@ UINT GetGlobalServerFlag(UINT index)
return global_server_flags[index];
}
-// Main of the aquisition of Caps of the server
+// Main of the acquisition of Caps of the server
void GetServerCapsMain(SERVER *s, CAPSLIST *t)
{
bool is_restricted = false;
@@ -1558,7 +1558,7 @@ void GetServerCapsMain(SERVER *s, CAPSLIST *t)
// Maximum NAT table size / Virtual HUB
AddCapsInt(t, "i_max_secnat_tables", NAT_MAX_SESSIONS);
- // Cascade connction
+ // Cascade connection
if (s->ServerType == SERVER_TYPE_STANDALONE)
{
AddCapsBool(t, "b_support_cascade", true);
@@ -1620,7 +1620,7 @@ void GetServerCapsMain(SERVER *s, CAPSLIST *t)
AddCapsBool(t, "b_tap_supported", GetOsInfo()->OsType == OSTYPE_LINUX ? true : false);
}
- // Cascade connction
+ // Cascade connection
if (s->ServerType == SERVER_TYPE_STANDALONE)
{
AddCapsBool(t, "b_support_cascade", true);
@@ -2794,7 +2794,7 @@ void SiInitConfiguration(SERVER *s)
}
}
- if (s->DisableDosProction)
+ if (s->DisableDosProtection)
{
DisableDosProtect();
}
@@ -5905,7 +5905,7 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f)
s->Cedar->DisableIPv6Listener = CfgGetBool(f, "DisableIPv6Listener");
// DoS
- s->DisableDosProction = CfgGetBool(f, "DisableDosProction");
+ s->DisableDosProtection = CfgGetBool(f, "DisableDosProtection");
// Num Connections Per IP
SetMaxConnectionsPerIp(CfgGetInt(f, "MaxConnectionsPerIP"));
@@ -6329,7 +6329,7 @@ void SiWriteServerCfg(FOLDER *f, SERVER *s)
CfgAddBool(f, "DisableIPv6Listener", s->Cedar->DisableIPv6Listener);
// DoS
- CfgAddBool(f, "DisableDosProction", s->DisableDosProction);
+ CfgAddBool(f, "DisableDosProtection", s->DisableDosProtection);
// MaxConnectionsPerIP
CfgAddInt(f, "MaxConnectionsPerIP", GetMaxConnectionsPerIp());
diff --git a/src/Cedar/Server.h b/src/Cedar/Server.h
index 88326e94..8b9b377b 100644
--- a/src/Cedar/Server.h
+++ b/src/Cedar/Server.h
@@ -277,7 +277,7 @@ struct SERVER
bool DontBackupConfig; // Do not save a backup of the configuration automatically
bool BackupConfigOnlyWhenModified; // Save a backup of the configuration only if there is a modification
UINT ConfigRevision; // Configuration file revision
- bool DisableDosProction; // Disable the DoS attack protection
+ bool DisableDosProtection; // Disable the DoS attack protection
UCHAR MyRandomKey[SHA1_SIZE]; // Their own random key
bool FarmControllerInited; // Initialization of farm controller has been completed
bool DisableDeadLockCheck; // Disable the deadlock check
diff --git a/src/Cedar/Session.c b/src/Cedar/Session.c
index 5475485a..0857a20c 100644
--- a/src/Cedar/Session.c
+++ b/src/Cedar/Session.c
@@ -212,11 +212,11 @@ void SessionMain(SESSION *s)
s->NextConnectionTime = Tick64() + (UINT64)(s->ClientOption->AdditionalConnectionInterval * 1000);
}
- s->NumConnectionsEatablished++;
+ s->NumConnectionsEstablished++;
s->CurrentConnectionEstablishTime = Tick64();
- if (s->FirstConnectionEstablisiedTime == 0)
+ if (s->FirstConnectionEstablishedTime == 0)
{
- s->FirstConnectionEstablisiedTime = Tick64();
+ s->FirstConnectionEstablishedTime = Tick64();
}
if (s->ServerMode == false && s->Cedar->Client != NULL)
@@ -919,7 +919,7 @@ void IncrementUserTraffic(HUB *hub, char *username, SESSION *s)
Unlock(s->TrafficLock);
}
-// Cummulate the traffic information of the connection
+// Cumulate the traffic information of the connection
void AddTrafficForSession(SESSION *s, TRAFFIC *t)
{
HUB *h;
@@ -980,7 +980,7 @@ void ClientAdditionalConnectChance(SESSION *s)
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
return;
diff --git a/src/Cedar/Session.h b/src/Cedar/Session.h
index 10b23281..97376981 100644
--- a/src/Cedar/Session.h
+++ b/src/Cedar/Session.h
@@ -265,9 +265,9 @@ struct SESSION
UINT NumDisconnected; // Number of socket disconnection
bool NoReconnectToSession; // Disable to reconnect to the session
char UnderlayProtocol[64]; // Physical communication protocol
- UINT64 FirstConnectionEstablisiedTime; // Connection completion time of the first connection
+ UINT64 FirstConnectionEstablishedTime; // Connection completion time of the first connection
UINT64 CurrentConnectionEstablishTime; // Completion time of this connection
- UINT NumConnectionsEatablished; // Number of connections established so far
+ UINT NumConnectionsEstablished; // Number of connections established so far
UINT AdjustMss; // MSS adjustment value
bool IsVPNClientAndVLAN_Win32; // Is the VPN Client session with a VLAN card (Win32)
@@ -309,7 +309,7 @@ struct SESSION
LIST *DelayedPacketList; // Delayed packet list
UINT Flag1;
- USER *NumLoginIncrementUserObject; // User objects to increment the nymber of logins
+ USER *NumLoginIncrementUserObject; // User objects to increment the number of logins
HUB *NumLoginIncrementHubObject; // Virtual HUB object to increment the number of logins
UINT64 NumLoginIncrementTick; // Time to perform increment a number of log
@@ -317,7 +317,7 @@ struct SESSION
char FirstTimeHttpRedirectUrl[128]; // URL for redirection only the first time
UINT FirstTimeHttpAccessCheckIp; // IP address for access checking
- // To examine the maximum number of alowed logging target packets per minute
+ // To examine the maximum number of allowed logging target packets per minute
UINT64 MaxLoggedPacketsPerMinuteStartTick; // Inspection start time
UINT CurrentNumPackets; // Current number of packets
diff --git a/src/Cedar/VLanWin32.c b/src/Cedar/VLanWin32.c
index 2c9cf913..083dc9a9 100644
--- a/src/Cedar/VLanWin32.c
+++ b/src/Cedar/VLanWin32.c
@@ -340,7 +340,7 @@ void RouteTrackingMain(SESSION *s)
UINT i;
bool route_to_server_erased = true;
bool is_vlan_want_to_be_default_gateway = false;
- UINT vlan_default_gatewat_metric = 0;
+ UINT vlan_default_gateway_metric = 0;
UINT other_if_default_gateway_metric_min = INFINITE;
// Get whether the routing table have been changed
@@ -383,10 +383,10 @@ void RouteTrackingMain(SESSION *s)
{
// The virtual LAN card think that he want to be a default gateway
is_vlan_want_to_be_default_gateway = true;
- vlan_default_gatewat_metric = e->Metric;
+ vlan_default_gateway_metric = e->Metric;
- if (vlan_default_gatewat_metric >= 2 &&
- t->OldDefaultGatewayMetric == (vlan_default_gatewat_metric - 1))
+ if (vlan_default_gateway_metric >= 2 &&
+ t->OldDefaultGatewayMetric == (vlan_default_gateway_metric - 1))
{
// Restore because the PPP server rewrites
// the routing table selfishly
@@ -408,7 +408,7 @@ void RouteTrackingMain(SESSION *s)
t->DefaultGatewayByVLan = ZeroMalloc(sizeof(ROUTE_ENTRY));
Copy(t->DefaultGatewayByVLan, e, sizeof(ROUTE_ENTRY));
- t->OldDefaultGatewayMetric = vlan_default_gatewat_metric;
+ t->OldDefaultGatewayMetric = vlan_default_gateway_metric;
}
else
{
@@ -509,10 +509,10 @@ void RouteTrackingMain(SESSION *s)
// there is no LAN card with smaller metric of 0.0.0.0/0 than
// the virtual LAN card, delete other default gateway entries
// to elect the virtual LAN card as the default gateway
-// Debug("is_vlan_want_to_be_default_gateway = %u, rs = %u, route_to_server_erased = %u, other_if_default_gateway_metric_min = %u, vlan_default_gatewat_metric = %u\n",
-// is_vlan_want_to_be_default_gateway, rs, route_to_server_erased, other_if_default_gateway_metric_min, vlan_default_gatewat_metric);
+// Debug("is_vlan_want_to_be_default_gateway = %u, rs = %u, route_to_server_erased = %u, other_if_default_gateway_metric_min = %u, vlan_default_gateway_metric = %u\n",
+// is_vlan_want_to_be_default_gateway, rs, route_to_server_erased, other_if_default_gateway_metric_min, vlan_default_gateway_metric);
if (is_vlan_want_to_be_default_gateway && (rs != NULL && route_to_server_erased == false) &&
- other_if_default_gateway_metric_min >= vlan_default_gatewat_metric)
+ other_if_default_gateway_metric_min >= vlan_default_gateway_metric)
{
// Scan the routing table again
for (i = 0;i < table->NumEntry;i++)
diff --git a/src/Cedar/Virtual.c b/src/Cedar/Virtual.c
index f3ea20c3..19e12f32 100644
--- a/src/Cedar/Virtual.c
+++ b/src/Cedar/Virtual.c
@@ -436,7 +436,7 @@ void NnCombineIp(NATIVE_NAT *t, IP_COMBINE *c, UINT offset, void *data, UINT siz
if (last_packet)
{
- // If No More Flagment packet arrives, the size of this datagram is finalized
+ // If No More Fragment packet arrives, the size of this datagram is finalized
c->Size = offset + size;
}
@@ -1178,7 +1178,7 @@ void NnIpSendFragmentedForInternet(NATIVE_NAT *t, UCHAR ip_protocol, UINT src_ip
ip->TypeOfService = DEFAULT_IP_TOS;
ip->TotalLength = Endian16((USHORT)(size + IP_HEADER_SIZE));
ip->Identification = Endian16(id);
- ip->FlagsAndFlagmentOffset[0] = ip->FlagsAndFlagmentOffset[1] = 0;
+ ip->FlagsAndFragmentOffset[0] = ip->FlagsAndFragmentOffset[1] = 0;
IPV4_SET_OFFSET(ip, (offset / 8));
if ((offset + size) >= total_size)
{
@@ -7637,7 +7637,7 @@ void CombineIp(VH *v, IP_COMBINE *c, UINT offset, void *data, UINT size, bool la
if (last_packet)
{
- // If No More Flagment packet arrives, the size of this datagram is finalized
+ // If No More Fragment packet arrives, the size of this datagram is finalized
c->Size = offset + size;
}
@@ -8847,7 +8847,7 @@ void SendFragmentedIp(VH *v, UINT dest_ip, UINT src_ip, USHORT id, USHORT total_
ip->TypeOfService = DEFAULT_IP_TOS;
ip->TotalLength = Endian16((USHORT)(size + IP_HEADER_SIZE));
ip->Identification = Endian16(id);
- ip->FlagsAndFlagmentOffset[0] = ip->FlagsAndFlagmentOffset[1] = 0;
+ ip->FlagsAndFragmentOffset[0] = ip->FlagsAndFragmentOffset[1] = 0;
IPV4_SET_OFFSET(ip, (offset / 8));
if ((offset + size) >= total_size)
{
diff --git a/src/Cedar/WinUi.c b/src/Cedar/WinUi.c
index 2abc0afc..fe312eb4 100644
--- a/src/Cedar/WinUi.c
+++ b/src/Cedar/WinUi.c
@@ -214,7 +214,7 @@ UINT UpdateConfigDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void
LoadUpdateUiSetting(u, &s);
Check(hWnd, S_ENABLE, s.DisableCheck == false);
- Check(hWnd, S_DISBLE, s.DisableCheck);
+ Check(hWnd, S_DISABLE, s.DisableCheck);
DlgFont(hWnd, S_TITLE, 10, true);
FormatText(hWnd, S_TITLE, u->SoftwareTitle);
@@ -246,7 +246,7 @@ UINT UpdateConfigDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void
LABEL_CLOSE:
LoadUpdateUiSetting(u, &s);
- s.DisableCheck = IsChecked(hWnd, S_DISBLE);
+ s.DisableCheck = IsChecked(hWnd, S_DISABLE);
if (s.DisableCheck)
{
diff --git a/src/Cedar/winpcap/Packet32.h b/src/Cedar/winpcap/Packet32.h
index 8c2c8c4a..9ec26d97 100644
--- a/src/Cedar/winpcap/Packet32.h
+++ b/src/Cedar/winpcap/Packet32.h
@@ -306,7 +306,7 @@ struct _PACKET_OID_DATA {
ULONG Oid; ///< OID code. See the Microsoft DDK documentation or the file ntddndis.h
///< for a complete list of valid codes.
ULONG Length; ///< Length of the data field
- UCHAR Data[1]; ///< variable-lenght field that contains the information passed to or received
+ UCHAR Data[1]; ///< variable-length field that contains the information passed to or received
///< from the adapter.
};
typedef struct _PACKET_OID_DATA PACKET_OID_DATA, *PPACKET_OID_DATA;
@@ -346,7 +346,7 @@ LONG PacketDumpRegistryKey(PCHAR KeyName, PCHAR FileName);
#endif
#endif
-/* We load dinamically the dag library in order link it only when it's present on the system */
+/* We load dynamically the dag library in order link it only when it's present on the system */
#ifdef HAVE_DAG_API
typedef dagc_t* (*dagc_open_handler)(const char *source, unsigned flags, char *ebuf); ///< prototype used to dynamically load the dag dll
typedef void (*dagc_close_handler)(dagc_t *dagcfd); ///< prototype used to dynamically load the dag dll
diff --git a/src/Cedar/winpcap/pcap-bpf.h b/src/Cedar/winpcap/pcap-bpf.h
index 6e5d64af..0a32addc 100644
--- a/src/Cedar/winpcap/pcap-bpf.h
+++ b/src/Cedar/winpcap/pcap-bpf.h
@@ -445,7 +445,7 @@ struct bpf_version {
* interface (irdaX), but not on a raw serial port.
* Note the capture is done in "Linux-cooked" mode, so each packet include
* a fake packet header (struct sll_header). This is because IrDA packet
- * decoding is dependant on the direction of the packet (incomming or
+ * decoding is dependant on the direction of the packet (incoming or
* outgoing).
* When/if other platform implement IrDA capture, we may revisit the
* issue and define a real DLT_IRDA...
diff --git a/src/Cedar/winpcap/pcap-int.h b/src/Cedar/winpcap/pcap-int.h
index 1ffcd03f..901d309d 100644
--- a/src/Cedar/winpcap/pcap-int.h
+++ b/src/Cedar/winpcap/pcap-int.h
@@ -128,7 +128,7 @@ struct pcap_md {
\brief It keeps the number of packets that have been received by the application.
Packets dropped by the kernel buffer are not counted in this variable. The variable is always
- equal to (TotAccepted - TotDrops), exept for the case of remote capture, in which we have also
+ equal to (TotAccepted - TotDrops), except for the case of remote capture, in which we have also
packets in fligh, i.e. that have been transmitted by the remote host, but that have not been
received (yet) from the client. In this case, (TotAccepted - TotDrops - TotNetDrops) gives a
wrong result, since this number does not corresponds always to the number of packet received by
@@ -228,7 +228,7 @@ struct pcap {
SOCKET rmt_sockctrl; //!< socket ID of the socket used for the control connection
SOCKET rmt_sockdata; //!< socket ID of the socket used for the data connection
int rmt_flags; //!< we have to save flags, since they are passed by the pcap_open_live(), but they are used by the pcap_startcapture()
- int rmt_capstarted; //!< 'true' if the capture is already started (needed to knoe if we have to call the pcap_startcapture()
+ int rmt_capstarted; //!< 'true' if the capture is already started (needed to know if we have to call the pcap_startcapture()
struct pcap_samp rmt_samp; //!< Keeps the parameters related to the sampling process.
char *currentfilter; //!< Pointer to a buffer (allocated at run-time) that stores the current filter. Needed when flag PCAP_OPENFLAG_NOCAPTURE_RPCAP is turned on.
#endif /* HAVE_REMOTE */
diff --git a/src/Cedar/winpcap/pthread.h b/src/Cedar/winpcap/pthread.h
index 25c3cb5a..7d5a0cd1 100644
--- a/src/Cedar/winpcap/pthread.h
+++ b/src/Cedar/winpcap/pthread.h
@@ -543,7 +543,7 @@ enum {
PTHREAD_SCOPE_SYSTEM = 1, /* Default */
/*
- * pthread_setcancelstate paramters
+ * pthread_setcancelstate parameters
*/
PTHREAD_CANCEL_ENABLE = 0, /* Default */
PTHREAD_CANCEL_DISABLE = 1,
diff --git a/src/Cedar/winpcap/remote-ext.h b/src/Cedar/winpcap/remote-ext.h
index e8e675ec..6693bdce 100644
--- a/src/Cedar/winpcap/remote-ext.h
+++ b/src/Cedar/winpcap/remote-ext.h
@@ -118,15 +118,15 @@ extern "C" {
- rpcap://devicename [opens the selected device devices available on the local host, without using the RPCAP protocol]
- rpcap://host/devicename [opens the selected device available on a remote host]
- rpcap://host:port/devicename [opens the selected device available on a remote host, using a non-standard port for RPCAP]
- - adaptername [to open a local adapter; kept for compability, but it is strongly discouraged]
- - (NULL) [to open the first local adapter; kept for compability, but it is strongly discouraged]
+ - adaptername [to open a local adapter; kept for compatibility, but it is strongly discouraged]
+ - (NULL) [to open the first local adapter; kept for compatibility, but it is strongly discouraged]
The formats allowed by the pcap_findalldevs_ex() are the following:
- file://folder/ [lists all the files in the given folder]
- rpcap:// [lists all local adapters]
- rpcap://host:port/ [lists the devices available on a remote host]
- Referring to the 'host' and 'port' paramters, they can be either numeric or literal. Since
+ Referring to the 'host' and 'port' parameters, they can be either numeric or literal. Since
IPv6 is fully supported, these are the allowed formats:
- host (literal): e.g. host.foo.bar
@@ -299,7 +299,7 @@ extern "C" {
/*!
- \brief This structure keeps the information needed to autheticate
+ \brief This structure keeps the information needed to authenticate
the user on a remote machine.
The remote machine can either grant or refuse the access according
@@ -371,7 +371,7 @@ struct pcap_samp
-//! Maximum lenght of an host name (needed for the RPCAP active mode)
+//! Maximum length of an host name (needed for the RPCAP active mode)
#define RPCAP_HOSTLIST_SIZE 1024
diff --git a/src/Mayaqua/Cfg.c b/src/Mayaqua/Cfg.c
index 45fcfcd6..10f57578 100644
--- a/src/Mayaqua/Cfg.c
+++ b/src/Mayaqua/Cfg.c
@@ -296,7 +296,7 @@ CFG_RW *NewCfgRwEx2W(FOLDER **root, wchar_t *cfg_name, bool dont_backup, wchar_t
{
loaded_from_template = true;
- goto LABEL_CONTIUNE;
+ goto LABEL_CONTINUE;
}
}
@@ -311,7 +311,7 @@ CFG_RW *NewCfgRwEx2W(FOLDER **root, wchar_t *cfg_name, bool dont_backup, wchar_t
return rw;
}
-LABEL_CONTIUNE:
+LABEL_CONTINUE:
rw = ZeroMalloc(sizeof(CFG_RW));
rw->FileNameW = CopyUniStr(cfg_name);
rw->FileName = CopyUniToStr(cfg_name);
diff --git a/src/Mayaqua/FileIO.c b/src/Mayaqua/FileIO.c
index a610ffad..a0e76b96 100644
--- a/src/Mayaqua/FileIO.c
+++ b/src/Mayaqua/FileIO.c
@@ -1463,7 +1463,7 @@ void GetExeNameW(wchar_t *name, UINT size)
UniStrCpy(name, size, exe_file_name_w);
}
-// Initialization of the aquisition of the EXE file name
+// Initialization of the acquisition of the EXE file name
void InitGetExeName(char *arg)
{
wchar_t *arg_w = NULL;
diff --git a/src/Mayaqua/Kernel.c b/src/Mayaqua/Kernel.c
index c1487d56..cb59c3fd 100644
--- a/src/Mayaqua/Kernel.c
+++ b/src/Mayaqua/Kernel.c
@@ -423,7 +423,7 @@ void AddThreadToThreadList(LIST *o, THREAD *t)
}
// Maintain thread list
-void MainteThreadList(LIST *o)
+void MaintainThreadList(LIST *o)
{
UINT i;
LIST *delete_list = NULL;
diff --git a/src/Mayaqua/Kernel.h b/src/Mayaqua/Kernel.h
index 3e5ff427..c5d351fd 100644
--- a/src/Mayaqua/Kernel.h
+++ b/src/Mayaqua/Kernel.h
@@ -274,7 +274,7 @@ UINT DoNothing();
LIST *NewThreadList();
void AddThreadToThreadList(LIST *o, THREAD *t);
void DelThreadFromThreadList(LIST *o, THREAD *t);
-void MainteThreadList(LIST *o);
+void MaintainThreadList(LIST *o);
void FreeThreadList(LIST *o);
void StopThreadList(LIST *o);
void WaitAllThreadsWillBeStopped(LIST *o);
diff --git a/src/Mayaqua/Mayaqua.c b/src/Mayaqua/Mayaqua.c
index 5bc06b86..3978ac9c 100644
--- a/src/Mayaqua/Mayaqua.c
+++ b/src/Mayaqua/Mayaqua.c
@@ -552,7 +552,7 @@ void InitMayaqua(bool memcheck, bool debug, int argc, char **argv)
// Initialize the network communication module
InitNetwork();
- // Initialization of the aquisition of the EXE file name
+ // Initialization of the acquisition of the EXE file name
InitGetExeName(argc >= 1 ? argv[0] : NULL);
// Initialization of the command line string
diff --git a/src/Mayaqua/Memory.c b/src/Mayaqua/Memory.c
index 92b7efa5..81e77533 100644
--- a/src/Mayaqua/Memory.c
+++ b/src/Mayaqua/Memory.c
@@ -778,7 +778,7 @@ void AddCandidate(LIST *o, wchar_t *str, UINT num_max)
}
// Comparison of candidates
-int ComapreCandidate(void *p1, void *p2)
+int CompareCandidate(void *p1, void *p2)
{
CANDIDATE *c1, *c2;
if (p1 == NULL || p2 == NULL)
@@ -828,7 +828,7 @@ void FreeCandidateList(LIST *o)
// Creating a new candidate list
LIST *NewCandidateList()
{
- return NewList(ComapreCandidate);
+ return NewList(CompareCandidate);
}
// Fill a range of memory
@@ -1968,7 +1968,7 @@ bool IsInt64InList(LIST *o, UINT64 i)
return false;
}
-// Remove all int from the interger list
+// Remove all int from the integer list
void DelAllInt(LIST *o)
{
UINT i;
diff --git a/src/Mayaqua/Memory.h b/src/Mayaqua/Memory.h
index 28babd8b..0db4f557 100644
--- a/src/Mayaqua/Memory.h
+++ b/src/Mayaqua/Memory.h
@@ -265,7 +265,7 @@ UINT PRandInt(PRAND *p);
LIST *NewCandidateList();
void FreeCandidateList(LIST *o);
-int ComapreCandidate(void *p1, void *p2);
+int CompareCandidate(void *p1, void *p2);
void AddCandidate(LIST *o, wchar_t *str, UINT num_max);
BUF *CandidateToBuf(LIST *o);
LIST *BufToCandidate(BUF *b);
diff --git a/src/Mayaqua/Microsoft.c b/src/Mayaqua/Microsoft.c
index 6d6b9039..c1b1b50e 100644
--- a/src/Mayaqua/Microsoft.c
+++ b/src/Mayaqua/Microsoft.c
@@ -3976,7 +3976,7 @@ void *MsLoadLibraryAsDataFile(char *name)
return MsLoadLibraryAsDataFileW(name_w);
}
-// Simple LoadLibaray
+// Simple LoadLibrary
void *MsLoadLibraryRawW(wchar_t *name)
{
// Validate arguments
@@ -6602,7 +6602,7 @@ UINT MsService(char *name, SERVICE_FUNCTION *start, SERVICE_FUNCTION *stop, UINT
mode == SVC_MODE_STOP || mode == SVC_MODE_SERVICE) &&
(ms->IsAdmin == false))
{
- // Do not have Administrators privillage
+ // Do not have Administrators privilege
MsgBox(NULL, MB_ICONEXCLAMATION, _UU("SVC_NOT_ADMIN"));
}
else
@@ -6970,7 +6970,7 @@ UINT MsService(char *name, SERVICE_FUNCTION *start, SERVICE_FUNCTION *stop, UINT
case SVC_MODE_SERVICE:
// Run as a service
- // Obsolated (2012.12.31) (Do this in the above code)
+ // Obsoleted (2012.12.31) (Do this in the above code)
//MsServiceMode(start, stop);
break;
@@ -7346,7 +7346,7 @@ bool MsIsRemoteDesktopEnabled()
}
// Examine whether the remote desktop becomes available by registry operation
-bool MsIsRemoteDesktopCanEnableByRegistory()
+bool MsIsRemoteDesktopCanEnableByRegistry()
{
OS_INFO *info = GetOsInfo();
if (MsIsRemoteDesktopAvailable() == false)
@@ -8452,7 +8452,7 @@ bool MsUpgradeVLanWithoutLock(char *tag_name, char *connection_tag_name, char *i
Free(reg_key);
// Get the .sys file name that is currently being used
- if (MsGetNeoDeiverFilename(neo_sys, sizeof(neo_sys), instance_name) == false)
+ if (MsGetNeoDriverFilename(neo_sys, sizeof(neo_sys), instance_name) == false)
{
if (MsIsInfCatalogRequired())
{
@@ -12014,7 +12014,7 @@ TOKEN_LIST *MsEnumNeoDriverFilenames()
for (i = 0;i < neos->NumTokens;i++)
{
char filename[MAX_PATH];
- if (MsGetNeoDeiverFilename(filename, sizeof(filename), neos->Token[i]))
+ if (MsGetNeoDriverFilename(filename, sizeof(filename), neos->Token[i]))
{
Add(o, CopyStr(filename));
}
@@ -12029,7 +12029,7 @@ TOKEN_LIST *MsEnumNeoDriverFilenames()
}
// Get the driver file name of Neo
-bool MsGetNeoDeiverFilename(char *name, UINT size, char *instance_name)
+bool MsGetNeoDriverFilename(char *name, UINT size, char *instance_name)
{
char tmp[MAX_SIZE];
char *ret;
diff --git a/src/Mayaqua/Microsoft.h b/src/Mayaqua/Microsoft.h
index 59197b47..68ab004f 100644
--- a/src/Mayaqua/Microsoft.h
+++ b/src/Mayaqua/Microsoft.h
@@ -764,7 +764,7 @@ bool MsCheckLogon(wchar_t *username, char *password);
bool MsIsPasswordEmpty(wchar_t *username);
TOKEN_LIST *MsEnumNetworkAdapters(char *start_with_name, char *start_with_name_2);
TOKEN_LIST *MsEnumNetworkAdaptersNeo();
-bool MsGetNeoDeiverFilename(char *name, UINT size, char *instance_name);
+bool MsGetNeoDriverFilename(char *name, UINT size, char *instance_name);
bool MsMakeNewNeoDriverFilename(char *name, UINT size);
void MsGenerateNeoDriverFilenameFromInt(char *name, UINT size, UINT n);
TOKEN_LIST *MsEnumNeoDriverFilenames();
@@ -1052,7 +1052,7 @@ UINT64 MsGetScreenSaverTimeout();
void *MsNoSleepStart(bool no_screensaver);
void MsNoSleepEnd(void *p);
bool MsIsRemoteDesktopAvailable();
-bool MsIsRemoteDesktopCanEnableByRegistory();
+bool MsIsRemoteDesktopCanEnableByRegistry();
bool MsIsRemoteDesktopEnabled();
bool MsEnableRemoteDesktop();
diff --git a/src/Mayaqua/Network.c b/src/Mayaqua/Network.c
index b6fba840..2be14462 100644
--- a/src/Mayaqua/Network.c
+++ b/src/Mayaqua/Network.c
@@ -7289,7 +7289,7 @@ void IPToStr6Inner(char *str, IP *ip)
values[i] = Endian16(values[i]);
}
- // Search for omitable part
+ // Search for omittable part
zero_started_index = INFINITE;
max_zero_len = 0;
max_zero_start = INFINITE;
@@ -20735,7 +20735,7 @@ UINT GetUdpListenerPortList(UDPLISTENER *u, UINT **port_list)
return num_ports;
}
-// Dekete all the UDP ports
+// Delete all the UDP ports
void DeleteAllPortFromUdpListener(UDPLISTENER *u)
{
// Validate arguments
@@ -22144,7 +22144,7 @@ bool PostHttp(SOCK *s, HTTP_HEADER *header, void *post_data, UINT post_size)
return false;
}
- // Check whether the Content-Lentgh exists?
+ // Check whether the Content-Length exists?
if (GetHttpValue(header, "Content-Length") == NULL)
{
char tmp[MAX_SIZE];
diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h
index ccec80b1..d3a7d13a 100644
--- a/src/Mayaqua/Network.h
+++ b/src/Mayaqua/Network.h
@@ -822,7 +822,7 @@ typedef bool (RUDP_STACK_RPC_RECV_PROC)(RUDP_STACK *r, UDPPACKET *p);
#define RUDP_PROTOCOL_ICMP 1 // ICMP
#define RUDP_PROTOCOL_DNS 2 // DNS
-// Maximum time of continously changing of the NAT-T hostname
+// Maximum time of continuously changing of the NAT-T hostname
#define RUDP_NATT_MAX_CONT_CHANGE_HOSTNAME 30
#define RUDP_NATT_CONT_CHANGE_HOSTNAME_RESET_INTERVAL (5 * 60 * 1000)
@@ -869,7 +869,7 @@ struct RUDP_STACK
UINT64 TotalPhysicalSent; // Physical amount of data transmitted
UINT64 TotalLogicalSent; // Logical amount of data transmitted
char CurrentRegisterHostname[MAX_SIZE]; // The host name of the the current destination of registration
- UINT NumChangedHostname; // How number of changing NAT-T hostname has occured continously
+ UINT NumChangedHostname; // How number of changing NAT-T hostname has occured continuously
UINT64 NumChangedHostnameValueResetTick;
// NAT-T server related
@@ -893,7 +893,7 @@ struct RUDP_STACK
volatile UINT *NatTGlobalUdpPort; // NAT-T global UDP port
UCHAR RandPortId; // Random UDP port ID
bool NatT_EnableSourceIpValidation; // Enable the source IP address validation mechanism
- LIST *NatT_SourceIpList; // Authenticated source IP adddress list
+ LIST *NatT_SourceIpList; // Authenticated source IP address list
// For Client
bool TargetIpAndPortInited; // The target IP address and the port number are initialized
diff --git a/src/Mayaqua/Secure.c b/src/Mayaqua/Secure.c
index ef43ad7a..f102595f 100644
--- a/src/Mayaqua/Secure.c
+++ b/src/Mayaqua/Secure.c
@@ -2084,7 +2084,7 @@ void TestSecMain(SECURE *sec)
UCHAR sign_cpu[512];
UCHAR sign_sec[512];
K *pub = GetKFromX(cert);
- UINT keybtytes = (cert->bits)/8;
+ UINT keybytes = (cert->bits)/8;
Print("Ok.\n");
Print("Signing Data by CPU...\n");
if (RsaSign(sign_cpu, test_str, StrLen(test_str), private_key) == false)
@@ -2095,7 +2095,7 @@ void TestSecMain(SECURE *sec)
{
Print("Ok.\n");
Print("sign_cpu: ");
- PrintBin(sign_cpu, keybtytes);
+ PrintBin(sign_cpu, keybytes);
Print("Signing Data by %s..\n", sec->Dev->DeviceName);
if (SignSec(sec, "test_key", sign_sec, test_str, StrLen(test_str)) == false)
{
@@ -2105,9 +2105,9 @@ void TestSecMain(SECURE *sec)
{
Print("Ok.\n");
Print("sign_sec: ");
- PrintBin(sign_sec, keybtytes);
+ PrintBin(sign_sec, keybytes);
Print("Compare...");
- if (Cmp(sign_sec, sign_cpu, keybtytes) == 0)
+ if (Cmp(sign_sec, sign_cpu, keybytes) == 0)
{
Print("Ok.\n");
Print("Verify...");
@@ -2123,7 +2123,7 @@ void TestSecMain(SECURE *sec)
}
else
{
- Print("[DIFFIRENT]\n");
+ Print("[DIFFERENT]\n");
}
}
}
diff --git a/src/Mayaqua/Table.c b/src/Mayaqua/Table.c
index e6a9c696..0ac17fe0 100644
--- a/src/Mayaqua/Table.c
+++ b/src/Mayaqua/Table.c
@@ -1440,7 +1440,7 @@ bool LoadTableMain(wchar_t *filename)
FreeBuf(b);
- SetLocale(_UU("DEFAULE_LOCALE"));
+ SetLocale(_UU("DEFAULT_LOCALE"));
UniStrCpy(old_table_name, sizeof(old_table_name), filename);
diff --git a/src/Mayaqua/TcpIp.c b/src/Mayaqua/TcpIp.c
index 00b16cc8..8d48a44c 100644
--- a/src/Mayaqua/TcpIp.c
+++ b/src/Mayaqua/TcpIp.c
@@ -1095,7 +1095,7 @@ BUF *BuildICMPv6(IPV6_ADDR *src_ip, IPV6_ADDR *dest_ip, UCHAR hop_limit, UCHAR t
return NULL;
}
- // Assembe the header
+ // Assemble the header
icmp = ZeroMalloc(sizeof(ICMP_HEADER) + size);
data_buf = ((UCHAR *)icmp) + sizeof(ICMP_HEADER);
Copy(data_buf, data, size);
diff --git a/src/Mayaqua/TcpIp.h b/src/Mayaqua/TcpIp.h
index 37df507f..e35238a8 100644
--- a/src/Mayaqua/TcpIp.h
+++ b/src/Mayaqua/TcpIp.h
@@ -200,7 +200,7 @@ struct IPV4_HEADER
UCHAR TypeOfService; // Service Type
USHORT TotalLength; // Total size
USHORT Identification; // Identifier
- UCHAR FlagsAndFlagmentOffset[2]; // Flag and Fragment offset
+ UCHAR FlagsAndFragmentOffset[2]; // Flag and Fragment offset
UCHAR TimeToLive; // TTL
UCHAR Protocol; // Protocol
USHORT Checksum; // Checksum
@@ -215,10 +215,10 @@ struct IPV4_HEADER
#define IPV4_SET_HEADER_LEN(h, v) ((h)->VersionAndHeaderLength |= ((v) & 0x0f))
// Macro for IPv4 fragment related operation
-#define IPV4_GET_FLAGS(h) (((h)->FlagsAndFlagmentOffset[0] >> 5) & 0x07)
-#define IPV4_SET_FLAGS(h, v) ((h)->FlagsAndFlagmentOffset[0] |= (((v) & 0x07) << 5))
-#define IPV4_GET_OFFSET(h) (((h)->FlagsAndFlagmentOffset[0] & 0x1f) * 256 + ((h)->FlagsAndFlagmentOffset[1]))
-#define IPV4_SET_OFFSET(h, v) {(h)->FlagsAndFlagmentOffset[0] |= (UCHAR)((v) / 256); (h)->FlagsAndFlagmentOffset[1] = (UCHAR)((v) % 256);}
+#define IPV4_GET_FLAGS(h) (((h)->FlagsAndFragmentOffset[0] >> 5) & 0x07)
+#define IPV4_SET_FLAGS(h, v) ((h)->FlagsAndFragmentOffset[0] |= (((v) & 0x07) << 5))
+#define IPV4_GET_OFFSET(h) (((h)->FlagsAndFragmentOffset[0] & 0x1f) * 256 + ((h)->FlagsAndFragmentOffset[1]))
+#define IPV4_SET_OFFSET(h, v) {(h)->FlagsAndFragmentOffset[0] |= (UCHAR)((v) / 256); (h)->FlagsAndFragmentOffset[1] = (UCHAR)((v) % 256);}
// IPv4 / IPv6 common protocol
#define IP_PROTO_TCP 0x06 // TCP protocol
@@ -359,7 +359,7 @@ struct DNSV4_HEADER
struct NBTDG_HEADER
{
UCHAR MessageType;
- UCHAR MoreFlagments;
+ UCHAR MoreFragments;
USHORT DatagramId;
UINT SrcIP;
USHORT SrcPort;
@@ -441,17 +441,17 @@ struct IPV6_FRAGMENT_HEADER
{
UCHAR NextHeader; // Next header
UCHAR Reserved; // Reserved
- UCHAR FlagmentOffset1; // Fragment offset 1 (/8, 8 bit)
- UCHAR FlagmentOffset2AndFlags; // Fragment offset 2 (/8, 5 bit) + Reserved (2 bit) + More flag (1 bit)
+ UCHAR FragmentOffset1; // Fragment offset 1 (/8, 8 bit)
+ UCHAR FragmentOffset2AndFlags; // Fragment offset 2 (/8, 5 bit) + Reserved (2 bit) + More flag (1 bit)
UINT Identification; // ID
} GCC_PACKED;
// Macro for IPv6 fragment header operation
-#define IPV6_GET_FRAGMENT_OFFSET(h) (((((h)->FlagmentOffset1) << 5) & 0x1fe0) | (((h)->FlagmentOffset2AndFlags >> 3) & 0x1f))
-#define IPV6_SET_FRAGMENT_OFFSET(h, v) ((h)->FlagmentOffset1 = (v / 32) & 0xff, \
- ((h)->FlagmentOffset2AndFlags = ((v % 256) << 3) & 0xf8) | ((h)->FlagmentOffset2AndFlags & 0x07))
-#define IPV6_GET_FLAGS(h) ((h)->FlagmentOffset2AndFlags & 0x0f)
-#define IPV6_SET_FLAGS(h, v) ((h)->FlagmentOffset2AndFlags = (((h)->FlagmentOffset2AndFlags & 0xf8) | (v & 0x07)))
+#define IPV6_GET_FRAGMENT_OFFSET(h) (((((h)->FragmentOffset1) << 5) & 0x1fe0) | (((h)->FragmentOffset2AndFlags >> 3) & 0x1f))
+#define IPV6_SET_FRAGMENT_OFFSET(h, v) ((h)->FragmentOffset1 = (v / 32) & 0xff, \
+ ((h)->FragmentOffset2AndFlags = ((v % 256) << 3) & 0xf8) | ((h)->FragmentOffset2AndFlags & 0x07))
+#define IPV6_GET_FLAGS(h) ((h)->FragmentOffset2AndFlags & 0x0f)
+#define IPV6_SET_FLAGS(h, v) ((h)->FragmentOffset2AndFlags = (((h)->FragmentOffset2AndFlags & 0xf8) | (v & 0x07)))
// Flag
#define IPV6_FRAGMENT_HEADER_FLAG_MORE_FRAGMENTS 0x01 // There are more fragments
diff --git a/src/Mayaqua/TunTap.h b/src/Mayaqua/TunTap.h
index 7f23b1e1..453572f5 100644
--- a/src/Mayaqua/TunTap.h
+++ b/src/Mayaqua/TunTap.h
@@ -197,7 +197,7 @@ struct tun_pi {
#define _SYS_IF_TUN_H
#ifdef _KERNEL
-/* Uncomment to enable debuging */
+/* Uncomment to enable debugging */
/* #define TUN_DEBUG 1 */
#ifdef TUN_DEBUG
diff --git a/src/Mayaqua/pkcs11t.h b/src/Mayaqua/pkcs11t.h
index 7a0f4060..c04b5719 100644
--- a/src/Mayaqua/pkcs11t.h
+++ b/src/Mayaqua/pkcs11t.h
@@ -88,7 +88,7 @@ typedef CK_VERSION CK_PTR CK_VERSION_PTR;
typedef struct CK_INFO {
- /* manufacturerID and libraryDecription have been changed from
+ /* manufacturerID and libraryDescription have been changed from
* CK_CHAR to CK_UTF8CHAR for v2.10 */
CK_VERSION cryptokiVersion; /* Cryptoki interface ver */
CK_UTF8CHAR manufacturerID[32]; /* blank padded */
diff --git a/src/Mayaqua/zlib/zlib.h b/src/Mayaqua/zlib/zlib.h
index 62d0e467..7d5ee9f4 100644
--- a/src/Mayaqua/zlib/zlib.h
+++ b/src/Mayaqua/zlib/zlib.h
@@ -270,7 +270,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
output buffer because there might be more output pending.
Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
- decide how much data to accumualte before producing output, in order to
+ decide how much data to accumulate before producing output, in order to
maximize compression.
If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
@@ -869,7 +869,7 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
See inflateBack() for the usage of these routines.
inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
- the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+ the parameters are invalid, Z_MEM_ERROR if the internal state could not
be allocated, or Z_VERSION_ERROR if the version of the library does not
match the version of the header file.
*/
diff --git a/src/Neo/NDIS5.c b/src/Neo/NDIS5.c
index e8c256c2..06477ef2 100644
--- a/src/Neo/NDIS5.c
+++ b/src/Neo/NDIS5.c
@@ -268,7 +268,7 @@ NDIS_STATUS NeoNdisInit(NDIS_STATUS *OpenErrorStatus,
}
// Read the information from the registry
- if (NeoLoadRegistory() == FALSE)
+ if (NeoLoadRegistry() == FALSE)
{
// Failure
ctx->Initing = FALSE;
@@ -682,13 +682,13 @@ void NeoFreeControlDevice()
ctx->Event = NULL;
ctx->Opened = FALSE;
}
- // Delet the device
+ // Delete the device
NdisMDeregisterDevice(ctx->NdisControl);
}
// Read the information from the registry
-BOOL NeoLoadRegistory()
+BOOL NeoLoadRegistry()
{
void *buf;
NDIS_STATUS ret;
diff --git a/src/Neo/NDIS5.h b/src/Neo/NDIS5.h
index 175ce14c..c83d15fa 100644
--- a/src/Neo/NDIS5.h
+++ b/src/Neo/NDIS5.h
@@ -282,7 +282,7 @@ void NeoNdisSendPackets(NDIS_HANDLE MiniportAdapterContext,
NDIS_STATUS NeoNdisSend(NDIS_HANDLE MiniportAdapterContext,
NDIS_PACKET *Packet, UINT Flags);
BOOL NeoNdisSendPacketsHaltCheck(NDIS_PACKET **PacketArray, UINT NumberOfPackets);
-BOOL NeoLoadRegistory();
+BOOL NeoLoadRegistry();
void NeoInitControlDevice();
void NeoFreeControlDevice();
NTSTATUS NeoNdisDispatch(DEVICE_OBJECT *DeviceObject, IRP *Irp);
diff --git a/src/Neo/Neo.c b/src/Neo/Neo.c
index c226ec32..ffd49461 100644
--- a/src/Neo/Neo.c
+++ b/src/Neo/Neo.c
@@ -434,7 +434,7 @@ void NeoShutdown()
return;
}
- // Relaese the status information
+ // Release the status information
NeoFreeStatus(&ctx->Status);
NeoZero(ctx, sizeof(NEO_CTX));
diff --git a/src/Neo6/NDIS6.c b/src/Neo6/NDIS6.c
index d9a8fe1d..3e960a8e 100644
--- a/src/Neo6/NDIS6.c
+++ b/src/Neo6/NDIS6.c
@@ -310,7 +310,7 @@ NDIS_STATUS NeoNdisInitEx(NDIS_HANDLE MiniportAdapterHandle,
}
// Read the information from the registry
- if (NeoLoadRegistory() == FALSE)
+ if (NeoLoadRegistry() == FALSE)
{
// Failure
ctx->Initing = FALSE;
@@ -749,7 +749,7 @@ void NeoFreeControlDevice()
// Read the information from the registry
-BOOL NeoLoadRegistory()
+BOOL NeoLoadRegistry()
{
void *buf;
NDIS_STATUS ret;
diff --git a/src/Neo6/NDIS6.h b/src/Neo6/NDIS6.h
index 9e02d065..1fb5b517 100644
--- a/src/Neo6/NDIS6.h
+++ b/src/Neo6/NDIS6.h
@@ -240,7 +240,7 @@ void NeoNdisSendNetBufferLists(NDIS_HANDLE MiniportAdapterContext,
NDIS_PORT_NUMBER PortNumber,
ULONG SendFlags);
void NeoNdisSetNetBufferListsStatus(NET_BUFFER_LIST *nbl, UINT status);
-BOOL NeoLoadRegistory();
+BOOL NeoLoadRegistry();
void NeoInitControlDevice();
void NeoFreeControlDevice();
NTSTATUS NeoNdisDispatch(DEVICE_OBJECT *DeviceObject, IRP *Irp);
diff --git a/src/Neo6/Neo6.c b/src/Neo6/Neo6.c
index 43b0b49f..1f2f9840 100644
--- a/src/Neo6/Neo6.c
+++ b/src/Neo6/Neo6.c
@@ -504,7 +504,7 @@ void NeoShutdown()
return;
}
- // Relaese the status information
+ // Release the status information
NeoFreeStatus(&ctx->Status);
NeoZero(ctx, sizeof(NEO_CTX));
diff --git a/src/PenCore/PenCore.rc b/src/PenCore/PenCore.rc
index 7273bb70..e9959b1f 100644
--- a/src/PenCore/PenCore.rc
+++ b/src/PenCore/PenCore.rc
@@ -2950,7 +2950,7 @@ BEGIN
GROUPBOX "@STATIC1",-1,7,5,265,51
ICON ICO_NIC_ONLINE,-1,14,17,20,18
COMBOBOX C_DEVICE,37,22,226,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "@R_PROMISCUS",R_PROMISCUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,37,223,11
+ CONTROL "@R_PROMISCUOUS",R_PROMISCUOUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,37,223,11
GROUPBOX "@STATIC2",-1,7,69,265,172
ICON ICO_USER_ADMIN,-1,14,80,20,18
RTEXT "@S_PACKET",S_PACKET,39,86,98,9
@@ -4441,7 +4441,7 @@ BEGIN
LTEXT "@S_INFO",S_INFO,7,27,293,47
LTEXT "@S_TITLE",S_TITLE,7,5,293,21
CONTROL "@S_ENABLE",S_ENABLE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,48,80,157,12
- CONTROL "@S_DISBLE",S_DISBLE,"Button",BS_AUTORADIOBUTTON,48,96,157,12
+ CONTROL "@S_DISABLE",S_DISABLE,"Button",BS_AUTORADIOBUTTON,48,96,157,12
ICON ICO_MACHINE,IDC_STATIC,16,79,20,18
DEFPUSHBUTTON "@IDCANCEL",IDCANCEL,236,112,64,15
END
diff --git a/src/PenCore/resource.h b/src/PenCore/resource.h
index fa84fe56..aa6d1eb3 100644
--- a/src/PenCore/resource.h
+++ b/src/PenCore/resource.h
@@ -711,7 +711,7 @@
#define S_TSUKUBA2 1281
#define IDC_CHECK1 1285
#define R_NO_SAVE_PASSWORD 1285
-#define R_PROMISCUS 1285
+#define R_PROMISCUOUS 1285
#define R_NO_ENUM 1285
#define R_ETHERNET 1285
#define R_CONTROLLER_ONLY 1285
@@ -936,7 +936,7 @@
#define R_UNESTABLISHED 1435
#define R_USER 1435
#define R_CUSTOM 1435
-#define S_DISBLE 1435
+#define S_DISABLE 1435
#define R_PERMANENT 1435
#define R_FOR_SYSTEM 1436
#define IDC_NETADDRESS1 1437
diff --git a/src/SeLow/SeLow.c b/src/SeLow/SeLow.c
index 5ae60dc7..c426a653 100644
--- a/src/SeLow/SeLow.c
+++ b/src/SeLow/SeLow.c
@@ -524,7 +524,7 @@ NTSTATUS SlDeviceCloseProc(DEVICE_OBJECT *device_object, IRP *irp)
// Wait until the number of packet being sent becomes the zero
while (true)
{
- if (f->NumSendingPacketets == 0)
+ if (f->NumSendingPackets == 0)
{
break;
}
@@ -1060,7 +1060,7 @@ NTSTATUS SlDeviceWriteProc(DEVICE_OBJECT *device_object, IRP *irp)
if (nbl_head != NULL)
{
- InterlockedExchangeAdd(&f->NumSendingPacketets, num_packets);
+ InterlockedExchangeAdd(&f->NumSendingPackets, num_packets);
InterlockedExchangeAdd(&f->Adapter->NumPendingSendPackets, num_packets);
SlUnlock(f->Adapter->Lock);
@@ -1741,7 +1741,7 @@ void SlNdisSendNetBufferListsCompleteProc(NDIS_HANDLE protocol_binding_context,
NdisFreeNetBufferList(current_nbl);
// Reduce the number of packets being sent by 1
- InterlockedExchangeAdd(&f->NumSendingPacketets, (LONG)-1);
+ InterlockedExchangeAdd(&f->NumSendingPackets, (LONG)-1);
InterlockedExchangeAdd(&f->Adapter->NumPendingSendPackets, (LONG)-1);
}
}
diff --git a/src/SeLow/SeLow.h b/src/SeLow/SeLow.h
index 19f32a98..ed8c5dfa 100644
--- a/src/SeLow/SeLow.h
+++ b/src/SeLow/SeLow.h
@@ -260,7 +260,7 @@ typedef struct SL_FILE
SL_PACKET *RecvPacketTail; // Tail of the received packet
UINT NumRecvPackets; // Number of items of the received packet queue
NDIS_HANDLE NetBufferListPool; // NET_BUFFER_LIST Pool
- volatile UINT NumSendingPacketets; // Number of packets being transmitted
+ volatile UINT NumSendingPackets; // Number of packets being transmitted
bool SetEventFlag; // Flag to set an event
bool FinalWakeUp;
} SL_FILE;
diff --git a/src/See/Openclos.c b/src/See/Openclos.c
index 81241dac..8a5a9330 100644
--- a/src/See/Openclos.c
+++ b/src/See/Openclos.c
@@ -129,7 +129,7 @@ NTSTATUS NPF_Open(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
Open->DeviceExtension=DeviceExtension;
- // Save the Irp here for the completeion routine to retrieve
+ // Save the Irp here for the completion routine to retrieve
Open->OpenCloseIrp=Irp;
// Allocate a packet pool for our xmit and receive packets
@@ -259,7 +259,7 @@ NTSTATUS NPF_Open(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
//
// Try to open the MAC
//
- IF_LOUD(DbgPrint("NPF: Openinig the device %ws, BindingContext=%d\n",DeviceExtension->AdapterName.Buffer, Open);)
+ IF_LOUD(DbgPrint("NPF: Opening the device %ws, BindingContext=%d\n",DeviceExtension->AdapterName.Buffer, Open);)
NdisOpenAdapter(
&Status,
@@ -675,7 +675,7 @@ NPF_ResetComplete(IN NDIS_HANDLE ProtocolBindingContext,IN NDIS_STATUS Status)
PLIST_ENTRY ResetListEntry;
- IF_LOUD(DbgPrint("NPF: PacketResetComplte\n");)
+ IF_LOUD(DbgPrint("NPF: PacketResetComplete\n");)
Open= (POPEN_INSTANCE)ProtocolBindingContext;
@@ -700,7 +700,7 @@ NPF_ResetComplete(IN NDIS_HANDLE ProtocolBindingContext,IN NDIS_STATUS Status)
Irp->IoStatus.Status = STATUS_SUCCESS;
IoCompleteRequest(Irp, IO_NO_INCREMENT);
- IF_LOUD(DbgPrint("NPF: PacketResetComplte exit\n");)
+ IF_LOUD(DbgPrint("NPF: PacketResetComplete exit\n");)
return;
diff --git a/src/See/Packet.c b/src/See/Packet.c
index 319cc4df..64686889 100644
--- a/src/See/Packet.c
+++ b/src/See/Packet.c
@@ -118,7 +118,7 @@ DriverEntry(
}
else
{
- // Windows XP, 2003 and follwing want only NDIS_FLAGS_DONT_LOOPBACK
+ // Windows XP, 2003 and following want only NDIS_FLAGS_DONT_LOOPBACK
g_SendPacketFlags = NDIS_FLAGS_DONT_LOOPBACK;
}
diff --git a/src/See/Packet.h b/src/See/Packet.h
index f75ed1d9..920f431a 100644
--- a/src/See/Packet.h
+++ b/src/See/Packet.h
@@ -165,7 +165,7 @@
Command used to send a buffer of packets in a single system call. Every packet in the buffer is preceded by
a sf_pkthdr structure. The timestamps of the packets are used to synchronize the write, i.e. the packets
- are sent to the network respecting the intervals specified in the sf_pkthdr structure assiciated with each
+ are sent to the network respecting the intervals specified in the sf_pkthdr structure associated with each
packet. NPF_BufferedWrite() function is invoked to send the packets.
*/
#define BIOCSENDPACKETSSYNC 9033
@@ -287,7 +287,7 @@ typedef struct __CPU_Private_Data
ULONG C; ///< Zero-based index of the consumer in the buffer. It indicates the first free byte to be read.
ULONG Free; ///< Number of the free bytes in the buffer
PUCHAR Buffer; ///< Pointer to the kernel buffer used to capture packets.
- ULONG Accepted; ///< Number of packet that current capture instance acepted, from its opening. A packet
+ ULONG Accepted; ///< Number of packet that current capture instance accepted, from its opening. A packet
///< is accepted if it passes the filter and fits in the buffer. Accepted packets are the
///< ones that reach the application.
///< This number is related to the particular CPU this structure is referring to.
@@ -318,7 +318,7 @@ typedef struct _OPEN_INSTANCE
{
PDEVICE_EXTENSION DeviceExtension; ///< Pointer to the _DEVICE_EXTENSION structure of the device on which
///< the instance is bound.
- NDIS_HANDLE AdapterHandle; ///< NDIS idetifier of the adapter used by this instance.
+ NDIS_HANDLE AdapterHandle; ///< NDIS Identifier of the adapter used by this instance.
UINT Medium; ///< Type of physical medium the underlying NDIS driver uses. See the
///< documentation of NdisOpenAdapter in the MS DDK for details.
NDIS_HANDLE PacketPool; ///< Pool of NDIS_PACKET structures used to transfer the packets from and to the NIC driver.
@@ -333,7 +333,7 @@ typedef struct _OPEN_INSTANCE
HANDLE ReadEventHandle; ///< Handle of the event on which the read calls on this instance must wait.
UNICODE_STRING ReadEventName; ///< Name of the event on which the read calls on this instance must wait.
///< The event is created with a name, so it can be used at user level to know when it
- ///< is possible to access the driver without being blocked. This fiels stores the name
+ ///< is possible to access the driver without being blocked. This field stores the name
///< that and is used by the BIOCGEVNAME IOCTL call.
PUCHAR bpfprogram; ///< Pointer to the filtering pseudo-code associated with current instance of the driver.
///< This code is used only in particular situations (for example when the packet received
@@ -381,7 +381,7 @@ typedef struct _OPEN_INSTANCE
MEM_TYPE mem_ex; ///< Memory used by the TME virtual co-processor
TME_CORE tme; ///< Data structure containing the virtualization of the TME co-processor
NDIS_SPIN_LOCK MachineLock; ///< SpinLock that protects the mem_ex buffer
- UINT MaxFrameSize; ///< Maximum frame size that the underlying MAC acceptes. Used to perform a check on the
+ UINT MaxFrameSize; ///< Maximum frame size that the underlying MAC accepts. Used to perform a check on the
///< size of the frames sent with NPF_Write() or NPF_BufferedWrite().
CpuPrivateData CpuData[1024]; ///< Pool of kernel buffer structures, one for each CPU.
ULONG ReaderSN; ///< Sequence number of the next packet to be read from the pool of kernel buffers.
@@ -812,7 +812,7 @@ NPF_ReadRegistry(
);
/*!
- \brief Function used by NPF_ReadRegistry() to quesry the registry keys associated woth NPF if the driver
+ \brief Function used by NPF_ReadRegistry() to query the registry keys associated woth NPF if the driver
is manually installed via the control panel.
Normally not used in recent versions of NPF.
@@ -844,7 +844,7 @@ VOID NPF_BindAdapter(
\brief Callback for NDIS UnbindAdapterHandler.
\param Status out variable filled by NPF_UnbindAdapter with the status of the unbind operation.
\param ProtocolBindingContext Context of the function. Contains a pointer to the OPEN_INSTANCE structure associated with current instance.
- \param UnbindContext Specifies a handle, supplied by NDIS, that NPF can use to complete the opration.
+ \param UnbindContext Specifies a handle, supplied by NDIS, that NPF can use to complete the operation.
Function called by NDIS when a new adapter is removed from the machine without shutting it down.
NPF_UnbindAdapter closes the adapter calling NdisCloseAdapter() and frees the memory and the structures
diff --git a/src/See/Packet32.h b/src/See/Packet32.h
index 8c2c8c4a..9ec26d97 100644
--- a/src/See/Packet32.h
+++ b/src/See/Packet32.h
@@ -306,7 +306,7 @@ struct _PACKET_OID_DATA {
ULONG Oid; ///< OID code. See the Microsoft DDK documentation or the file ntddndis.h
///< for a complete list of valid codes.
ULONG Length; ///< Length of the data field
- UCHAR Data[1]; ///< variable-lenght field that contains the information passed to or received
+ UCHAR Data[1]; ///< variable-length field that contains the information passed to or received
///< from the adapter.
};
typedef struct _PACKET_OID_DATA PACKET_OID_DATA, *PPACKET_OID_DATA;
@@ -346,7 +346,7 @@ LONG PacketDumpRegistryKey(PCHAR KeyName, PCHAR FileName);
#endif
#endif
-/* We load dinamically the dag library in order link it only when it's present on the system */
+/* We load dynamically the dag library in order link it only when it's present on the system */
#ifdef HAVE_DAG_API
typedef dagc_t* (*dagc_open_handler)(const char *source, unsigned flags, char *ebuf); ///< prototype used to dynamically load the dag dll
typedef void (*dagc_close_handler)(dagc_t *dagcfd); ///< prototype used to dynamically load the dag dll
diff --git a/src/See/Read.c b/src/See/Read.c
index 03df5c0d..3bc47323 100644
--- a/src/See/Read.c
+++ b/src/See/Read.c
@@ -70,7 +70,7 @@ NTSTATUS NPF_Read(IN PDEVICE_OBJECT DeviceObject,IN PIRP Irp)
if( Open->Bound == FALSE )
{
- // The Network adapter has been removed or diasabled
+ // The Network adapter has been removed or disabled
EXIT_FAILURE(0);
}
@@ -130,7 +130,7 @@ NTSTATUS NPF_Read(IN PDEVICE_OBJECT DeviceObject,IN PIRP Irp)
*(LONGLONG*)(CurrBuff+sizeof(struct bpf_hdr))=Open->Npackets.QuadPart;
*(LONGLONG*)(CurrBuff+sizeof(struct bpf_hdr)+8)=Open->Nbytes.QuadPart;
- //reset the countetrs
+ //reset the counters
NdisAcquireSpinLock( &Open->CountersLock );
Open->Npackets.QuadPart=0;
Open->Nbytes.QuadPart=0;
diff --git a/src/See/Write.c b/src/See/Write.c
index a2f1244b..50d28696 100644
--- a/src/See/Write.c
+++ b/src/See/Write.c
@@ -217,7 +217,7 @@ NPF_BufferedWrite(
// Start from the first packet
winpcap_hdr = (struct sf_pkthdr*)UserBuff;
- // Chech the consistency of the user buffer
+ // Check the consistency of the user buffer
if( (PCHAR)winpcap_hdr + winpcap_hdr->caplen + sizeof(struct sf_pkthdr) > EndOfUserBuff )
{
IF_LOUD(DbgPrint("Buffered Write: bogus packet buffer\n");)
diff --git a/src/See/dagc.h b/src/See/dagc.h
index 6162c4a3..e676e40c 100644
--- a/src/See/dagc.h
+++ b/src/See/dagc.h
@@ -207,7 +207,7 @@ int dagc_stats(dagc_t *dagcfd, dagc_stats_t *ps);
* for open, close and write. However, if the programmer uses these functions, he is more protected
* against file format changes (for example if the file format will have an header in the future).
* Moreover, assuming that the user knows the file format is a bad practice: providing
- * simple simple save functionality is more intutive and user-friendly.
+ * simple simple save functionality is more intuitive and user-friendly.
*/
int dagc_dumpfile_open(dagc_t *dagcfd, char* name);
diff --git a/src/See/jitter.c b/src/See/jitter.c
index b3bf8cb4..1b0a0ae5 100644
--- a/src/See/jitter.c
+++ b/src/See/jitter.c
@@ -45,7 +45,7 @@
//
// emit routine to update the jump table
//
-void emit_lenght(binary_stream *stream, ULONG value, UINT len)
+void emit_length(binary_stream *stream, ULONG value, UINT len)
{
(stream->refs)[stream->bpf_pc]+=len;
stream->cur_ip+=len;
@@ -115,7 +115,7 @@ BPF_filter_function BPFtoX86(struct bpf_insn *prog, UINT nins, INT *mem)
// the first pass will emit the lengths of the instructions
// to create the reference table
- emitm=emit_lenght;
+ emitm=emit_length;
for(pass=0;;){
diff --git a/src/See/win_bpf.h b/src/See/win_bpf.h
index 8ca879f5..dc5d561c 100644
--- a/src/See/win_bpf.h
+++ b/src/See/win_bpf.h
@@ -397,7 +397,7 @@ u_int bpf_filter(register struct bpf_insn *pc,
\return The portion of the packet to keep, in bytes. 0 means that the packet must be rejected, -1 means that
the whole packet must be kept.
- This function is used when NDIS passes the packet to NPF_tap() in two buffers instaed than in a single one.
+ This function is used when NDIS passes the packet to NPF_tap() in two buffers instead than in a single one.
*/
u_int bpf_filter_with_2_buffers(register struct bpf_insn *pc,
register u_char *p,
diff --git a/src/SeeDll/AdInfo.c b/src/SeeDll/AdInfo.c
index c0dbbc7e..628ce613 100644
--- a/src/SeeDll/AdInfo.c
+++ b/src/SeeDll/AdInfo.c
@@ -133,7 +133,7 @@ BOOLEAN PacketGetLinkLayerFromRegistry(LPADAPTER AdapterObject, NetType *type)
This function grabs from the registry information like the IP addresses, the netmasks
and the broadcast addresses of an interface. The buffer passed by the user is filled with
npf_if_addr structures, each of which contains the data for a single address. If the buffer
- is full, the reaming addresses are dropeed, therefore set its dimension to sizeof(npf_if_addr)
+ is full, the reaming addresses are dropped, therefore set its dimension to sizeof(npf_if_addr)
if you want only the first address.
*/
BOOLEAN PacketGetAddressesFromRegistry(LPTSTR AdapterName, npf_if_addr* buffer, PLONG NEntries)
@@ -181,7 +181,7 @@ BOOLEAN PacketGetAddressesFromRegistry(LPTSTR AdapterName, npf_if_addr* buffer,
else
{
- // Query the registry key with the interface's adresses
+ // Query the registry key with the interface's addresses
status = RegOpenKeyEx(HKEY_LOCAL_MACHINE,TEXT("SYSTEM\\CurrentControlSet\\Services"),0,KEY_READ,&SystemKey);
if (status != ERROR_SUCCESS)
goto fail;
@@ -222,7 +222,7 @@ BOOLEAN PacketGetAddressesFromRegistry(LPTSTR AdapterName, npf_if_addr* buffer,
DHCPEnabled=0;
- /* Retrieve the adrresses */
+ /* Retrieve the addresses */
if(DHCPEnabled){
BufLen = sizeof String;
@@ -284,7 +284,7 @@ BOOLEAN PacketGetAddressesFromRegistry(LPTSTR AdapterName, npf_if_addr* buffer,
else break;
}
- // The number of masks MUST be equal to the number of adresses
+ // The number of masks MUST be equal to the number of addresses
if(nmasks != naddrs){
RegCloseKey(TcpIpKey);
RegCloseKey(UnderTcpKey);
@@ -353,7 +353,7 @@ BOOLEAN PacketGetAddressesFromRegistry(LPTSTR AdapterName, npf_if_addr* buffer,
else break;
}
- // The number of masks MUST be equal to the number of adresses
+ // The number of masks MUST be equal to the number of addresses
if(nmasks != naddrs){
RegCloseKey(TcpIpKey);
RegCloseKey(UnderTcpKey);
@@ -432,7 +432,7 @@ BOOLEAN PacketAddIP6Addresses(PADAPTER_INFO AdInfo)
ODS("PacketAddIP6Addresses, retrieved addresses\n");
//
- // Scan the list of adddresses obtained from the IP helper API
+ // Scan the list of addresses obtained from the IP helper API
//
for(TmpAddr = AdBuffer; TmpAddr != NULL; TmpAddr = TmpAddr->Next)
{
@@ -966,7 +966,7 @@ BOOLEAN PacketGetAdapters()
continue;
}
- // Conver to ASCII
+ // Convert to ASCII
WideCharToMultiByte(
CP_ACP,
0,
diff --git a/src/SeeDll/Packet32.c b/src/SeeDll/Packet32.c
index e2647ec2..f9eb46b0 100644
--- a/src/SeeDll/Packet32.c
+++ b/src/SeeDll/Packet32.c
@@ -64,7 +64,7 @@ GAAHandler GetAdaptersAddressesPointer = NULL;
#endif // _WINNT4
#ifdef HAVE_DAG_API
-/* We load dinamically the dag library in order link it only when it's present on the system */
+/* We load dynamically the dag library in order link it only when it's present on the system */
dagc_open_handler p_dagc_open = NULL;
dagc_close_handler p_dagc_close = NULL;
dagc_getlinktype_handler p_dagc_getlinktype = NULL;
@@ -127,7 +127,7 @@ BOOL APIENTRY DllMain (HANDLE DllHandle,DWORD Reason,LPVOID lpReserved)
PacketGetFileVersion(TEXT("drivers\\see.sys"), PacketDriverVersion, sizeof(PacketDriverVersion));
//
- // Locate GetAdaptersAddresses dinamically since it is not present in Win2k
+ // Locate GetAdaptersAddresses dynamically since it is not present in Win2k
//
IPHMod = GetModuleHandle(TEXT("Iphlpapi"));
@@ -136,7 +136,7 @@ BOOL APIENTRY DllMain (HANDLE DllHandle,DWORD Reason,LPVOID lpReserved)
#endif // _WINNT4
#ifdef HAVE_DAG_API
- /* We load dinamically the dag library in order link it only when it's present on the system */
+ /* We load dynamically the dag library in order link it only when it's present on the system */
if((DagcLib = LoadLibrary(TEXT("dagc.dll"))) == NULL)
{
// Report the error but go on
@@ -250,7 +250,7 @@ PCHAR WChar2SChar(PWCHAR string)
PCHAR TmpStr;
TmpStr = (CHAR*) GlobalAllocPtr(GMEM_MOVEABLE | GMEM_ZEROINIT, (wcslen(string)+2));
- // Conver to ASCII
+ // Convert to ASCII
WideCharToMultiByte(
CP_ACP,
0,
@@ -435,7 +435,7 @@ LONG PacketDumpRegistryKey(PCHAR KeyName, PCHAR FileName)
\brief Returns the version of a dll or exe file
\param FileName Name of the file whose version has to be retrieved.
\param VersionBuff Buffer that will contain the string with the file version.
- \param VersionBuffLen Length of the buffer poited by VersionBuff.
+ \param VersionBuffLen Length of the buffer pointed by VersionBuff.
\return If the function succeeds, the return value is TRUE.
\note uses the GetFileVersionInfoSize() and GetFileVersionInfo() WIN32 API functions
@@ -1759,7 +1759,7 @@ BOOLEAN PacketSetReadTimeout(LPADAPTER AdapterObject,int timeout)
else
if(timeout == 1)
{
- // tell the DAG card to wait forvever
+ // tell the DAG card to wait forever
AdapterObject->DagReadTimeout.tv_sec = -1;
AdapterObject->DagReadTimeout.tv_usec = -1;
}
@@ -1819,7 +1819,7 @@ BOOLEAN PacketSetBuff(LPADAPTER AdapterObject,int dim)
\return This function returns TRUE if the filter is set successfully, FALSE if an error occurs
or if the filter program is not accepted after a safeness check by the driver. The driver performs
the check in order to avoid system crashes due to buggy or malicious filters, and it rejects non
- conformat filters.
+ conformant filters.
This function associates a new BPF filter to the adapter AdapterObject. The filter, pointed by fp, is a
set of bpf_insn instructions.
@@ -1854,7 +1854,7 @@ BOOLEAN PacketSetBpf(LPADAPTER AdapterObject, struct bpf_program *fp)
\param AdapterObject Pointer to an _ADAPTER structure.
\param snaplen Desired snap len for this capture.
\return If the function succeeds, the return value is nonzero and specifies the actual snaplen that
- the card is using. If the function fails or if the card does't allow to set sna length, the return
+ the card is using. If the function fails or if the card doesn't allow to set sna length, the return
value is 0.
The snap len is the amount of packet that is actually captured by the interface and received by the
@@ -1943,7 +1943,7 @@ BOOLEAN PacketGetStats(LPADAPTER AdapterObject,struct bpf_stat *s)
\param s Pointer to a user provided bpf_stat structure that will be filled by the function.
\return If the function succeeds, the return value is nonzero.
- With this function, the programmer can retireve the sname values provided by PacketGetStats(), plus:
+ With this function, the programmer can retrieve the sname values provided by PacketGetStats(), plus:
- the number of drops by interface (not yet supported, always 0).
- the number of packets that reached the application, i.e that were accepted by the kernel filter and
@@ -2083,7 +2083,7 @@ BOOLEAN PacketSetHwFilter(LPADAPTER AdapterObject,ULONG Filter)
- a variable number of ASCII strings, each with the names of an adapter, separated by a "\0"
- a double "\0"
- a number of ASCII strings, each with the description of an adapter, separated by a "\0". The number
- of descriptions is the same of the one of names. The fisrt description corresponds to the first name, and
+ of descriptions is the same of the one of names. The first description corresponds to the first name, and
so on.
- a double "\0".
*/
@@ -2175,7 +2175,7 @@ BOOLEAN PacketGetAdapterNames(PTSTR pStr,PULONG BufferSize)
This function grabs from the registry information like the IP addresses, the netmasks
and the broadcast addresses of an interface. The buffer passed by the user is filled with
npf_if_addr structures, each of which contains the data for a single address. If the buffer
- is full, the reaming addresses are dropeed, therefore set its dimension to sizeof(npf_if_addr)
+ is full, the reaming addresses are dropped, therefore set its dimension to sizeof(npf_if_addr)
if you want only the first address.
*/
BOOLEAN PacketGetNetInfoEx(PCHAR AdapterName, npf_if_addr* buffer, PLONG NEntries)
diff --git a/src/SeeDll/Packet32.h b/src/SeeDll/Packet32.h
index b5cd1cf9..ddfb34e9 100644
--- a/src/SeeDll/Packet32.h
+++ b/src/SeeDll/Packet32.h
@@ -307,7 +307,7 @@ struct _PACKET_OID_DATA {
ULONG Oid; ///< OID code. See the Microsoft DDK documentation or the file ntddndis.h
///< for a complete list of valid codes.
ULONG Length; ///< Length of the data field
- UCHAR Data[1]; ///< variable-lenght field that contains the information passed to or received
+ UCHAR Data[1]; ///< variable-length field that contains the information passed to or received
///< from the adapter.
};
typedef struct _PACKET_OID_DATA PACKET_OID_DATA, *PPACKET_OID_DATA;
@@ -347,7 +347,7 @@ LONG PacketDumpRegistryKey(PCHAR KeyName, PCHAR FileName);
#endif
#endif
-/* We load dinamically the dag library in order link it only when it's present on the system */
+/* We load dynamically the dag library in order link it only when it's present on the system */
#ifdef HAVE_DAG_API
typedef dagc_t* (*dagc_open_handler)(const char *source, unsigned flags, char *ebuf); ///< prototype used to dynamically load the dag dll
typedef void (*dagc_close_handler)(dagc_t *dagcfd); ///< prototype used to dynamically load the dag dll
diff --git a/src/SeeDll/dagc.h b/src/SeeDll/dagc.h
index 6162c4a3..e676e40c 100644
--- a/src/SeeDll/dagc.h
+++ b/src/SeeDll/dagc.h
@@ -207,7 +207,7 @@ int dagc_stats(dagc_t *dagcfd, dagc_stats_t *ps);
* for open, close and write. However, if the programmer uses these functions, he is more protected
* against file format changes (for example if the file format will have an header in the future).
* Moreover, assuming that the user knows the file format is a bad practice: providing
- * simple simple save functionality is more intutive and user-friendly.
+ * simple simple save functionality is more intuitive and user-friendly.
*/
int dagc_dumpfile_open(dagc_t *dagcfd, char* name);
diff --git a/src/THIRD_PARTY.TXT b/src/THIRD_PARTY.TXT
index 7dba27e3..6846f45e 100644
--- a/src/THIRD_PARTY.TXT
+++ b/src/THIRD_PARTY.TXT
@@ -606,7 +606,7 @@ This package is an SSL implementation written by Eric Young
Netscapes SSL.
This library is free for commercial and non-commercial use as long as the
-following conditions are aheared to. The following conditions apply to all
+following conditions are adhered to. The following conditions apply to all
code found in this distribution, be it the RC4, RSA, lhash, DES, etc., code;
not just the SSL code. The SSL documentation included with this distribution
is covered by the same copyright terms except that the holder is Tim Hudson
diff --git a/src/WARNING.TXT b/src/WARNING.TXT
index 01c37e0a..3fda535d 100644
--- a/src/WARNING.TXT
+++ b/src/WARNING.TXT
@@ -80,9 +80,9 @@ the destination hostname which is specified on the VPN-client side to disable
VPN over ICMP / DNS functions.
1.5. VPN Azure Cloud Service
-If your SoftEther VPN Server is placed behind the NAT or firwall, and by some
+If your SoftEther VPN Server is placed behind the NAT or firewall, and by some
reason you cannot use NAT Traversal function, Dynamic DNS function or VPN over
-ICMP/DNS function, you can use VPN Azure Clouse Service. SoftEther Corporation
+ICMP/DNS function, you can use VPN Azure Cloud Service. SoftEther Corporation
operates VPN Azure Cloud on Internet. After the VPN Server makes a connection
to the VPN Azure Cloud, the hostname "abc.vpnazure.net" ( "abc" is a unique
hostname) can be specified to connect to the VPN Server via the VPN Azure
diff --git a/src/Wfp/Wfp.c b/src/Wfp/Wfp.c
index b77f5573..0634fdf3 100644
--- a/src/Wfp/Wfp.c
+++ b/src/Wfp/Wfp.c
@@ -524,7 +524,7 @@ void NTAPI CalloutClassify(const FWPS_INCOMING_VALUES0* inFixedValues,
FWPS_CLASSIFY_OUT0* classifyOut)
{
NET_BUFFER_LIST *nbl = layerData;
- FWPS_PACKET_INJECTION_STATE injecton_state;
+ FWPS_PACKET_INJECTION_STATE injection_state;
bool block = false;
HANDLE hInjection = NULL;
UINT ip_header_len = 0;
@@ -552,9 +552,9 @@ void NTAPI CalloutClassify(const FWPS_INCOMING_VALUES0* inFixedValues,
if (hInjection != NULL)
{
- injecton_state = FwpsQueryPacketInjectionState0(hInjection, nbl, NULL);
+ injection_state = FwpsQueryPacketInjectionState0(hInjection, nbl, NULL);
- if (injecton_state == FWPS_PACKET_INJECTED_BY_SELF || injecton_state == FWPS_PACKET_PREVIOUSLY_INJECTED_BY_SELF)
+ if (injection_state == FWPS_PACKET_INJECTED_BY_SELF || injection_state == FWPS_PACKET_PREVIOUSLY_INJECTED_BY_SELF)
{
//SetEvent(wfp->Event);
classifyOut->actionType = FWP_ACTION_CONTINUE; // continue
diff --git a/src/Wfp/WfpInner.h b/src/Wfp/WfpInner.h
index cfa23712..efb9292c 100644
--- a/src/Wfp/WfpInner.h
+++ b/src/Wfp/WfpInner.h
@@ -244,7 +244,7 @@ typedef struct WFP_IPV4_HEADER
UCHAR TypeOfService; // Service Type
USHORT TotalLength; // Total size
USHORT Identification; // Identifier
- UCHAR FlagsAndFlagmentOffset[2]; // The flag and fragment offset
+ UCHAR FlagsAndFragmentOffset[2]; // The flag and fragment offset
UCHAR TimeToLive; // TTL
UCHAR Protocol; // Protocol
USHORT Checksum; // Checksum
diff --git a/src/bin/hamcore/eula.txt b/src/bin/hamcore/eula.txt
index 8070f492..1d4a4174 100644
--- a/src/bin/hamcore/eula.txt
+++ b/src/bin/hamcore/eula.txt
@@ -380,7 +380,7 @@ Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
This package is an SSL implementation written by Eric Young (eay@cryptsoft.com). The implementation was written so as to conform with Netscapes SSL.
-This library is free for commercial and non-commercial use as long as the following conditions are aheared to. The following conditions apply to all code found in this distribution, be it the RC4, RSA, lhash, DES, etc., code; not just the SSL code. The SSL documentation included with this distribution is covered by the same copyright terms except that the holder is Tim Hudson (tjh@cryptsoft.com).
+This library is free for commercial and non-commercial use as long as the following conditions are adhered to. The following conditions apply to all code found in this distribution, be it the RC4, RSA, lhash, DES, etc., code; not just the SSL code. The SSL documentation included with this distribution is covered by the same copyright terms except that the holder is Tim Hudson (tjh@cryptsoft.com).
Copyright remains Eric Young's, and as such any Copyright notices in the code are not to be removed. If this package is used in a product, Eric Young should be given attribution as the author of the parts of the library used. This can be in the form of a textual message at program startup or in documentation (online or textual) provided with the package.
diff --git a/src/bin/hamcore/legal.txt b/src/bin/hamcore/legal.txt
index 56390833..db470884 100644
--- a/src/bin/hamcore/legal.txt
+++ b/src/bin/hamcore/legal.txt
@@ -255,7 +255,7 @@ Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
This package is an SSL implementation written by Eric Young (eay@cryptsoft.com). The implementation was written so as to conform with Netscapes SSL.
-This library is free for commercial and non-commercial use as long as the following conditions are aheared to. The following conditions apply to all code found in this distribution, be it the RC4, RSA, lhash, DES, etc., code; not just the SSL code. The SSL documentation included with this distribution is covered by the same copyright terms except that the holder is Tim Hudson (tjh@cryptsoft.com).
+This library is free for commercial and non-commercial use as long as the following conditions are adhered to. The following conditions apply to all code found in this distribution, be it the RC4, RSA, lhash, DES, etc., code; not just the SSL code. The SSL documentation included with this distribution is covered by the same copyright terms except that the holder is Tim Hudson (tjh@cryptsoft.com).
Copyright remains Eric Young's, and as such any Copyright notices in the code are not to be removed. If this package is used in a product, Eric Young should be given attribution as the author of the parts of the library used. This can be in the form of a textual message at program startup or in documentation (online or textual) provided with the package.
diff --git a/src/bin/hamcore/openvpn_sample.ovpn b/src/bin/hamcore/openvpn_sample.ovpn
index 6ded2bf7..2964712f 100644
--- a/src/bin/hamcore/openvpn_sample.ovpn
+++ b/src/bin/hamcore/openvpn_sample.ovpn
@@ -26,7 +26,7 @@
# specify 'dev tun'. (Layer-3 IP Routing Mode)
#
# To connect to the VPN Server as a bridging equipment of "Site-to-Site VPN",
-# specify 'dev tap'. (Layer-2 Ethernet Bridgine Mode)
+# specify 'dev tap'. (Layer-2 Ethernet Bridging Mode)
dev $TAG_TUN_TAP$
diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb
index df8212b3..0695db65 100644
--- a/src/bin/hamcore/strtable_cn.stb
+++ b/src/bin/hamcore/strtable_cn.stb
@@ -21,7 +21,7 @@ DEFAULT_FONT SimSun
DEFAULT_FONT_HIGHDPI Microsoft YaHei
DEFAULT_FONT_2 SimSun
DEFAULT_FONT_SIZE 9
-DEFAULE_LOCALE 年 月 日 点 分 秒 星期日 星期一 星期二 星期三 星期四 星期五 星期六 天 小时 分 秒 (无)
+DEFAULT_LOCALE 年 月 日 点 分 秒 星期日 星期一 星期二 星期三 星期四 星期五 星期六 天 小时 分 秒 (无)
# 语言
@@ -564,7 +564,7 @@ HUB_AO_SecureNAT_RandomizeAssignIp If you set this option to non-zero value, t
HUB_AO_DetectDormantSessionInterval If you set this option to non-zero value, then the Virtual Hub will treat the VPN sessions, which have transmitted no packets for the last specified intervals (in seconds), as Dormant Sessions. The Virtual Hub will not flood packets, which should be flood, to any Dormant Sessions.
HUB_AO_NoPhysicalIPOnPacketLog If you set this option to non-zero value, then the physical IP addresses of VPN clients of either the source VPN session or the destination VPN session will not be recorded on the packet log file.
HUB_AO_UseHubNameAsDhcpUserClassOption If you set this option to non-zero value, then the Virtual Hub Name will be added to a DHCP request to an external DHCP server as the "User-Class" option. This allows to use separate pools of IP addresses for each Virtual Hub. (For only L2TP/IPsec and OpenVPN sessions.)
-HUB_AO_UseHubNameAsRadiusNasId If you set this option to non-zero value, then the NAS-Identidier RADIUS attribute will be set to a name of the Virtual Hub. This allows to determine on RADIUS server whether access to the Virtual Hub should be granted or denied.
+HUB_AO_UseHubNameAsRadiusNasId If you set this option to non-zero value, then the NAS-Identifier RADIUS attribute will be set to a name of the Virtual Hub. This allows to determine on RADIUS server whether access to the Virtual Hub should be granted or denied.
@@ -1218,7 +1218,7 @@ CM_EDIT_HUB_2 %S 的属性
CM_EDIT_HUB_STANDALONE 当前，服务器正以独立模式运行。而该虚拟 HUB 作为一个独立的 HUB 运行。
CM_EDIT_HUB_TYPE_FIXED 当前，服务器正以群集模式运行。如果虚拟 HUB 处于这种模式，动态变化将无法进行。
-CM_EDIT_HUB_CREATER 一个新的虚拟 HUB "%S" 已经建立
+CM_EDIT_HUB_CREATED 一个新的虚拟 HUB "%S" 已经建立
CM_OFFLINE_MSG 你想切换 "%s" 到离线状态?\r\n\r\n如果您切换虚拟 HUB 至离线状态，当前连接到虚拟 HUB 上的所有会话将无法连接。
CM_DELETE_HUB_MSG 你想删除"%S"吗?\r\n\r\n如果你删除虚拟 HUB，当前连接到虚拟 HUB 的所有会话将被断开，新的会话将无法连接。\r\n这还将删除所有 HUB 设置，用户对象，组对象，证书和级联连接。\r\n\r\n一旦你将虚拟 HUB 删除，将无法恢复。\r\n你确定要删除吗?
CM_HUB_DELETED_MSG 虚拟 HUB "%S" 被删除。
@@ -1374,7 +1374,7 @@ SM_EDIT_USER_POL_DLG 用户 %S 的安全策略
SM_POLICY_DEF_CAPTION 安全策略
SM_LIMIT_STR 指定一个在 %u 与 %u 之间的整数。
SM_POLICY_INIT_TITLE 从左边的列表中选择一个策略项目。
-SM_USER_CREEATE_OK 用户 %S 已创建。
+SM_USER_CREATE_OK 用户 %S 已创建。
SM_USERINFO_CAPTION 用户 "%S" 的信息
SM_USERINFO_NAME 用户名
SM_USERINFO_GROUP 组名
@@ -2089,8 +2089,8 @@ LC_SET_PASSWORD 连接到客户端服务的密码设置已变更。
LC_TAP_NOT_FOUND 无法找到 tun/tap 的 Mac OS X 驱动。请安装 tun/tap 驱动。
#(删除日志)
-LE_START 正在监控目录 "%S"。如果可用磁盘空间变得小于 %S，此目录和其子目录下的日志文件和配置文件的备份文件将按照从旧到新的顺序被自动删除。决定何时开始删除的可用磁盘空间大小，可以在配置文件的“AutoDeletCheckDiskFreeSpaceMin”项目中修改。
-LE_DELETE 可用磁盘空间已小于 %S，因此旧文件 "%S" 被自动删除。决定何时开始删除的可用磁盘空间大小，可以在配置文件的“AutoDeletCheckDiskFreeSpaceMin”项目中修改。
+LE_START 正在监控目录 "%S"。如果可用磁盘空间变得小于 %S，此目录和其子目录下的日志文件和配置文件的备份文件将按照从旧到新的顺序被自动删除。决定何时开始删除的可用磁盘空间大小，可以在配置文件的“AutoDeleteCheckDiskFreeSpaceMin”项目中修改。
+LE_DELETE 可用磁盘空间已小于 %S，因此旧文件 "%S" 被自动删除。决定何时开始删除的可用磁盘空间大小，可以在配置文件的“AutoDeleteCheckDiskFreeSpaceMin”项目中修改。
LE_NOT_ENOUGH_FREE <<警告>> 如果可用磁盘空间小于 %S，将不能自动删除日志文件和配置文件的旧备份文件。我们建议您即刻从次计算机上手动删除不必要的文件来恢复可用磁盘空间。当可用磁盘空间过小时，计算机运行将被变得不稳定。
# (三层交换机日志)
@@ -3230,7 +3230,7 @@ IDCANCEL 关闭(&X)
PREFIX D_EM_ADD
STATIC1 用于捕获的网络适配器名称(&L):
-R_PROMISCUS 捕获时不要使用混杂模式(&N)
+R_PROMISCUOUS 捕获时不要使用混杂模式(&N)
STATIC2 数据包日志 (&P) :
S_PACKET 日志文件切换周期 (&W) :
S_PACKET_0 TCP 连接日志:
@@ -4075,7 +4075,7 @@ CAPTION 升级提示的配置
S_INFO 当新版本将要发布时，请定期查询 %s 的新版本和弹出提示窗口。\r\n\r\nHTTPS 数据包将会用在本电脑和位于日本驻波的 SoftEther 升级服务器之间，用于查询有无升级信息。个人信息不会外泄。
S_TITLE %s 升级以及提示设置
S_ENABLE 启用升级查询(&E)
-S_DISBLE 禁用升级查询(&D)
+S_DISABLE 禁用升级查询(&D)
IDCANCEL 关闭(&C)
@@ -4309,13 +4309,13 @@ CON_INFILE_START 在文件 "%s" 中写入命令将被使用代替键盘输入
CON_OUTFILE_START 该消息输出到控制台将被保存在文件 "%s"。
CON_USER_CANCEL [EOF]
CON_UNKNOWN_CMD "%S": 命令未找到。\n您可以使用 "HELP" 命令来查看一个可用的命令列表。
-CON_AMBIGIOUS_CMD "%S": 命令名称是模糊的。
-CON_AMBIGIOUS_CMD_1 指定的命令名称匹配以下多个命令:
-CON_AMBIGIOUS_CMD_2 请更严格地重新指定命令名称。
+CON_AMBIGUOUS_CMD "%S": 命令名称是模糊的。
+CON_AMBIGUOUS_CMD_1 指定的命令名称匹配以下多个命令:
+CON_AMBIGUOUS_CMD_2 请更严格地重新指定命令名称。
CON_INVALID_PARAM 参数 "/%S" 已被指定。使用命令 "%S" 时，不可能指定此参数。输入 "%S /HELP" 来看被使用的参数清单。
-CON_AMBIGIOUS_PARAM "/%S": 参数名称是不明确的。
-CON_AMBIGIOUS_PARAM_1 指定的参数名称符合以下，被指定的做为命令 "%S" 参数的参数:
-CON_AMBIGIOUS_PARAM_2 请更严格地重新指定参数名称。
+CON_AMBIGUOUS_PARAM "/%S": 参数名称是不明确的。
+CON_AMBIGUOUS_PARAM_1 指定的参数名称符合以下，被指定的做为命令 "%S" 参数的参数:
+CON_AMBIGUOUS_PARAM_2 请更严格地重新指定参数名称。
# 不明命令
@@ -4338,7 +4338,7 @@ CMD_HELP_DESCRIPTION [目的]
CMD_HELP_USAGE [使用方法]
CMD_HELP_HELP [说明]
CMD_HELP_ARGS [参数]
-CMD_PROPMT_PORT 输入端口号:
+CMD_PROMPT_PORT 输入端口号:
CMD_EVAL_PORT 端口号无效。指定一个范围是 1 到 65535 的端口号。
CMD_CT_STD_COLUMN_1 项目
CMD_CT_STD_COLUMN_2 价值
@@ -5401,7 +5401,7 @@ CMD_CascadePolicySet_VALUE 设定协议的新值，如果协议是数值，请
CMD_CascadePolicySet_PROMPT_POLNAME 更改值得协议的名称:
CMD_CascadePolicySet_PROMPT_POLVALUE 设置新值:
CMD_CascadePolicySet_Invalid_Name 指定的协议名称 "%S" 是无效的。\n请运行 PolicyList 命令，您可以获取设置协议的清单。
-CMD_CascadePolicySet_Invalid_Name_For_Cadcade 指定协议 "%S" 在设置级联的安全协议时不可用。
+CMD_CascadePolicySet_Invalid_Name_For_Cascade 指定协议 "%S" 在设置级联的安全协议时不可用。
CMD_CascadePolicySet_Invalid_Range 协议 "%S" 请在 %s 范围内选定。
@@ -6754,7 +6754,7 @@ CMD_AccountRetrySet_[name] 指定要更改设置的连接设置名。
CMD_AccountRetrySet_NUM 指定连续进行重新连接的次数。 如指定 "999"，重试次数为无限次 (永久连接)。如指定 "0"，不进行重新连接。
CMD_AccountRetrySet_INTERVAL 重新进行连接时，设置距离上次断开或连接失败后需多少秒开始重新连接处理。
CMD_AccountRetrySet_PROMPT_NUM 重新连接次数 ("999" 为无限次):
-CMD_AccountRetrySet_PROMPY_INTERVAL 重新连接间隔 (秒):
+CMD_AccountRetrySet_PROMPT_INTERVAL 重新连接间隔 (秒):
CMD_AccountRetrySet_EVAL_INTERVAL 请指定 5 秒以上的重新连接间隔。
@@ -7081,7 +7081,7 @@ SW_PERFORM_MSG_IMPORTING_ACCOUNT 在简单安装工具中的导入嵌入的 VPN
SW_PERFORM_MSG_DELETE_SETUP_INFO 删除安装信息和日志...
SW_PERFORM_MSG_WRITE_LOG 写入一个设置日志...
SW_PERFORM_MSG_COPY_ERROR 复制文件 "%s" 失败。
-SW_PERFORM_MSG_CRAETE_LINK_ERROR 创建快捷方式文件 "%s" 失败。\r\n\r\n您要重试吗？
+SW_PERFORM_MSG_CREATE_LINK_ERROR 创建快捷方式文件 "%s" 失败。\r\n\r\n您要重试吗？
SW_PERFORM_MSG_WRITE_LOG_ERROR 安装日志文件 "%s" 创建中。\r\n\r\n您要重试吗？
SW_PERFORM_MSG_STOP_SVC_ERROR 关闭 "%s" 服务(内部名: "%S")失败。
SW_PERFORM_MSG_START_SVC_ERROR 开启 "%s" 服务(内部名: "%S")失败。
diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb
index 9b8029df..e4f37a0d 100644
--- a/src/bin/hamcore/strtable_en.stb
+++ b/src/bin/hamcore/strtable_en.stb
@@ -18,7 +18,7 @@ DEFAULT_FONT Tahoma
DEFAULT_FONT_WIN7 Segoe UI
DEFAULT_FONT_2 Tahoma
DEFAULT_FONT_SIZE 8
-DEFAULE_LOCALE - - $ : : $ Sun Mon Tue Wed Thu Fri Sat : : : $ (None)
+DEFAULT_LOCALE - - $ : : $ Sun Mon Tue Wed Thu Fri Sat : : : $ (None)
# 言語
@@ -371,7 +371,7 @@ SEC_PIN_CHANGE_FAILED Changing of PIN code failed.
SEC_PIN_OK The PIN code has been changed.
-# TCP Connecion Dialog
+# TCP Connection Dialog
CONNECTDLG_CAPTION Connecting
CONNECTDLG_MESSAGE Connecting to the server "%S" (TCP port: %u)...
CONNECTDLG_CANCELING Aborting the connection. Please wait...
@@ -558,7 +558,7 @@ HUB_AO_SecureNAT_RandomizeAssignIp If you set this option to non-zero value, t
HUB_AO_DetectDormantSessionInterval If you set this option to non-zero value, then the Virtual Hub will treat the VPN sessions, which have transmitted no packets for the last specified intervals (in seconds), as Dormant Sessions. The Virtual Hub will not flood packets, which should be flood, to any Dormant Sessions.
HUB_AO_NoPhysicalIPOnPacketLog If you set this option to non-zero value, then the physical IP addresses of VPN clients of either the source VPN session or the destination VPN session will not be recorded on the packet log file.
HUB_AO_UseHubNameAsDhcpUserClassOption If you set this option to non-zero value, then the Virtual Hub Name will be added to a DHCP request to an external DHCP server as the "User-Class" option. This allows to use separate pools of IP addresses for each Virtual Hub. (For only L2TP/IPsec and OpenVPN sessions.)
-HUB_AO_UseHubNameAsRadiusNasId If you set this option to non-zero value, then the NAS-Identidier RADIUS attribute will be set to a name of the Virtual Hub. This allows to determine on RADIUS server whether access to the Virtual Hub should be granted or denied.
+HUB_AO_UseHubNameAsRadiusNasId If you set this option to non-zero value, then the NAS-Identifier RADIUS attribute will be set to a name of the Virtual Hub. This allows to determine on RADIUS server whether access to the Virtual Hub should be granted or denied.
# Concerning failed connection dialogs
@@ -1207,7 +1207,7 @@ CM_EDIT_HUB_2 Properties of %S
CM_EDIT_HUB_STANDALONE Currently the server is operating in Standalone Mode. This Virtual Hub is operating as a Standalone Hub.
CM_EDIT_HUB_TYPE_FIXED Currently the server is operating in Cluster Mode. This Virtual Hub is of the following type, which means it is not possible to make dynamic changes.
-CM_EDIT_HUB_CREATER A new Virtual Hub '%S' has been created.
+CM_EDIT_HUB_CREATED A new Virtual Hub '%S' has been created.
CM_OFFLINE_MSG Do you want to switch %s to offline?\r\n\r\nIf you switch the Virtual Hub to offline all sessions currently connected to the Virtual Hub will be disconnected and new sessions will be unable to connect.
CM_DELETE_HUB_MSG Do you want to delete %S?\r\n\r\nIf you delete the Virtual Hub, all sessions currently connected to the Virtual Hub will be disconnected and new sessions will be unable to connect. \r\nThis will also delete all the Hub settings, user objects, group objects, certificates and Cascade Connections. \r\n\r\nOnce you delete the Virtual Hub, it cannot be recovered. \r\nAre you sure you want to delete it?
CM_HUB_DELETED_MSG Virtual Hub %S has been deleted.
@@ -1363,7 +1363,7 @@ SM_EDIT_USER_POL_DLG Security Policy of User %S
SM_POLICY_DEF_CAPTION Security Policy
SM_LIMIT_STR Specify an integer that is within the range %u to %u.
SM_POLICY_INIT_TITLE Select a policy item from the list on the left.
-SM_USER_CREEATE_OK User %S has been created.
+SM_USER_CREATE_OK User %S has been created.
SM_USERINFO_CAPTION User "%S" Information
SM_USERINFO_NAME User Name
SM_USERINFO_GROUP Group Name
@@ -3095,7 +3095,7 @@ IDCANCEL E&xit
PREFIX D_NM_OPTION
-CAPTION SecureNAT Configration
+CAPTION SecureNAT Configuration
S_TITLE Set how SecureNAT virtual host performs operation on the virtual network of Virtual Hub "%S".
STATIC1 Virtual Host's Network Interface Settings:
STATIC2 &MAC Address:
@@ -3212,7 +3212,7 @@ IDCANCEL E&xit
PREFIX D_EM_ADD
STATIC1 Name of Network Adapter Used for Capture:
-R_PROMISCUS Do&n't Use Promiscuous Mode During Capture
+R_PROMISCUOUS Do&n't Use Promiscuous Mode During Capture
STATIC2 &Packet Log:
S_PACKET Log File S&witch Cycle:
S_PACKET_0 TCP Connection Log:
@@ -3320,7 +3320,7 @@ PREFIX D_SM_MSG
CAPTION Set the Message
S_MSG_2 You can set a message to display on the screen of a user when a VPN Client connects to the Virtual Hub "%S". To show a message, input the message that you want to show.
C_USEMSG Show &Message
-STATIC1 About the Message Display Funcion
+STATIC1 About the Message Display Function
S_INFO The VPN Client must be Version 3.0 or later.\r\n\r\nSpecify a single line starts with "http://" as the message to open the default Web browser on the client instead to showing a message.
IDOK &OK
IDCANCEL Cancel
@@ -3982,7 +3982,7 @@ S_INFO8 SoftEther VPN is a work of the research and development project of J
PREFIX D_SW_ERROR
CAPTION D_SW_ERROR
-S_INFO An error occureed and the setup of %s is aborted.\r\n\r\nRestart the Setup Wizard if you want to retry.
+S_INFO An error occurred and the setup of %s is aborted.\r\n\r\nRestart the Setup Wizard if you want to retry.
PREFIX D_SW_FINISH
@@ -4059,7 +4059,7 @@ CAPTION Configuration of Update Notification
S_INFO Checks the new versions of %s periodically and popup a notification when a new version will be released.\r\n\r\nHTTPS packets will be used between this computer and the SoftEther Update server located in Tsukuba-city, Ibaraki-prefecture, Japan in order to check updates. No personal information will be sent.
S_TITLE %s Update and Notify Settings
S_ENABLE &Enable Update Checks
-S_DISBLE &Disable Update Checks
+S_DISABLE &Disable Update Checks
IDCANCEL &Close
@@ -4292,13 +4292,13 @@ CON_INFILE_START The commands written in the file "%s" will be used instead of
CON_OUTFILE_START The message output to the console will be saved in the file "%s".
CON_USER_CANCEL [EOF]
CON_UNKNOWN_CMD "%S": Command not found. \nYou can use the HELP command to view a list of the available commands.
-CON_AMBIGIOUS_CMD "%S": The command-name is ambiguous.
-CON_AMBIGIOUS_CMD_1 The specified command name matches the following multiple commands.
-CON_AMBIGIOUS_CMD_2 Please re-specify the command name more strictly.
+CON_AMBIGUOUS_CMD "%S": The command-name is ambiguous.
+CON_AMBIGUOUS_CMD_1 The specified command name matches the following multiple commands.
+CON_AMBIGUOUS_CMD_2 Please re-specify the command name more strictly.
CON_INVALID_PARAM The parameter "/%S" has been specified. It is not possible to specify this parameter when using the command "%S". Input "%S /HELP" to see the list of what parameters can be used.
-CON_AMBIGIOUS_PARAM "%S": The parameter name is ambiguous.
-CON_AMBIGIOUS_PARAM_1 The specified parameter name matches with the following parameters that can be specified as a parameter of command "%S".
-CON_AMBIGIOUS_PARAM_2 Please re-specify the parameter name more strictly.
+CON_AMBIGUOUS_PARAM "%S": The parameter name is ambiguous.
+CON_AMBIGUOUS_PARAM_1 The specified parameter name matches with the following parameters that can be specified as a parameter of command "%S".
+CON_AMBIGUOUS_PARAM_2 Please re-specify the parameter name more strictly.
# Unknown command
@@ -4321,7 +4321,7 @@ CMD_HELP_DESCRIPTION Purpose:
CMD_HELP_USAGE Usage:
CMD_HELP_HELP Description:
CMD_HELP_ARGS Parameters:
-CMD_PROPMT_PORT Input the port number:
+CMD_PROMPT_PORT Input the port number:
CMD_EVAL_PORT Port number is invalid. Specify a port number that is within the range of 1 to 65535.
CMD_CT_STD_COLUMN_1 Item
CMD_CT_STD_COLUMN_2 Value
@@ -5384,7 +5384,7 @@ CMD_CascadePolicySet_VALUE Specify a new policy value. If the policy is an integ
CMD_CascadePolicySet_PROMPT_POLNAME Name of Policy Whose Value you want to Change:
CMD_CascadePolicySet_PROMPT_POLVALUE Value to newly set:
CMD_CascadePolicySet_Invalid_Name The specified policy name "%S" is invalid. \nCheck the list of policy names that can be set using the PolicyList command.
-CMD_CascadePolicySet_Invalid_Name_For_Cadcade The specified policy name "%S" cannot be used for a Cascade Connection security policy setting.
+CMD_CascadePolicySet_Invalid_Name_For_Cascade The specified policy name "%S" cannot be used for a Cascade Connection security policy setting.
CMD_CascadePolicySet_Invalid_Range Specify policy "%S" within the range of %s.
@@ -6179,8 +6179,8 @@ CMD_IPsecGet_PRINT_DEFAULTHUB Name of Default Virtual Hub
# EtherIpClientAdd command
-CMD_EtherIpClientAdd Add New EtherIP / L2TPv3 over IPsec Client Setting to Accept EthreIP / L2TPv3 Client Devices
-CMD_EtherIpClientAdd_Help Add a new setting entry to enable the EtherIP / L2TPv3 over IPsec Server Function to accept client devices.\nIn order to accept connections from routers by the EtherIP / L2TPv3 over IPsec Server Function, you have to define the relation table between an IPsec Phase 1 string which is presented by client devices of EtherIP / L2TPv3 over IPsec compatible router, and the designation of the destination Virtual Hub.\nAfter you add a definition entry by EtherIpClientAdd command, the defined connection setting to the Virtual Hub will be applied on the login-attepting session from an EtherIP / L2TPv3 over IPsec client device.\nThe username and password in an entry must be registered on the Virtual Hub. An EtherIP / L2TPv3 client will be regarded as it connected the Virtual HUB with the identification of the above user information.\n\nTo execute this command, you must have VPN Server administrator privileges. \nThis command cannot be run on VPN Bridge.\nYou cannot execute this command for Virtual Hubs of VPN Servers operating as a cluster.
+CMD_EtherIpClientAdd Add New EtherIP / L2TPv3 over IPsec Client Setting to Accept EtherIP / L2TPv3 Client Devices
+CMD_EtherIpClientAdd_Help Add a new setting entry to enable the EtherIP / L2TPv3 over IPsec Server Function to accept client devices.\nIn order to accept connections from routers by the EtherIP / L2TPv3 over IPsec Server Function, you have to define the relation table between an IPsec Phase 1 string which is presented by client devices of EtherIP / L2TPv3 over IPsec compatible router, and the designation of the destination Virtual Hub.\nAfter you add a definition entry by EtherIpClientAdd command, the defined connection setting to the Virtual Hub will be applied on the login-attempting session from an EtherIP / L2TPv3 over IPsec client device.\nThe username and password in an entry must be registered on the Virtual Hub. An EtherIP / L2TPv3 client will be regarded as it connected the Virtual HUB with the identification of the above user information.\n\nTo execute this command, you must have VPN Server administrator privileges. \nThis command cannot be run on VPN Bridge.\nYou cannot execute this command for Virtual Hubs of VPN Servers operating as a cluster.
CMD_EtherIpClientAdd_Args EtherIpClientAdd [ID] [/HUB:hubname] [/USERNAME:username] [/PASSWORD:password]
CMD_EtherIpClientAdd_[ID] Specify an ISAKMP Phase 1 ID. The ID must be exactly same as a ID in the configuration of the EtherIP / L2TPv3 Client. You can specify IP address as well as characters as ID, if the EtherIP Client uses IP address as Phase 1 ID. If you specify '*' (asterisk), it will be a wildcard to match any clients which doesn't match other explicit rules.
CMD_EtherIpClientAdd_HUB Specify the name of the Virtual Hub to connect.
@@ -6276,7 +6276,7 @@ CMD_VpnOverIcmpDnsGet_PRINT_DNS VPN over DNS Server Enabled
# DynamicDnsGetStatus command
CMD_DynamicDnsGetStatus Show the Current Status of Dynamic DNS Function
-CMD_DynamicDnsGetStatus_Help Get and show the current status of the Dynamic DNS function.\n\nThe Dynamic DNS assigns a unique and permanent DNS hostname for this VPN Server. You can use that hostname to specify this VPN Server on the settings for VPN Client and VPN Bridge. You need not to register and keep a domain name.\nAlso, if your ISP assignes you a dynamic (not-fixed) IP address, the corresponding IP address of your Dynamic DNS hostname will be automatically changed. It enables you to keep running the VPN Server by using only a dynamic IP address.\r\nTherefore, you need not any longer to keep static global IP addresses with expenses monthly costs.\n[Caution]\nTo disable the Dynamic DNS Function, modify the configuration file of VPN Server.\r\n\r\nThe "declare root" directive has the "declare DDnsClient" directive. In this directive, you can switch "bool Disable" from false to true, and reboot the VPN Server, then the Dynamic DNS Function will be disabled.\r\nTo execute this command, you must have VPN Server administrator privileges. \nThis command cannot be run on VPN Bridge.
+CMD_DynamicDnsGetStatus_Help Get and show the current status of the Dynamic DNS function.\n\nThe Dynamic DNS assigns a unique and permanent DNS hostname for this VPN Server. You can use that hostname to specify this VPN Server on the settings for VPN Client and VPN Bridge. You need not to register and keep a domain name.\nAlso, if your ISP assigns you a dynamic (not-fixed) IP address, the corresponding IP address of your Dynamic DNS hostname will be automatically changed. It enables you to keep running the VPN Server by using only a dynamic IP address.\r\nTherefore, you need not any longer to keep static global IP addresses with expenses monthly costs.\n[Caution]\nTo disable the Dynamic DNS Function, modify the configuration file of VPN Server.\r\n\r\nThe "declare root" directive has the "declare DDnsClient" directive. In this directive, you can switch "bool Disable" from false to true, and reboot the VPN Server, then the Dynamic DNS Function will be disabled.\r\nTo execute this command, you must have VPN Server administrator privileges. \nThis command cannot be run on VPN Bridge.
CMD_DynamicDnsGetStatus_Args DynamicDnsGetStatus
CMD_DynamicDnsGetStatus_PRINT_FQDN Assigned Dynamic DNS Hostname (Full)
CMD_DynamicDnsGetStatus_PRINT_HOSTNAME Assigned Dynamic DNS Hostname (Hostname)
@@ -6287,7 +6287,7 @@ CMD_DynamicDnsGetStatus_PRINT_IPv6 Global IPv6 Address
# DynamicDnsSetHostname command
CMD_DynamicDnsSetHostname Set the Dynamic DNS Hostname
-CMD_DynamicDnsSetHostname_Help You can use this command to change the hostname assigned by the Dynamic DNS function. The currently assigned hostname can be showen by the DynamicDnsGetStatus command.\n\nThe Dynamic DNS assigns a unique and permanent DNS hostname for this VPN Server. You can use that hostname to specify this VPN Server on the settings for VPN Client and VPN Bridge. You need not to register and keep a domain name.\nAlso, if your ISP assignes you a dynamic (not-fixed) IP address, the corresponding IP address of your Dynamic DNS hostname will be automatically changed. It enables you to keep running the VPN Server by using only a dynamic IP address.\r\nTherefore, you need not any longer to keep static global IP addresses with expenses monthly costs.\n[Caution]\nTo disable the Dynamic DNS Function, modify the configuration file of VPN Server.\r\n\r\nThe "declare root" directive has the "declare DDnsClient" directive. In this directive, you can switch "bool Disable" from false to true, and reboot the VPN Server, then the Dynamic DNS Function will be disabled.\r\nTo execute this command, you must have VPN Server administrator privileges. \nThis command cannot be run on VPN Bridge.
+CMD_DynamicDnsSetHostname_Help You can use this command to change the hostname assigned by the Dynamic DNS function. The currently assigned hostname can be showen by the DynamicDnsGetStatus command.\n\nThe Dynamic DNS assigns a unique and permanent DNS hostname for this VPN Server. You can use that hostname to specify this VPN Server on the settings for VPN Client and VPN Bridge. You need not to register and keep a domain name.\nAlso, if your ISP assigns you a dynamic (not-fixed) IP address, the corresponding IP address of your Dynamic DNS hostname will be automatically changed. It enables you to keep running the VPN Server by using only a dynamic IP address.\r\nTherefore, you need not any longer to keep static global IP addresses with expenses monthly costs.\n[Caution]\nTo disable the Dynamic DNS Function, modify the configuration file of VPN Server.\r\n\r\nThe "declare root" directive has the "declare DDnsClient" directive. In this directive, you can switch "bool Disable" from false to true, and reboot the VPN Server, then the Dynamic DNS Function will be disabled.\r\nTo execute this command, you must have VPN Server administrator privileges. \nThis command cannot be run on VPN Bridge.
CMD_DynamicDnsSetHostname_Args DynamicDnsSetHostname [hostname]
CMD_DynamicDnsSetHostname_[hostname] Specify the new hostname with 3 letters at least and 31 letters at most. Only alphabets and numerics can be used.
CMD_DynamicDnsSetHostname_Prompt_hostname Dynamic DNS Hostname (3 - 31 letters):
@@ -6739,10 +6739,10 @@ CMD_AccountRetrySet Set Interval between Connection Retries for Connection Fail
CMD_AccountRetrySet_Help When a VPN Connection Setting registered on the VPN Client is specified and that VPN Connection Setting attempts to connect to a VPN Server, use this to specify the interval to wait between connection attempts and the limit of how many times to retry connecting when communication with the VPN Server has been disconnected or when the connection process failed. \nIf the user authentication type is Smart Card Authentication, no connection retry will be performed regardless of the Number of Connection Attempts setting.
CMD_AccountRetrySet_Args AccountRetrySet [name] [/NUM:num_retry] [/INTERVAL:retry_interval]
CMD_AccountRetrySet_[name] Specify the name of the VPN Connection Setting whose setting you want to change.
-CMD_AccountRetrySet_NUM Specify the number of times to make consecutive retries. By specifying "999", there will be limitless attempts to reconection (always connect). By specifying "0", not attempt at reconnection will be made.
+CMD_AccountRetrySet_NUM Specify the number of times to make consecutive retries. By specifying "999", there will be limitless attempts to reconnection (always connect). By specifying "0", not attempt at reconnection will be made.
CMD_AccountRetrySet_INTERVAL When attempting a reconnection, this sets how many seconds to wait after the previous disconnection or connection failure before starting the reconnection process.
-CMD_AccountRetrySet_PROMPT_NUM Reconection Count ("999" is unlimited):
-CMD_AccountRetrySet_PROMPY_INTERVAL Reconection Interval (Seconds):
+CMD_AccountRetrySet_PROMPT_NUM Reconnection Count ("999" is unlimited):
+CMD_AccountRetrySet_PROMPT_INTERVAL Reconnection Interval (Seconds):
CMD_AccountRetrySet_EVAL_INTERVAL Specify 5 seconds or more for the retries interval.
@@ -6979,7 +6979,7 @@ SW_COMPONENT_VPNSERVER_TITLE SoftEther VPN Server
SW_COMPONENT_VPNSERVER_DESCRIPTION Install it on a server computer at the central site of VPN. The management tools will be also installed.
SW_COMPONENT_VPNCLIENT_TITLE SoftEther VPN Client
-SW_COMPONENT_VPNCLIENT_DESCRIPTION Install it on VPN client comuters. A VPN client computer will be able to connect to the central VPN Server. The management tools will be also installed.
+SW_COMPONENT_VPNCLIENT_DESCRIPTION Install it on VPN client computers. A VPN client computer will be able to connect to the central VPN Server. The management tools will be also installed.
SW_COMPONENT_VPNBRIDGE_TITLE SoftEther VPN Bridge
SW_COMPONENT_VPNBRIDGE_DESCRIPTION Install it on computers at each site. Each VPN Bridge will establish a VPN connection to the central VPN Server. The management tools will be also installed.
@@ -7076,7 +7076,7 @@ SW_PERFORM_MSG_IMPORTING_ACCOUNT Importing the Built-in VPN Connection Setting
SW_PERFORM_MSG_DELETE_SETUP_INFO Deleting the install information and logs...
SW_PERFORM_MSG_WRITE_LOG Writing a setup log...
SW_PERFORM_MSG_COPY_ERROR Copying to the file "%s" failed.
-SW_PERFORM_MSG_CRAETE_LINK_ERROR Creating the shortcut file "%s" failed.\r\n\r\nDo you want to retry?
+SW_PERFORM_MSG_CREATE_LINK_ERROR Creating the shortcut file "%s" failed.\r\n\r\nDo you want to retry?
SW_PERFORM_MSG_WRITE_LOG_ERROR Creating the setup log file "%s".\r\n\r\nDo you want to retry?
SW_PERFORM_MSG_STOP_SVC_ERROR Stopping the "%s" service (internal name: "%S") failed.
SW_PERFORM_MSG_START_SVC_ERROR Starting the "%s" service (internal name: "%S") failed.
diff --git a/src/bin/hamcore/strtable_ja.stb b/src/bin/hamcore/strtable_ja.stb
index 3875aaa0..9cf97b39 100644
--- a/src/bin/hamcore/strtable_ja.stb
+++ b/src/bin/hamcore/strtable_ja.stb
@@ -18,7 +18,7 @@ DEFAULT_FONT MS UI Gothic
DEFAULT_FONT_HIGHDPI Meiryo UI
DEFAULT_FONT_2 MS Gothic
DEFAULT_FONT_SIZE 9
-DEFAULE_LOCALE 年 月 日 時 分 秒 日 月 火 水 木 金 土 日 時間 分 秒 (なし)
+DEFAULT_LOCALE 年 月 日 時 分 秒 日 月 火 水 木 金 土 日 時間 分 秒 (なし)
# 言語
@@ -579,7 +579,7 @@ HUB_AO_SecureNAT_RandomizeAssignIp この項目が 1 (有効) の場合は、S
HUB_AO_DetectDormantSessionInterval この項目が 0 以外の場合は、指定された秒数無通信であった VPN セッションをドーマント状態 (休止状態) として識別します。ドーマント状態の VPN セッションに対しては、仮想 HUB 内でフラッディングされるべきパケットがフラッディングされなくなります。
HUB_AO_NoPhysicalIPOnPacketLog この項目が 1 (有効) の場合は、パケットログに送信元および宛先 VPN セッションの物理的な接続元 VPN クライアントの IP アドレスが記録されないようになります。
HUB_AO_UseHubNameAsDhcpUserClassOption この項目が 1 (有効) の場合は、仮想 HUB は DHCP サーバーに対して IP アドレスの取得を要求する際に仮想 HUB 名を DHCP パケットの "User-Class" オプションに埋め込むようになります。この機能は、複数の仮想 HUB がある場合に、DHCP サーバーがそれぞれの仮想 HUB 用に IP プールを確保する場合に便利です。(L2TP/IPsec および OpenVPN セッションのみ対応。)
-HUB_AO_UseHubNameAsRadiusNasId この項目が 1 (有効) の場合は、NAS-Identidier RADIUS 属性に仮想 HUB 名が埋め込まれます。この機能は、RADIUS サーバにおいて仮想 HUB ごとにアクセスの許可 / 拒否を設定したい場合に便利です。
+HUB_AO_UseHubNameAsRadiusNasId この項目が 1 (有効) の場合は、NAS-Identifier RADIUS 属性に仮想 HUB 名が埋め込まれます。この機能は、RADIUS サーバにおいて仮想 HUB ごとにアクセスの許可 / 拒否を設定したい場合に便利です。
# Caps 関係
@@ -1211,7 +1211,7 @@ CM_EDIT_HUB_2 %S のプロパティ
CM_EDIT_HUB_STANDALONE 現在、サーバーはスタンドアロンモードで動作しています。この仮想 HUB はスタンドアロン HUB として動作します。
CM_EDIT_HUB_TYPE_FIXED 現在、サーバーはクラスタモードで動作しています。この仮想 HUB の種類は下記のとおりで、動的な変更はできません。
-CM_EDIT_HUB_CREATER 新しい仮想 HUB %S を作成しました。
+CM_EDIT_HUB_CREATED 新しい仮想 HUB %S を作成しました。
CM_OFFLINE_MSG %s をオフラインにしますか?\r\n\r\n仮想 HUB をオフラインにすると、現在仮想 HUB に接続しているすべてのセッションが切断され、新しいセッションが接続できなくなります。
CM_DELETE_HUB_MSG %S を削除しますか?\r\n\r\n仮想 HUB を削除すると、現在仮想 HUB に接続しているセッションがすべて切断され、新たなセッションが仮想 HUB に接続できなくなります。\r\nまた、仮想 HUB のすべての設定、ユーザー オブジェクト、グループオブジェクト、証明書、およびカスケード接続が削除されます。\r\n\r\n仮想 HUB を削除すると、元に戻すことはできません。\r\n削除しますか?
CM_HUB_DELETED_MSG 仮想 HUB %S を削除しました。
@@ -1367,7 +1367,7 @@ SM_EDIT_USER_POL_DLG ユーザー %S のセキュリティポリシー
SM_POLICY_DEF_CAPTION セキュリティポリシー
SM_LIMIT_STR %u ～ %u の範囲の整数値を指定してください。
SM_POLICY_INIT_TITLE 左のリストからポリシー項目を選択してください。
-SM_USER_CREEATE_OK ユーザー %S を作成しました。
+SM_USER_CREATE_OK ユーザー %S を作成しました。
SM_USERINFO_CAPTION ユーザー "%S" の情報
SM_USERINFO_NAME ユーザー名
SM_USERINFO_GROUP グループ名
@@ -3218,7 +3218,7 @@ IDCANCEL 閉じる(&X)
PREFIX D_EM_ADD
STATIC1 キャプチャに使用する LAN カード名(&L):
-R_PROMISCUS キャプチャの際にプロミスキャスモードを使用しない(&N)
+R_PROMISCUOUS キャプチャの際にプロミスキャスモードを使用しない(&N)
STATIC2 パケットログ(&P):
S_PACKET ログファイルの切り替え周期(&W):
S_PACKET_0 TCP コネクションログ:
@@ -4066,7 +4066,7 @@ CAPTION アップデート通知の設定
S_INFO %s の新しいバージョンがリリースされていないかどうか定期的にチェックし、リリースされていた場合は通知画面を表示します。\r\n\r\nアップデートチェックのために日本の茨城県つくば市に設置されている SoftEther Update サーバーとの間で HTTPS 通信を行います。お客様の個人情報が送信されることはありません。
S_TITLE %s のアップデートチェックと通知の設定
S_ENABLE アップデートチェックを有効にする(&E)
-S_DISBLE アップデートチェックを無効にする(&D)
+S_DISABLE アップデートチェックを無効にする(&D)
IDCANCEL 閉じる(&C)
@@ -4297,13 +4297,13 @@ CON_INFILE_START ファイル "%s" に記述されているコマンドを、
CON_OUTFILE_START 画面に出力されたメッセージは、ファイル "%s" にも保存されます。
CON_USER_CANCEL [EOF]
CON_UNKNOWN_CMD "%S": コマンドが見つかりません。\nHELP コマンドで使用できるコマンド一覧を表示できます。
-CON_AMBIGIOUS_CMD "%S": コマンドが曖昧です。
-CON_AMBIGIOUS_CMD_1 指定されたコマンド名は、次の複数のコマンドに一致します:
-CON_AMBIGIOUS_CMD_2 より厳密にコマンド名を指定し直してください。
+CON_AMBIGUOUS_CMD "%S": コマンドが曖昧です。
+CON_AMBIGUOUS_CMD_1 指定されたコマンド名は、次の複数のコマンドに一致します:
+CON_AMBIGUOUS_CMD_2 より厳密にコマンド名を指定し直してください。
CON_INVALID_PARAM パラメータ "/%S" が指定されています。コマンド "%S" ではそのようなパラメータは指定できません。詳しくは "%S /HELP" と入力して使用できるパラメータ一覧を確認してください。
-CON_AMBIGIOUS_PARAM "/%S": パラメータ名が曖昧です。
-CON_AMBIGIOUS_PARAM_1 指定されたパラメータ名は、コマンド "%S" のパラメータとして指定可能な次の複数のパラメータに一致します:
-CON_AMBIGIOUS_PARAM_2 より厳密にパラメータ名を指定し直してください。
+CON_AMBIGUOUS_PARAM "/%S": パラメータ名が曖昧です。
+CON_AMBIGUOUS_PARAM_1 指定されたパラメータ名は、コマンド "%S" のパラメータとして指定可能な次の複数のパラメータに一致します:
+CON_AMBIGUOUS_PARAM_2 より厳密にパラメータ名を指定し直してください。
# 不明なコマンド
@@ -4326,7 +4326,7 @@ CMD_HELP_DESCRIPTION [目的]
CMD_HELP_USAGE [使用方法]
CMD_HELP_HELP [説明]
CMD_HELP_ARGS [パラメータ]
-CMD_PROPMT_PORT ポート番号を入力してください :
+CMD_PROMPT_PORT ポート番号を入力してください :
CMD_EVAL_PORT ポート番号が不正です。ポート番号は 1 以上 65535 以下で指定してください。
CMD_CT_STD_COLUMN_1 項目
CMD_CT_STD_COLUMN_2 値
@@ -5385,7 +5385,7 @@ CMD_CascadePolicySet_VALUE ポリシーの新しい値を指定します。そ
CMD_CascadePolicySet_PROMPT_POLNAME 値を変更するポリシーの名前:
CMD_CascadePolicySet_PROMPT_POLVALUE 新しく設定する値:
CMD_CascadePolicySet_Invalid_Name 指定されたポリシー名 "%S" は不正です。\nPolicyList コマンドで設定できるポリシー名の一覧を確認してください。
-CMD_CascadePolicySet_Invalid_Name_For_Cadcade 指定されたポリシー名 "%S" はカスケード接続のセキュリティポリシー設定では使用できません。
+CMD_CascadePolicySet_Invalid_Name_For_Cascade 指定されたポリシー名 "%S" はカスケード接続のセキュリティポリシー設定では使用できません。
CMD_CascadePolicySet_Invalid_Range ポリシー "%S" は %s の範囲で指定してください。
@@ -6746,7 +6746,7 @@ CMD_AccountRetrySet_[name] 設定を変更する接続設定の名前を指定
CMD_AccountRetrySet_NUM 連続して再接続を行う回数を指定します。"999" と指定すると、無限に再接続を試行します (常時接続)。0 を指定すると再接続を行いません。
CMD_AccountRetrySet_INTERVAL 再接続を行う場合、前回接続が切断または接続失敗してから、何秒後に再接続処理を開始するかを設定します。
CMD_AccountRetrySet_PROMPT_NUM 再接続回数 ("999" で無限):
-CMD_AccountRetrySet_PROMPY_INTERVAL 再接続間隔 (秒):
+CMD_AccountRetrySet_PROMPT_INTERVAL 再接続間隔 (秒):
CMD_AccountRetrySet_EVAL_INTERVAL 再接続間隔は 5 秒以上で指定してください。
@@ -7077,7 +7077,7 @@ SW_PERFORM_MSG_IMPORTING_ACCOUNT 簡易インストーラに内蔵されてい
SW_PERFORM_MSG_DELETE_SETUP_INFO インストール情報およびログを削除中...
SW_PERFORM_MSG_WRITE_LOG セットアップログを書き出しています...
SW_PERFORM_MSG_COPY_ERROR ファイル "%s" へのコピーに失敗しました。
-SW_PERFORM_MSG_CRAETE_LINK_ERROR ショートカットファイル "%s" の作成に失敗しました。\r\n\r\n再試行しますか?
+SW_PERFORM_MSG_CREATE_LINK_ERROR ショートカットファイル "%s" の作成に失敗しました。\r\n\r\n再試行しますか?
SW_PERFORM_MSG_WRITE_LOG_ERROR セットアップログファイル "%s" の作成に失敗しました。\r\n\r\n再試行しますか?
SW_PERFORM_MSG_STOP_SVC_ERROR サービス 「%s」 (内部名: "%S") の停止に失敗しました。
SW_PERFORM_MSG_START_SVC_ERROR サービス 「%s」 (内部名: "%S") の開始に失敗しました。
diff --git a/src/bin/hamcore/strtable_ko.stb b/src/bin/hamcore/strtable_ko.stb
index 881f7da5..40125158 100644
--- a/src/bin/hamcore/strtable_ko.stb
+++ b/src/bin/hamcore/strtable_ko.stb
@@ -22,7 +22,7 @@ DEFAULT_FONT Gulim
DEFAULT_FONT_WIN7 Malgun Gothic
DEFAULT_FONT_2 Gulim
DEFAULT_FONT_SIZE 9
-DEFAULE_LOCALE 년 월 일 분 초 일 월 화 수 목 금 토 일 시 분 초 (없음)
+DEFAULT_LOCALE 년 월 일 분 초 일 월 화 수 목 금 토 일 시 분 초 (없음)
# 언어
@@ -1212,7 +1212,7 @@ CM_EDIT_HUB_2 %S의 속성
CM_EDIT_HUB_STANDALONE 현재 서버는 독립형 모드에서 작동하고 있습니다. 이 가상 HUB는 독립형 HUB 역할을합니다.
CM_EDIT_HUB_TYPE_FIXED 현재 서버가 클러스터 모드로 실행하고 있습니다. 이 가상 HUB의 종류는 다음과 같습니다 동적 변경은 할 수 없습니다.
-CM_EDIT_HUB_CREATER 새로운 가상 HUB %S를 만들었습니다.
+CM_EDIT_HUB_CREATED 새로운 가상 HUB %S를 만들었습니다.
CM_OFFLINE_MSG %s를 오프라인 하시겠습니까? \r\n\r\n 가상 HUB를 오프라인으로하면 현재 가상 HUB에 연결되어있는 모든 세션이 끊어지고 새로운 세션이 연결할 수 없습니다.
CM_DELETE_HUB_MSG %S를 삭제 하시겠습니까? \r\n\r\n 가상 HUB를 제거하면 현재 가상 HUB에 연결되어있는 세션이 끊어지고 새로운 세션이 가상 HUB에 연결할 수 없습니다. \r\n 또한 가상 HUB의 모든 설정 사용자 개체, 그룹 개체, 인증서 및 계단식가 삭제됩니다. \r\n\r\n 가상 HUB를 삭제하면 되돌릴 수 없습니다. \r\n 삭제 하시겠습니까?
CM_HUB_DELETED_MSG 가상 HUB %S를 제거했습니다.
@@ -1368,7 +1368,7 @@ SM_EDIT_USER_POL_DLG 사용자 %S의 보안 정책
SM_POLICY_DEF_CAPTION 보안 정책
SM_LIMIT_STR %u~%u의 범위의 정수 값을 지정하십시오.
SM_POLICY_INIT_TITLE 왼쪽 목록에서 정책 항목을 선택하십시오.
-SM_USER_CREEATE_OK 사용자 %S를 만들었습니다.
+SM_USER_CREATE_OK 사용자 %S를 만들었습니다.
SM_USERINFO_CAPTION 사용자 "%S"의 정보
SM_USERINFO_NAME 사용자 이름
SM_USERINFO_GROUP 그룹 이름
@@ -3214,7 +3214,7 @@ IDCANCEL 닫기 (&X)
PREFIX D_EM_ADD
STATIC1 캡처에 사용하는 LAN 카드 이름 (&L):
-R_PROMISCUS 캡처로 인해 무차별 모드를 사용 안함 (&N)
+R_PROMISCUOUS 캡처로 인해 무차별 모드를 사용 안함 (&N)
STATIC2 패킷 로그 (&P):
S_PACKET 로그 파일 전환주기 (&W):
S_PACKET_0 TCP 연결 로그:
@@ -4062,7 +4062,7 @@ CAPTION 업데이트 알림 설정
S_INFO %s의 새 버전이 출시되지 않았는지 정기적으로 확인하고 분리되어 있던 경우는 통지 화면을 표시합니다. \r\n\r\n 업데이트 확인을 위해 일본의 이바라키 현 츠쿠바시에 설치되어있는 SoftEther Update 서버 사이에 HTTPS 통신을합니다. 고객의 개인 정보가 전송되는 것은 아닙니다.
S_TITLE %s 업데이트 확인 및 알림 설정
S_ENABLE 업데이트 확인을 활성화 (&E)
-S_DISBLE 업데이트 확인을 비활성화 (&D)
+S_DISABLE 업데이트 확인을 비활성화 (&D)
IDCANCEL 닫기 (&C)
@@ -4293,13 +4293,13 @@ CON_INFILE_START 파일 "%s"에 설명 된 명령을 키보드 입력 대신 사
CON_OUTFILE_START 화면에 출력 된 메시지 파일 "%s"에 저장됩니다.
CON_USER_CANCEL [EOF]
CON_UNKNOWN_CMD "%S": 명령을 찾을 수 없습니다. \nHELP 명령에서 사용할 수있는 명령 목록을 볼 수 있습니다.
-CON_AMBIGIOUS_CMD "%S": 명령이 모호합니다.
-CON_AMBIGIOUS_CMD_1 지정된 명령 이름 다음의 여러 명령과 일치합니다:
-CON_AMBIGIOUS_CMD_2 보다 엄격하게 명령 이름을 지정하고 다시 시도하십시오.
+CON_AMBIGUOUS_CMD "%S": 명령이 모호합니다.
+CON_AMBIGUOUS_CMD_1 지정된 명령 이름 다음의 여러 명령과 일치합니다:
+CON_AMBIGUOUS_CMD_2 보다 엄격하게 명령 이름을 지정하고 다시 시도하십시오.
CON_INVALID_PARAM 매개 변수 "/%S"가 지정되어 있습니다. 명령 "%S"는 이러한 매개 변수는 지정할 수 없습니다. 자세한 내용은 "%S/HELP"를 입력하여 사용할 수있는 매개 변수 목록을 확인하십시오.
-CON_AMBIGIOUS_PARAM "/%S": 매개 변수 이름이 모호합니다.
-CON_AMBIGIOUS_PARAM_1 지정된 매개 변수 이름은 명령 "%S"매개 변수로 지정할 수있는 다음의 여러 매개 변수와 일치합니다:
-CON_AMBIGIOUS_PARAM_2 보다 엄격하게 매개 변수 이름을 지정하고 다시 시도하십시오.
+CON_AMBIGUOUS_PARAM "/%S": 매개 변수 이름이 모호합니다.
+CON_AMBIGUOUS_PARAM_1 지정된 매개 변수 이름은 명령 "%S"매개 변수로 지정할 수있는 다음의 여러 매개 변수와 일치합니다:
+CON_AMBIGUOUS_PARAM_2 보다 엄격하게 매개 변수 이름을 지정하고 다시 시도하십시오.
# 알 수없는 명령
@@ -4322,7 +4322,7 @@ CMD_HELP_DESCRIPTION [목적]
CMD_HELP_USAGE [사용 방법]
CMD_HELP_HELP 설명
CMD_HELP_ARGS [매개 변수]
-CMD_PROPMT_PORT 포트 번호를 입력하십시오:
+CMD_PROMPT_PORT 포트 번호를 입력하십시오:
CMD_EVAL_PORT 포트 번호가 잘못되었습니다. 포트 번호는 1 이상 65535 이하로 지정하십시오.
CMD_CT_STD_COLUMN_1 항목
CMD_CT_STD_COLUMN_2 값
@@ -5381,7 +5381,7 @@ CMD_CascadePolicySet_VALUE 정책의 새 값을 지정합니다. 그 정책이
CMD_CascadePolicySet_PROMPT_POLNAME 값을 변경하는 정책의 이름:
CMD_CascadePolicySet_PROMPT_POLVALUE 새롭게 설정 값:
CMD_CascadePolicySet_Invalid_Name 지정된 정책 이름 "%S"는 부정합니다. \nPolicyList 명령으로 설정할 수있는 정책 이름 목록을 확인하십시오.
-CMD_CascadePolicySet_Invalid_Name_For_Cadcade 지정된 정책 이름 "%S"는 계단식의 보안 정책 설정을 사용할 수 없습니다.
+CMD_CascadePolicySet_Invalid_Name_For_Cascade 지정된 정책 이름 "%S"는 계단식의 보안 정책 설정을 사용할 수 없습니다.
CMD_CascadePolicySet_Invalid_Range 정책 "%S"%s의 범위에서 지정하십시오.
@@ -6740,7 +6740,7 @@ CMD_AccountRetrySet_ [name] 설정을 변경하려면 연결 설정의 이름을
CMD_AccountRetrySet_NUM 계속해서 다시 연결하는 횟수를 지정합니다. "999"로 지정하면 무한 재 연결을 시도합니다 (상시 접속). 0을 지정하면 다시 연결을하지 않습니다.
CMD_AccountRetrySet_INTERVAL 다시 연결을 할 경우 마지막으로 연결이 끊기거나 연결 실패 후 몇 초 후에 다시 연결 처리를 시작할지 여부를 설정합니다.
CMD_AccountRetrySet_PROMPT_NUM 다시 연결 횟수 ( "999"무한):
-CMD_AccountRetrySet_PROMPY_INTERVAL 다시 연결 간격 (초):
+CMD_AccountRetrySet_PROMPT_INTERVAL 다시 연결 간격 (초):
CMD_AccountRetrySet_EVAL_INTERVAL 다시 연결 간격은 5 초 이상이어야합니다.
@@ -7070,7 +7070,7 @@ SW_PERFORM_MSG_IMPORTING_ACCOUNT 간이 설치 프로그램에 내장되어있
SW_PERFORM_MSG_DELETE_SETUP_INFO 설치 정보 및 로그 삭제 중...
SW_PERFORM_MSG_WRITE_LOG 설치 로그를 내보낼 수 있습니다...
SW_PERFORM_MSG_COPY_ERROR 파일 "%s"에 복사에 실패했습니다.
-SW_PERFORM_MSG_CRAETE_LINK_ERROR 바로 가기 파일 "%s"의 작성에 실패했습니다. \r\n\r\n 다시 시도 하시겠습니까?
+SW_PERFORM_MSG_CREATE_LINK_ERROR 바로 가기 파일 "%s"의 작성에 실패했습니다. \r\n\r\n 다시 시도 하시겠습니까?
SW_PERFORM_MSG_WRITE_LOG_ERROR 설치 로그 파일 "%s"의 작성에 실패했습니다. \r\n\r\n 다시 시도 하시겠습니까?
SW_PERFORM_MSG_STOP_SVC_ERROR 서비스 '%s'(내부 이름:"%S") 중지에 실패했습니다.
SW_PERFORM_MSG_START_SVC_ERROR 서비스 '%s'(내부 이름:"%S")의 시작에 실패했습니다.
diff --git a/src/bin/hamcore/strtable_tw.stb b/src/bin/hamcore/strtable_tw.stb
index 3ea1364b..cc695091 100644
--- a/src/bin/hamcore/strtable_tw.stb
+++ b/src/bin/hamcore/strtable_tw.stb
@@ -24,7 +24,7 @@ DEFAULT_FONT MingLiU
DEFAULT_FONT_HIGHDPI Microsoft JhengHei
DEFAULT_FONT_2 Microsoft JhengHei
DEFAULT_FONT_SIZE 9
-DEFAULE_LOCALE 年 月 日 點 分 秒 星期日 星期一 星期二 星期三 星期四 星期五 星期六 天 小時 分 秒 (無)
+DEFAULT_LOCALE 年 月 日 點 分 秒 星期日 星期一 星期二 星期三 星期四 星期五 星期六 天 小時 分 秒 (無)
# 語言
@@ -567,7 +567,7 @@ HUB_AO_SecureNAT_RandomizeAssignIp If you set this option to non-zero value, t
HUB_AO_DetectDormantSessionInterval If you set this option to non-zero value, then the Virtual Hub will treat the VPN sessions, which have transmitted no packets for the last specified intervals (in seconds), as Dormant Sessions. The Virtual Hub will not flood packets, which should be flood, to any Dormant Sessions.
HUB_AO_NoPhysicalIPOnPacketLog If you set this option to non-zero value, then the physical IP addresses of VPN clients of either the source VPN session or the destination VPN session will not be recorded on the packet log file.
HUB_AO_UseHubNameAsDhcpUserClassOption If you set this option to non-zero value, then the Virtual Hub Name will be added to a DHCP request to an external DHCP server as the "User-Class" option. This allows to use separate pools of IP addresses for each Virtual Hub. (For only L2TP/IPsec and OpenVPN sessions.)
-HUB_AO_UseHubNameAsRadiusNasId If you set this option to non-zero value, then the NAS-Identidier RADIUS attribute will be set to a name of the Virtual Hub. This allows to determine on RADIUS server whether access to the Virtual Hub should be granted or denied.
+HUB_AO_UseHubNameAsRadiusNasId If you set this option to non-zero value, then the NAS-Identifier RADIUS attribute will be set to a name of the Virtual Hub. This allows to determine on RADIUS server whether access to the Virtual Hub should be granted or denied.
#關於失敗連接對話方塊
@@ -1220,7 +1220,7 @@ CM_EDIT_HUB_2 %S 的屬性
CM_EDIT_HUB_STANDALONE 當前，伺服器正以獨立模式運行。而該虛擬 HUB 作為一個獨立的 HUB 運行。
CM_EDIT_HUB_TYPE_FIXED 當前，伺服器正以群集模式運行。如果虛擬 HUB 處於這種模式，動態變化將無法進行。
-CM_EDIT_HUB_CREATER 一個新的虛擬 HUB "%S" 已經建立
+CM_EDIT_HUB_CREATED 一個新的虛擬 HUB "%S" 已經建立
CM_OFFLINE_MSG 你想切換 "%s" 到離線狀態?\r\n\r\n如果您切換虛擬 HUB 至離線狀態，當前連接到虛擬 HUB 上的所有會話將無法連接。
CM_DELETE_HUB_MSG 你想刪除"%S"嗎?\r\n\r\n如果你刪除虛擬 HUB，當前連接到虛擬 HUB 的所有會話將被斷開，新的會話將無法連接。\r\n這還將刪除所有 HUB 設置，使用者物件，組物件，證書和級聯連接。\r\n\r\n一旦你將虛擬 HUB 刪除，將無法恢復。\r\n你確定要刪除嗎?
CM_HUB_DELETED_MSG 虛擬 HUB "%S" 被刪除。
@@ -1376,7 +1376,7 @@ SM_EDIT_USER_POL_DLG 用戶 %S 的安全性原則
SM_POLICY_DEF_CAPTION 安全性原則
SM_LIMIT_STR 指定一個在 %u 與 %u 之間的整數。
SM_POLICY_INIT_TITLE 從左邊的列表中選擇一個策略項目。
-SM_USER_CREEATE_OK 用戶 %S 已創建。
+SM_USER_CREATE_OK 用戶 %S 已創建。
SM_USERINFO_CAPTION 使用者 "%S" 的資訊
SM_USERINFO_NAME 用戶名
SM_USERINFO_GROUP 組名
@@ -2090,8 +2090,8 @@ LC_SET_PASSWORD 連接到用戶端服務的密碼設置已變更。
LC_TAP_NOT_FOUND 無法找到 tun/tap 的 Mac OS X 驅動。請安裝 tun/tap 驅動。
#(刪除日誌)
-LE_START 正在監控目錄 "%S"。如果可用磁碟空間變得小於 %S，此目錄和其子目錄下的日誌檔和設定檔的備份檔案將按照從舊到新的順序被自動刪除。決定何時開始刪除的可用磁碟空間大小，可以在設定檔的“AutoDeletCheckDiskFreeSpaceMin”項目中修改。
-LE_DELETE 可用磁碟空間已小於 %S，因此舊檔 "%S" 被自動刪除。決定何時開始刪除的可用磁碟空間大小，可以在設定檔的“AutoDeletCheckDiskFreeSpaceMin”項目中修改。
+LE_START 正在監控目錄 "%S"。如果可用磁碟空間變得小於 %S，此目錄和其子目錄下的日誌檔和設定檔的備份檔案將按照從舊到新的順序被自動刪除。決定何時開始刪除的可用磁碟空間大小，可以在設定檔的“AutoDeleteCheckDiskFreeSpaceMin”項目中修改。
+LE_DELETE 可用磁碟空間已小於 %S，因此舊檔 "%S" 被自動刪除。決定何時開始刪除的可用磁碟空間大小，可以在設定檔的“AutoDeleteCheckDiskFreeSpaceMin”項目中修改。
LE_NOT_ENOUGH_FREE <<警告>> 如果可用磁碟空間小於 %S，將不能自動刪除日誌檔和設定檔的舊備份檔案。我們建議您即刻從次電腦上手動刪除不必要的檔來恢復可用磁碟空間。當可用磁碟空間過小時，電腦運行將被變得不穩定。
# (三層交換機日誌)
@@ -3230,7 +3230,7 @@ IDCANCEL 關閉(&X)
PREFIX D_EM_ADD
STATIC1 用於捕獲的網路介面卡名稱(&L):
-R_PROMISCUS 捕獲時不要使用混雜模式(&N)
+R_PROMISCUOUS 捕獲時不要使用混雜模式(&N)
STATIC2 封包日誌 (&P) :
S_PACKET 日誌檔切換週期 (&W) :
S_PACKET_0 TCP 連接日誌:
@@ -4075,7 +4075,7 @@ CAPTION 更新提醒設定
S_INFO 當新版本將要發佈時，請定期查詢 %s 的新版本和彈出提示窗口。\r\n\r\nHTTPS 封包將會用在本電腦和位於日本筑波的 SoftEther 升級伺服器之間，用於查詢有無升級資訊。個人資訊不會外泄。
S_TITLE %s 升級以及提示設置
S_ENABLE 啟用更新提醒(&E)
-S_DISBLE 停用更新提醒(&D)
+S_DISABLE 停用更新提醒(&D)
IDCANCEL 關閉(&C)
@@ -4309,13 +4309,13 @@ CON_INFILE_START 在檔 "%s" 中寫入命令將被使用代替鍵盤輸入。
CON_OUTFILE_START 該消息輸出到控制台將被保存在檔 "%s"。
CON_USER_CANCEL [EOF]
CON_UNKNOWN_CMD "%S": 命令未找到。\n您可以使用 "HELP" 命令來查看一個可用的命令列表。
-CON_AMBIGIOUS_CMD "%S": 命令名稱是模糊的。
-CON_AMBIGIOUS_CMD_1 指定的命令名稱匹配以下多個命令:
-CON_AMBIGIOUS_CMD_2 請更嚴格地重新指定命令名稱。
+CON_AMBIGUOUS_CMD "%S": 命令名稱是模糊的。
+CON_AMBIGUOUS_CMD_1 指定的命令名稱匹配以下多個命令:
+CON_AMBIGUOUS_CMD_2 請更嚴格地重新指定命令名稱。
CON_INVALID_PARAM 參數 "/%S" 已被指定。使用命令 "%S" 時，不可能指定此參數。輸入 "%S /HELP" 來看被使用的參數清單。
-CON_AMBIGIOUS_PARAM "/%S": 參數名稱是不明確的。
-CON_AMBIGIOUS_PARAM_1 指定的參數名稱符合以下，被指定的做為命令 "%S" 參數的參數:
-CON_AMBIGIOUS_PARAM_2 請更嚴格地重新指定參數名稱。
+CON_AMBIGUOUS_PARAM "/%S": 參數名稱是不明確的。
+CON_AMBIGUOUS_PARAM_1 指定的參數名稱符合以下，被指定的做為命令 "%S" 參數的參數:
+CON_AMBIGUOUS_PARAM_2 請更嚴格地重新指定參數名稱。
# 不明命令
@@ -4338,7 +4338,7 @@ CMD_HELP_DESCRIPTION [目的]
CMD_HELP_USAGE [使用方法]
CMD_HELP_HELP [說明]
CMD_HELP_ARGS [參數]
-CMD_PROPMT_PORT 輸入埠號:
+CMD_PROMPT_PORT 輸入埠號:
CMD_EVAL_PORT 埠號無效。指定一個範圍是 1 到 65535 的埠號。
CMD_CT_STD_COLUMN_1 項目
CMD_CT_STD_COLUMN_2 價值
@@ -5401,7 +5401,7 @@ CMD_CascadePolicySet_VALUE 設定協定的新值，如果協議是數值，請
CMD_CascadePolicySet_PROMPT_POLNAME 更改值得協定的名稱:
CMD_CascadePolicySet_PROMPT_POLVALUE 設置新值:
CMD_CascadePolicySet_Invalid_Name 指定的協定名稱 "%S" 是無效的。\n請運行 PolicyList 命令，您可以獲取設置協定的清單。
-CMD_CascadePolicySet_Invalid_Name_For_Cadcade 指定協議 "%S" 在設置級聯的安全協議時不可用。
+CMD_CascadePolicySet_Invalid_Name_For_Cascade 指定協議 "%S" 在設置級聯的安全協議時不可用。
CMD_CascadePolicySet_Invalid_Range 協議 "%S" 請在 %s 範圍內選定。
@@ -6755,7 +6755,7 @@ CMD_AccountRetrySet_[name] 指定要更改設置的連接設置名。
CMD_AccountRetrySet_NUM 指定連續進行重新連接的次數。 如指定 "999"，重試次數為無限次 (永久連接)。如指定 "0"，不進行重新連接。
CMD_AccountRetrySet_INTERVAL 重新進行連接時，設置距離上次斷開或連接失敗後需多少秒開始重新連接處理。
CMD_AccountRetrySet_PROMPT_NUM 重新連接次數 ("999" 為無限次):
-CMD_AccountRetrySet_PROMPY_INTERVAL 重新連接間隔 (秒):
+CMD_AccountRetrySet_PROMPT_INTERVAL 重新連接間隔 (秒):
CMD_AccountRetrySet_EVAL_INTERVAL 請指定 5 秒以上的重新連接間隔。
@@ -7082,7 +7082,7 @@ SW_PERFORM_MSG_IMPORTING_ACCOUNT 在簡單安裝工具中的導入嵌入的 VPN
SW_PERFORM_MSG_DELETE_SETUP_INFO 刪除安裝資訊和日誌...
SW_PERFORM_MSG_WRITE_LOG 寫入設置日誌...
SW_PERFORM_MSG_COPY_ERROR 複製檔 "%s" 失敗。
-SW_PERFORM_MSG_CRAETE_LINK_ERROR 創建快捷方式檔 "%s" 失敗。\r\n\r\n您要重試嗎？
+SW_PERFORM_MSG_CREATE_LINK_ERROR 創建快捷方式檔 "%s" 失敗。\r\n\r\n您要重試嗎？
SW_PERFORM_MSG_WRITE_LOG_ERROR 安裝日誌檔 "%s" 創建中。\r\n\r\n您要重試嗎？
SW_PERFORM_MSG_STOP_SVC_ERROR 關閉 "%s" 服務(內部名: "%S")失敗。
SW_PERFORM_MSG_START_SVC_ERROR 開啟 "%s" 服務(內部名: "%S")失敗。
diff --git a/src/bin/hamcore/vpnweb_sample_cn.htm b/src/bin/hamcore/vpnweb_sample_cn.htm
index 73390e37..54ee20a2 100644
--- a/src/bin/hamcore/vpnweb_sample_cn.htm
+++ b/src/bin/hamcore/vpnweb_sample_cn.htm
@@ -33,7 +33,7 @@ To create a Web Installer using "SoftEther VPN Client Web Installer", please ref
To create a web page which boot the VPN Client Web Installer, insert HTML codes as the above. The HTML code refers the path of the ActiveX control, and the parameters which will be passed to the ActiveX.
You have to modify the strings which are emphasized in green fonts above according to the environment of the web server which you deploy on.
-(Notice that the above sample won't work staying in the ogriginal code, because the original sample specifies the example URLs.)
+(Notice that the above sample won't work staying in the original code, because the original sample specifies the example URLs.)
diff --git a/src/bin/hamcore/vpnweb_sample_en.htm b/src/bin/hamcore/vpnweb_sample_en.htm
index 73390e37..54ee20a2 100644
--- a/src/bin/hamcore/vpnweb_sample_en.htm
+++ b/src/bin/hamcore/vpnweb_sample_en.htm
@@ -33,7 +33,7 @@ To create a Web Installer using "SoftEther VPN Client Web Installer", please ref
To create a web page which boot the VPN Client Web Installer, insert HTML codes as the above. The HTML code refers the path of the ActiveX control, and the parameters which will be passed to the ActiveX.
You have to modify the strings which are emphasized in green fonts above according to the environment of the web server which you deploy on.
-(Notice that the above sample won't work staying in the ogriginal code, because the original sample specifies the example URLs.)
+(Notice that the above sample won't work staying in the original code, because the original sample specifies the example URLs.)
diff --git a/src/bin/hamcore/vpnweb_sample_tw.htm b/src/bin/hamcore/vpnweb_sample_tw.htm
index 9b43ffd3..26f6e0f7 100644
--- a/src/bin/hamcore/vpnweb_sample_tw.htm
+++ b/src/bin/hamcore/vpnweb_sample_tw.htm
@@ -33,7 +33,7 @@ To create a Web Installer using "SoftEther VPN Client Web Installer", please ref
To create a web page which boot the VPN Client Web Installer, insert HTML codes as the above. The HTML code refers the path of the ActiveX control, and the parameters which will be passed to the ActiveX.
You have to modify the strings which are emphasized in green fonts above according to the environment of the web server which you deploy on.
-(Notice that the above sample won't work staying in the ogriginal code, because the original sample specifies the example URLs.)
+(Notice that the above sample won't work staying in the original code, because the original sample specifies the example URLs.)
diff --git a/src/bin/hamcore/warning_cn.txt b/src/bin/hamcore/warning_cn.txt
index 40372b81..8425c3fa 100644
--- a/src/bin/hamcore/warning_cn.txt
+++ b/src/bin/hamcore/warning_cn.txt
@@ -17,7 +17,7 @@ SoftEther VPN 可以进行 VPN 通信。不同于传统的 VPN 协议， SoftEth
如果你想在 SoftEther VPN 客户端 / 网桥和 SoftEther VPN 服务器之间建立一个 VPN 连接，但如果 TCP 和 UDP 数据包被防火墙禁止通过，那么你可以把有效载荷封装进 "ICMP" (被称为 Ping) 或 "DNS" 数据包。通过使用 ICMP 或 DNS ，即使防火墙或路由器阻止每个 TCP 或 UDP 连接，此功能可以实现 VPN 连接。VPN over ICMP/ VPN over DNS 功能尽可能的设计符合标准 ICMP 和 DNS 规范，但有时也不完全符合他们的行为。因此，一些劣质路由器可能会导致内存溢出或当有很多 ICMP 或 DNS 数据包通过时产生麻烦，这种路由器有时死机或重新启动。它可能会影响在同一网络上的其他用户。为了避免这样的风险，在 VPN 客户端指定的目标主机名上附加后缀 "/tcp" ，禁用 VPN over ICMP / DNS 功能。
1.5. VPN Azure 云服务
-如果您的 SoftEther VPN 服务器放置在 NAT 或防火墙后面，由于某种原因，你不能使用 NAT 穿透功能、动态 DNS 功能或 VPN over ICMP/DNS 功能，您可以使用 VPN Azure Clouse 服务。 SoftEther 公司在互联网上运行 VPN Azure 云。VPN 服务器连接到 VPN Azure 云，主机名 "abc.vpnazure.net" ( "abc" 是一个唯一的主机名) 通过 VPN Azure 云可以被指定连接到 VPN 服务器。实际上，这样的一个主机名指向一个由 SoftEther 公司所操作的云服务器的全球 IP 地址。如果一个 VPN 客户端连接到一个 VPN Azure 主机，那么 VPN Azure 主机转播在 VPN 客户端和 VPN 服务器之间的所有流量。VPN Azure 在默认情况下是禁用的。您可以通过使用 VPN 服务器配置工具很容易地激活它。
+如果您的 SoftEther VPN 服务器放置在 NAT 或防火墙后面，由于某种原因，你不能使用 NAT 穿透功能、动态 DNS 功能或 VPN over ICMP/DNS 功能，您可以使用 VPN Azure Cloud 服务。 SoftEther 公司在互联网上运行 VPN Azure 云。VPN 服务器连接到 VPN Azure 云，主机名 "abc.vpnazure.net" ( "abc" 是一个唯一的主机名) 通过 VPN Azure 云可以被指定连接到 VPN 服务器。实际上，这样的一个主机名指向一个由 SoftEther 公司所操作的云服务器的全球 IP 地址。如果一个 VPN 客户端连接到一个 VPN Azure 主机，那么 VPN Azure 主机转播在 VPN 客户端和 VPN 服务器之间的所有流量。VPN Azure 在默认情况下是禁用的。您可以通过使用 VPN 服务器配置工具很容易地激活它。
1.6. UDP 加速
SoftEther VPN 具有 UDP 加速功能。如果一个 VPN 是由两个站点组成检测到 UDP 通道已建立， UDP 将自动使用。通过此功能， UDP 的吞吐量增加了。如果直接的 UDP 通道已被建立，直接的 UDP 数据包将被使用。但是，如果有一些障碍，如防火墙或 NAT ， "UDP 冲孔" 技术将被使用。 "UDP 冲孔" 使用 SoftEther 公司在互联网上操作的云服务器。UDP 加速通过在 VPN 客户端一侧进行设置在任何时候可以被禁用。
diff --git a/src/bin/hamcore/warning_en.txt b/src/bin/hamcore/warning_en.txt
index 9ebbf058..7670dec1 100644
--- a/src/bin/hamcore/warning_en.txt
+++ b/src/bin/hamcore/warning_en.txt
@@ -17,7 +17,7 @@ Traditional legacy VPN system requires a static global IP address on the VPN ser
If you want to make a VPN connection between SoftEther VPN Client / Bridge and SoftEther VPN Server, but if TCP and UDP packets are prohibited by the firewall, then you can encapsulates payloads into "ICMP" (as known as Ping) or "DNS" packets. This function can realize a VPN connection by using ICMP or DNS even if the firewall or router blocks every TCP or UDP connections. VPN over ICMP / VPN over DNS functions are designed to comply standard ICMP and DNS specifications as possible, however it sometimes has a behavior not to fully comply them. Therefore, few poor-quality routers may be caused a memory-overflow or something troubles when a lot of ICMP or DNS packets are passed, and such routers sometimes freezes or reboots. It might affects other users on the same network. To avoid such risks, append the suffix "/tcp" on the destination hostname which is specified on the VPN-client side to disable VPN over ICMP / DNS functions.
1.5. VPN Azure Cloud Service
-If your SoftEther VPN Server is placed behind the NAT or firwall, and by some reason you cannot use NAT Traversal function, Dynamic DNS function or VPN over ICMP/DNS function, you can use VPN Azure Clouse Service. SoftEther Corporation operates VPN Azure Cloud on Internet. After the VPN Server makes a connection to the VPN Azure Cloud, the hostname "abc.vpnazure.net" ( "abc" is a unique hostname) can be specified to connect to the VPN Server via the VPN Azure Cloud. Practically, such a hostname is pointing a global IP address of one of cloud servers which are operated by SoftEther Corporation. If A VPN Client connects to such a VPN Azure host, then the VPN Azure host will relay all traffics between the VPN Client and the VPN Server. VPN Azure is disabled by default. You can activate it easily by using VPN Server Configuration Tool.
+If your SoftEther VPN Server is placed behind the NAT or firewall, and by some reason you cannot use NAT Traversal function, Dynamic DNS function or VPN over ICMP/DNS function, you can use VPN Azure Cloud Service. SoftEther Corporation operates VPN Azure Cloud on Internet. After the VPN Server makes a connection to the VPN Azure Cloud, the hostname "abc.vpnazure.net" ( "abc" is a unique hostname) can be specified to connect to the VPN Server via the VPN Azure Cloud. Practically, such a hostname is pointing a global IP address of one of cloud servers which are operated by SoftEther Corporation. If A VPN Client connects to such a VPN Azure host, then the VPN Azure host will relay all traffics between the VPN Client and the VPN Server. VPN Azure is disabled by default. You can activate it easily by using VPN Server Configuration Tool.
1.6. UDP Acceleration
SoftEther VPN has the UDP Acceleration Function. If a VPN consists of two sites detects that UDP channel can be established, UDP will be automatically used. By this function, throughput of UDP increases. If direct UDP channel can be established, direct UDP packets will be used. However, if there is something obstacles such as firewalls or NATs, the "UDP Hole Punching" technology will be used, instead. The "UDP Hole Punching" uses the cloud servers which SoftEther Corporation operates on Internet. UDP Acceleration can be disabled anytime by setting up so on the VPN-client side.
diff --git a/src/bin/hamcore/warning_tw.txt b/src/bin/hamcore/warning_tw.txt
index 775251c1..172a9947 100644
--- a/src/bin/hamcore/warning_tw.txt
+++ b/src/bin/hamcore/warning_tw.txt
@@ -17,7 +17,7 @@ SoftEther VPN 可以進行 VPN 通信。不同於傳統的 VPN 協定， SoftEth
如果你想在 SoftEther VPN 用戶端 / 橋接器和 SoftEther VPN 伺服器之間建立一個 VPN 連接，但如果 TCP 和 UDP 封包被防火牆禁止通過，那麼你可以把有效載荷封裝進 "ICMP" (被稱為 Ping) 或 "DNS" 封包。通過使用 ICMP 或 DNS ，即使防火牆或路由器阻止每個 TCP 或 UDP 連接，此功能可以實現 VPN 連接。VPN over ICMP/ VPN over DNS 功能盡可能的設計符合標準 ICMP 和 DNS 規範，但有時也不完全符合他們的行為。因此，一些劣質路由器可能會導致記憶體溢出或當有很多 ICMP 或 DNS 封包通過時產生麻煩，這種路由器有時當機或重新啟動。它可能會影響在同一網路上的其他使用者。為了避免這樣的風險，在 VPN 用戶端指定的目標主機名稱上附加尾碼 "/tcp" ，禁用 VPN over ICMP / DNS 功能。
1.5. VPN Azure 雲服務
-如果您的 SoftEther VPN 伺服器放置在 NAT 或防火牆後面，由於某種原因，你不能使用 NAT 穿透功能、動態 DNS 功能或 VPN over ICMP/DNS 功能，您可以使用 VPN Azure Clouse 服務。 SoftEther 公司在網際網路上運行 VPN Azure 雲。VPN 伺服器連接到 VPN Azure 雲，主機名稱 "abc.vpnazure.net" ( "abc" 是一個唯一的主機名稱) 通過 VPN Azure 雲可以被指定連接到 VPN 伺服器。實際上，這樣的一個主機名稱指向一個由 SoftEther 公司所操作的雲伺服器的全球 IP 位址。如果一個 VPN 用戶端連接到一個 VPN Azure 主機，那麼 VPN Azure 主機轉播在 VPN 用戶端和 VPN 伺服器之間的所有流量。VPN Azure 在預設情況下是禁用的。您可以通過使用 VPN 伺服器配置工具很容易地啟動它。
+如果您的 SoftEther VPN 伺服器放置在 NAT 或防火牆後面，由於某種原因，你不能使用 NAT 穿透功能、動態 DNS 功能或 VPN over ICMP/DNS 功能，您可以使用 VPN Azure Cloud 服務。 SoftEther 公司在網際網路上運行 VPN Azure 雲。VPN 伺服器連接到 VPN Azure 雲，主機名稱 "abc.vpnazure.net" ( "abc" 是一個唯一的主機名稱) 通過 VPN Azure 雲可以被指定連接到 VPN 伺服器。實際上，這樣的一個主機名稱指向一個由 SoftEther 公司所操作的雲伺服器的全球 IP 位址。如果一個 VPN 用戶端連接到一個 VPN Azure 主機，那麼 VPN Azure 主機轉播在 VPN 用戶端和 VPN 伺服器之間的所有流量。VPN Azure 在預設情況下是禁用的。您可以通過使用 VPN 伺服器配置工具很容易地啟動它。
1.6. UDP 加速
SoftEther VPN 具有 UDP 加速功能。如果一個 VPN 是由兩個網站組成檢測到 UDP 通道已建立， UDP 將自動使用。通過此功能， UDP 的輸送量增加了。如果直接的 UDP 通道已被建立，直接的 UDP 封包將被使用。但是，如果有一些障礙，如防火牆或 NAT ， "UDP 沖孔" 技術將被使用。 "UDP 沖孔" 使用 SoftEther 公司在網際網路上操作的雲伺服器。UDP 加速通過在 VPN 用戶端一側進行設置在任何時候可以被禁用。
diff --git a/src/bin/hamcore/webui/listener.cgi b/src/bin/hamcore/webui/listener.cgi
index 973d9849..8ee79f18 100644
--- a/src/bin/hamcore/webui/listener.cgi
+++ b/src/bin/hamcore/webui/listener.cgi
@@ -1,5 +1,5 @@
diff --git a/src/vpninstall/vpninstall.rc b/src/vpninstall/vpninstall.rc
index 0baf8281..b24478a0 100644
--- a/src/vpninstall/vpninstall.rc
+++ b/src/vpninstall/vpninstall.rc
@@ -184,8 +184,8 @@ BEGIN
IDS_DOWNLOADING3_EN "Downloading file '%S'. Please wait."
IDS_INSTALLSTART_EN "Complete the VPN Client Installer displayed on the screen."
IDS_INSTALLSTART_ERROR_EN "Failed to start installation."
- IDS_SECURITY_ERROR_EN "For security reasons, a local file cannot be used as the installation soruce during Web-based installation.\r\nConfirm the inf file of context and check the path specified in the inf file. \r\nInstallaion process aborted."
- IDS_SIGN_WARNING_EN "The automatically downloaded file '%s' from the Internet is not digitally signed with a trusted certificate.\r\nThe developer and publisher do not guarantee that the downloaded file '%s' is safe and do not take responsibility in case of unsafe code included in the file.\r\n\r\nWe recommend to abort the installation by clicking [Cancel]. Proceed the installation by clicking [OK] at your own risk.\r\n\r\nNotice: the message will not be disappered when the file '%s' is signed by valid code signing certificate authentication."
+ IDS_SECURITY_ERROR_EN "For security reasons, a local file cannot be used as the installation soruce during Web-based installation.\r\nConfirm the inf file of context and check the path specified in the inf file. \r\nInstallation process aborted."
+ IDS_SIGN_WARNING_EN "The automatically downloaded file '%s' from the Internet is not digitally signed with a trusted certificate.\r\nThe developer and publisher do not guarantee that the downloaded file '%s' is safe and do not take responsibility in case of unsafe code included in the file.\r\n\r\nWe recommend to abort the installation by clicking [Cancel]. Proceed the installation by clicking [OK] at your own risk.\r\n\r\nNotice: the message will not be disappeared when the file '%s' is signed by valid code signing certificate authentication."
END
STRINGTABLE
diff --git a/src/vpnweb/vpnweb.rc b/src/vpnweb/vpnweb.rc
index 9ea19494..05734103 100644
--- a/src/vpnweb/vpnweb.rc
+++ b/src/vpnweb/vpnweb.rc
@@ -144,7 +144,7 @@ BEGIN
IDS_STRING11004 "Failed to download file %S.\r\nInstallation of VPN software aborted."
IDS_STRING11005 "Invalid file %S. \r\nInstallation of VPN software aborted."
IDS_STRING11006 "Failed to create temporary file %s."
- IDS_STRING11007 "Getting data and installing VPN software...\r\nPlease wait.\r\n\r\nAny of your private infomation is not sent to the Internet."
+ IDS_STRING11007 "Getting data and installing VPN software...\r\nPlease wait.\r\n\r\nAny of your private information is not sent to the Internet."
END
STRINGTABLE
@@ -152,7 +152,7 @@ BEGIN
IDS_STRING11008 "Failed to start process %S. Installation of VPN software aborted."
IDS_STRING11009 "Starting installation of VPN Software."
IDS_STRING11010 "Installation process finished. Connection process are started correctly.\r\n\r\nYou can now close your browser or move the other pages."
- IDS_STRING11011 "The automatically downloaded file %S from the Internet is not digitally signed with a trusted certificate.\r\nThe developer and publisher do not guarantee that the downloaded file %S is safe and do not take responsibility in case of unsafe code included in the file.\r\n\r\nWe recommend to abort the installation by clicking [Cancel]. Proceed the installation by clicking [OK] at your own risk.\r\n\r\nNotice: the message will not be disappered when the file %S is signed by valid code signing certificate authentication."
+ IDS_STRING11011 "The automatically downloaded file %S from the Internet is not digitally signed with a trusted certificate.\r\nThe developer and publisher do not guarantee that the downloaded file %S is safe and do not take responsibility in case of unsafe code included in the file.\r\n\r\nWe recommend to abort the installation by clicking [Cancel]. Proceed the installation by clicking [OK] at your own risk.\r\n\r\nNotice: the message will not be disappeared when the file %S is signed by valid code signing certificate authentication."
IDS_STRING11012 "Security Alert"
IDS_STRING11013 "Installation cancelled by user."
IDS_STRING11014 "Press [Manage Virtual HUB] button to manage Virtual HUB with VPN Server Manager started."
diff --git a/src/vpnweb/vpnwebdlg.c b/src/vpnweb/vpnwebdlg.c
index b3de2c2d..62477c19 100644
--- a/src/vpnweb/vpnwebdlg.c
+++ b/src/vpnweb/vpnwebdlg.c
@@ -556,7 +556,7 @@ DOWNLOAD_FAILED:
}
else
{
- VwPrint(hWnd, msgUserCancal);
+ VwPrint(hWnd, msgUserCancel);
}
}
}
@@ -769,7 +769,7 @@ INT_PTR CALLBACK VpnWebDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam
Hide(hWnd, B_START);
Hide(hWnd, S_INFO2);
Show(hWnd, S_INFO);
- VwPrint(hWnd, msgInfDownloag);
+ VwPrint(hWnd, msgInfDownload);
task.Thread = VwNewThread(VwTaskThread, NULL);
break;
diff --git a/src/vpnweb/vpnwebdlg_inner.h b/src/vpnweb/vpnwebdlg_inner.h
index ad856b99..5bc0c5c4 100644
--- a/src/vpnweb/vpnwebdlg_inner.h
+++ b/src/vpnweb/vpnwebdlg_inner.h
@@ -126,7 +126,7 @@ extern HINSTANCE hDllInstance;
static wchar_t *msgAppTitle = NULL;
static char *msgNotSupported = NULL;
-static wchar_t *msgInfDownloag = NULL;
+static wchar_t *msgInfDownload = NULL;
static wchar_t *msgInfDownloadFailed = NULL;
static wchar_t *msgBadInfFile = NULL;
static wchar_t *msgWriteFailed = NULL;
@@ -136,7 +136,7 @@ static wchar_t *msgProcessCreating =NULL;
static wchar_t *msgProcessCreated = NULL;
static wchar_t *msgWarning = NULL;
static wchar_t *msgWarningTitle = NULL;
-static wchar_t *msgUserCancal = NULL;
+static wchar_t *msgUserCancel = NULL;
static wchar_t *msgStartTextForVpnServer = NULL;
static wchar_t *msgButtonForVpnServer = NULL;
static wchar_t *msgProcessCreatedForVpnServer = NULL;
@@ -147,10 +147,10 @@ static char *msgNoParam = NULL;
static void **_messages;
typedef enum MessageType {
- _e_msgAppTitle,_e_msgNotSupported,_e_msgInfDownloag,_e_msgInfDownloadFailed,
+ _e_msgAppTitle,_e_msgNotSupported,_e_msgInfDownload,_e_msgInfDownloadFailed,
_e_msgBadInfFile,_e_msgWriteFailed,_e_msgDownloading,_e_msgProcessFailed,
_e_msgProcessCreating,_e_msgProcessCreated,_e_msgWarning,_e_msgWarningTitle,
- _e_msgUserCancal,_e_msgStartTextForVpnServer,_e_msgButtonForVpnServer,_e_msgProcessCreatedForVpnServer,
+ _e_msgUserCancel,_e_msgStartTextForVpnServer,_e_msgButtonForVpnServer,_e_msgProcessCreatedForVpnServer,
_e_msgNoParam, _e_msgStartTextForVpnClient, _e_msgButtonForVpnClient, _e_msgEnd} MessageType_t;
int currentPage=MESSAGE_OFFSET_EN;
@@ -183,7 +183,7 @@ int LoadTables(char *pTag){
msgAppTitle=LoadMessageW(_e_msgAppTitle);
msgNotSupported=LoadMessageA(_e_msgNotSupported);
- msgInfDownloag=LoadMessageW(_e_msgInfDownloag);
+ msgInfDownload=LoadMessageW(_e_msgInfDownload);
msgInfDownloadFailed=LoadMessageW(_e_msgInfDownloadFailed);
msgBadInfFile=LoadMessageW(_e_msgBadInfFile);
msgWriteFailed=LoadMessageW(_e_msgWriteFailed);
@@ -193,7 +193,7 @@ int LoadTables(char *pTag){
msgProcessCreated=LoadMessageW(_e_msgProcessCreated);
msgWarning=LoadMessageW(_e_msgWarning);
msgWarningTitle=LoadMessageW(_e_msgWarningTitle);
- msgUserCancal=LoadMessageW(_e_msgUserCancal);
+ msgUserCancel=LoadMessageW(_e_msgUserCancel);
msgStartTextForVpnServer=LoadMessageW(_e_msgStartTextForVpnServer);
msgButtonForVpnServer=LoadMessageW(_e_msgButtonForVpnServer);
msgProcessCreatedForVpnServer=LoadMessageW(_e_msgProcessCreatedForVpnServer);