Merge 06e79fd75d into 12ed43f6eb

.cirrus.yml

@@ -4,14 +4,14 @@ FreeBSD_task:
       SSL: openssl
       OPENSSL_ROOT_DIR: /usr/local
     env:
-      SSL: openssl36
+      SSL: openssl32
       OPENSSL_ROOT_DIR: /usr/local
     env:
       # base openssl
       SSL:
   matrix:
     freebsd_instance:
-      image_family: freebsd-14-3
+      image_family: freebsd-14-2
   prepare_script:
     - pkg install -y pkgconf cmake git libsodium cpu_features $SSL
     - git submodule update --init --recursive

.github/ISSUE_TEMPLATE/bug_report_or_issue_report.yml

@@ -7,8 +7,6 @@ body:
       value: |
         Thanks for taking the time to fill out this bug report!         
         We provide a template which is specifically made for bug reports, to be sure that the report includes enough details to be helpful.
-        
-        **⚠️ Antivirus False Positive?** If you're reporting an antivirus detection issue, please see [ANTIVIRUS.md](https://github.com/SoftEtherVPN/SoftEtherVPN/blob/master/ANTIVIRUS.md) first. Antivirus false positives should be reported to the antivirus vendor, not as bugs in SoftEther VPN.
   
   - type: checkboxes
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,4 @@
 contact_links:
-  - name: Antivirus False Positive Detection
-    about: If antivirus software is flagging SoftEther VPN as malicious, this is a false positive. See our documentation for solutions and how to report to antivirus vendors.
-    url: https://github.com/SoftEtherVPN/SoftEtherVPN/blob/master/ANTIVIRUS.md
-
   - name: Are you using SoftEther VPN 4.x?
     about: This repository is for SoftEther VPN 5.x Developer Edition, developed independently from SoftEther VPN 4.x. Visit vpnusers.com if you would like to report issues or ask questions about version 4.x!
     url: https://www.vpnusers.com/

ANTIVIRUS.md

@@ -1,338 +0,0 @@
-# Antivirus False Positive Detection
-
-## Overview
-
-Some antivirus software, including Microsoft Defender, may incorrectly flag SoftEther VPN executables as malicious software. This is a **false positive** detection. SoftEther VPN is legitimate, open-source software that has been developed and maintained since 2013 by researchers at the University of Tsukuba, Japan.
-
-## Why Does This Happen?
-
-Antivirus software uses heuristic analysis to detect potentially malicious behavior. VPN software like SoftEther VPN performs operations that can appear suspicious to antivirus programs, including:
-
-- **Network tunneling and traffic interception**: VPN software creates virtual network adapters and intercepts network traffic to secure it
-- **Low-level network operations**: Packet filtering, protocol handling, and kernel-mode operations
-- **Service installation**: VPN clients install system services that run with elevated privileges
-- **Registry modifications**: Required for Windows integration and auto-start functionality
-- **Dynamic code execution**: Network protocol implementations may use techniques that appear similar to malicious software
-
-These are **normal and necessary operations** for any VPN software, but they can trigger heuristic-based detection algorithms.
-
-## Microsoft Defender Specific Issue
-
-### Affected Components
-
-Microsoft Defender may flag the following SoftEther VPN 5.x components as `Trojan:Win32/KepavII!rfn`:
-
-- `vpnclient.exe` - VPN Client executable
-- `vpnserver.exe` - VPN Server executable  
-- `vpnbridge.exe` - VPN Bridge executable
-- `vpncmd.exe` - VPN Command-line utility
-- Start menu shortcuts
-- Registry entries
-- Windows services (`SEVPNCLIENTDEV`, `SEVPNSERVERDEV`, etc.)
-
-### Detection Details
-
-```
-Detected: Trojan:Win32/KepavII!rfn
-Status: Quarantined
-Description: "This program is dangerous and executes commands from an attacker."
-```
-
-**This is a false positive.** The detection is based on behavioral heuristics, not actual malicious code.
-
-## Solutions and Workarounds
-
-### Option 1: Add Exclusions (Recommended for Users)
-
-The recommended approach is to add SoftEther VPN directories to Microsoft Defender's exclusion list:
-
-#### Step-by-Step Instructions:
-
-1. **Open Windows Security**
-   - Press `Windows Key + I` to open Settings
-   - Navigate to **Privacy & Security** → **Windows Security**
-   - Click **Virus & threat protection**
-
-2. **Access Exclusion Settings**
-   - Scroll down to **Virus & threat protection settings**
-   - Click **Manage settings**
-   - Scroll down to **Exclusions**
-   - Click **Add or remove exclusions**
-
-3. **Add SoftEther VPN Directories**
-   
-   Click **Add an exclusion** → **Folder** and add these paths:
-   
-   - `C:\Program Files\SoftEther VPN Client`
-   - `C:\Program Files\SoftEther VPN Client Developer Edition`
-   - `C:\Program Files\SoftEther VPN Server`
-   - `C:\Program Files\SoftEther VPN Server Manager`
-   - `C:\Program Files\SoftEther VPN Server Manager Developer Edition`
-   - `C:\Program Files\SoftEther VPN Server Developer Edition`
-   - `C:\ProgramData\SoftEther VPN Client`
-   - `C:\ProgramData\SoftEther VPN Server`
-   
-   **Note**: Add only the directories that correspond to the SoftEther VPN components you have installed.
-
-4. **Restore Quarantined Files** (if needed)
-   - Go back to **Virus & threat protection**
-   - Click **Protection history**
-   - Find the quarantined SoftEther VPN files
-   - Click **Actions** → **Restore**
-
-5. **Reinstall if Necessary**
-   - If files were deleted, you may need to reinstall SoftEther VPN
-   - The exclusions will prevent future detections
-
-### Option 2: Report False Positive to Microsoft
-
-Help improve Microsoft Defender by reporting the false positive:
-
-1. **Submit to Microsoft Defender Security Intelligence**
-   - Visit: https://www.microsoft.com/en-us/wdsi/filesubmission
-   - Select **File** submission type
-   - Choose **Software developer** as your role
-   - Submit the falsely detected SoftEther VPN executable files
-   - Provide details: "False positive detection of SoftEther VPN, open-source VPN software"
-
-2. **Include Information**
-   - Product Name: SoftEther VPN
-   - Vendor: SoftEther Project at University of Tsukuba
-   - Official Website: https://www.softether.org/
-   - GitHub Repository: https://github.com/SoftEtherVPN/SoftEtherVPN
-   - License: Apache License 2.0
-
-Microsoft typically reviews submissions within a few days and updates their definitions if confirmed as a false positive.
-
-### Option 3: Use Alternative Antivirus Software
-
-If Microsoft Defender continues to cause issues:
-
-1. Consider using alternative antivirus software that doesn't flag SoftEther VPN
-2. Some users report fewer false positives with third-party antivirus solutions
-3. Ensure any alternative antivirus is from a reputable vendor
-
-## For IT Administrators
-
-### Group Policy Configuration
-
-To deploy exclusions across an organization using Group Policy:
-
-1. **Open Group Policy Management Console**
-   ```
-   gpmc.msc
-   ```
-
-2. **Navigate to Windows Defender Antivirus Settings**
-   ```
-   Computer Configuration → Policies → Administrative Templates 
-   → Windows Components → Microsoft Defender Antivirus → Exclusions
-   ```
-
-3. **Configure Path Exclusions**
-   - Enable **Path Exclusions**
-   - Add the SoftEther VPN installation directories
-
-4. **Update Group Policy**
-   ```powershell
-   gpupdate /force
-   ```
-
-### PowerShell Exclusion Script
-
-For automated deployment, use this PowerShell script (requires Administrator privileges):
-
-```powershell
-# Add Windows Defender exclusions for SoftEther VPN
-# Requires Administrator privileges
-
-$exclusionPaths = @(
-    "C:\Program Files\SoftEther VPN Client",
-    "C:\Program Files\SoftEther VPN Client Developer Edition",
-    "C:\Program Files\SoftEther VPN Server",
-    "C:\Program Files\SoftEther VPN Server Manager",
-    "C:\Program Files\SoftEther VPN Server Manager Developer Edition",
-    "C:\Program Files\SoftEther VPN Server Developer Edition",
-    "C:\ProgramData\SoftEther VPN Client",
-    "C:\ProgramData\SoftEther VPN Server"
-)
-
-# Check if running as Administrator
-$isAdmin = ([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
-
-if (-not $isAdmin) {
-    Write-Error "This script requires Administrator privileges. Please run PowerShell as Administrator."
-    exit 1
-}
-
-# Check if Windows Defender module is available
-if (-not (Get-Module -ListAvailable -Name Defender)) {
-    Write-Error "Windows Defender PowerShell module is not available on this system."
-    exit 1
-}
-
-$successCount = 0
-$errorCount = 0
-
-foreach ($path in $exclusionPaths) {
-    if (Test-Path $path) {
-        try {
-            Add-MpPreference -ExclusionPath $path -ErrorAction Stop
-            Write-Host "✓ Added exclusion: $path" -ForegroundColor Green
-            $successCount++
-        }
-        catch {
-            Write-Warning "✗ Failed to add exclusion for: $path"
-            Write-Warning "  Error: $($_.Exception.Message)"
-            $errorCount++
-        }
-    }
-    else {
-        Write-Host "- Skipped (not found): $path" -ForegroundColor Gray
-    }
-}
-
-Write-Host "`nSummary:" -ForegroundColor Cyan
-Write-Host "  Successfully added: $successCount exclusion(s)" -ForegroundColor Green
-if ($errorCount -gt 0) {
-    Write-Host "  Failed: $errorCount exclusion(s)" -ForegroundColor Red
-}
-Write-Host "`nSoftEther VPN exclusions configured." -ForegroundColor Cyan
-```
-
-Save as `Add-SoftEtherVPN-Exclusions.ps1` and run as Administrator.
-
-## Verification of Software Authenticity
-
-### Open Source Verification
-
-SoftEther VPN is **fully open source** and can be verified:
-
-1. **Source Code Review**
-   - Complete source code: https://github.com/SoftEtherVPN/SoftEtherVPN
-   - All commits are publicly visible
-   - Community peer-reviewed code
-
-2. **Build from Source**
-   - You can compile SoftEther VPN yourself from source
-   - See: [BUILD_WINDOWS.md](src/BUILD_WINDOWS.md) and [BUILD_UNIX.md](src/BUILD_UNIX.md)
-   - Self-compiled builds may have fewer false positive issues
-
-3. **Community Trust**
-   - Active development since 2013
-   - Over 11,000+ GitHub stars
-   - Used by organizations and individuals worldwide
-   - Peer-reviewed academic research project
-
-### Official Distributions
-
-Always download SoftEther VPN from official sources:
-
-- **Official Website**: https://www.softether.org/
-- **GitHub Releases**: https://github.com/SoftEtherVPN/SoftEtherVPN/releases
-- **Official Download Site**: https://www.softether-download.com/
-
-**Warning**: Do not download SoftEther VPN from third-party websites or unofficial sources.
-
-## Technical Background
-
-### Why VPN Software Triggers Detection
-
-VPN software implements functionality that overlaps with techniques used by some malware:
-
-1. **Kernel-mode drivers**: Required for creating virtual network adapters
-2. **Network traffic interception**: Core VPN functionality to encrypt traffic
-3. **Process injection**: Some VPN implementations inject into other processes
-4. **Privilege escalation**: VPN services need administrative rights
-5. **Persistent system changes**: Auto-start configuration, service installation
-
-These are **legitimate techniques** when used by trusted VPN software.
-
-### False Positive Rate
-
-False positives are common in the VPN and security software industry. Other legitimate VPN and security tools have faced similar issues:
-
-- OpenVPN has been flagged by various antivirus vendors
-- WireGuard implementations have triggered false positives
-- Many security research tools face similar challenges
-
-## Code Signing Status
-
-**Note**: The official SoftEther VPN releases may not include code signing certificates. Code signing certificates require:
-
-- Annual fees (typically $300-500+ per year)
-- Corporate entity for Extended Validation (EV) certificates
-- Hardware security modules (HSM) for EV certificate storage
-
-As an open-source project with limited funding, SoftEther VPN prioritizes development over expensive code signing infrastructure. However, this doesn't make the software any less safe - all source code is publicly auditable.
-
-Users who require signed binaries can:
-1. Build from source and sign with their own certificates
-2. Work with their organization to sign the binaries
-3. Use alternative verification methods (source code review, checksums, etc.)
-
-## Best Practices
-
-1. **Keep Antivirus Updated**: Ensure Microsoft Defender definitions are current
-2. **Monitor Protection History**: Regularly check if SoftEther VPN is being flagged
-3. **Subscribe to Updates**: Follow SoftEther VPN releases for security updates
-4. **Report False Positives**: Help the community by reporting detections to Microsoft
-5. **Use Official Builds**: Only download from official sources
-
-## Additional Resources
-
-- **SoftEther VPN Official Website**: https://www.softether.org/
-- **GitHub Repository**: https://github.com/SoftEtherVPN/SoftEtherVPN
-- **Security Policy**: [SECURITY.md](SECURITY.md)
-- **Microsoft Defender Submission Portal**: https://www.microsoft.com/en-us/wdsi/filesubmission
-- **Build Instructions**: [BUILD_WINDOWS.md](src/BUILD_WINDOWS.md)
-
-## Frequently Asked Questions
-
-### Q: Is SoftEther VPN safe to use?
-
-**A**: Yes. SoftEther VPN is legitimate, open-source software developed by researchers at the University of Tsukuba, Japan. The detection is a false positive. All source code is publicly available for review at https://github.com/SoftEtherVPN/SoftEtherVPN
-
-### Q: Why don't you just fix the code to not trigger antivirus?
-
-**A**: The detection is based on legitimate VPN operations, not malicious code. Changing how VPN functionality works to avoid heuristic detection would compromise the software's core purpose. The correct solution is to report false positives to antivirus vendors and add exclusions.
-
-### Q: Will adding exclusions make my computer less secure?
-
-**A**: Exclusions for trusted software from official sources don't significantly reduce security. Only add exclusions for software you trust and have downloaded from official sources. SoftEther VPN is open-source and can be verified.
-
-### Q: Can I use SoftEther VPN without adding exclusions?
-
-**A**: Not reliably with Microsoft Defender. The antivirus will quarantine executables and prevent the VPN from functioning. Exclusions are necessary unless Microsoft updates their detection definitions.
-
-### Q: How do I know my downloaded file is authentic?
-
-**A**: 
-1. Only download from https://github.com/SoftEtherVPN/SoftEtherVPN/releases or https://www.softether.org/
-2. Verify the file hash/checksum if provided
-3. Review the source code on GitHub
-4. Build from source yourself for maximum assurance
-
-### Q: Is this issue specific to SoftEther VPN?
-
-**A**: No. Many VPN applications and security tools face false positive detections. OpenVPN, WireGuard implementations, and other network security tools have similar issues with various antivirus vendors.
-
-### Q: Will this be fixed in a future version?
-
-**A**: The SoftEther VPN project continues to work on this issue. However, heuristic-based detection is challenging to avoid without compromising functionality. The best approach is to:
-1. Report false positives to Microsoft
-2. Use exclusions as needed
-3. Build from source if your organization requires it
-
-## Contributing
-
-If you have additional solutions or workarounds that have worked for you, please contribute to this documentation:
-
-1. Fork the repository: https://github.com/SoftEtherVPN/SoftEtherVPN
-2. Edit this file: `ANTIVIRUS.md`
-3. Submit a pull request with your improvements
-
----
-
-**Applies to**: SoftEther VPN 5.x (Developer Edition)  
-**Related Issue**: False positive detection by Microsoft Defender as Trojan:Win32/KepavII!rfn

Dockerfile

@@ -37,18 +37,15 @@ COPY --from=builder /usr/local/src/SoftEtherVPN/build/libcedar.so /usr/local/src
 
 FROM base AS vpnserver
 COPY --from=builder /usr/local/src/SoftEtherVPN/build/vpnserver ./
-RUN ./vpnserver --help
 EXPOSE 443/tcp 992/tcp 1194/tcp 1194/udp 5555/tcp 500/udp 4500/udp
 CMD ["/usr/local/bin/vpnserver", "execsvc"]
 
 
 FROM base AS vpnclient
 COPY --from=builder /usr/local/src/SoftEtherVPN/build/vpnclient ./
-RUN ./vpnclient --help
 CMD ["/usr/local/bin/vpnclient", "execsvc"]
 
 
 FROM base AS vpnbridge
 COPY --from=builder /usr/local/src/SoftEtherVPN/build/vpnbridge ./
-RUN ./vpnbridge --help
 CMD ["/usr/local/bin/vpnbridge", "execsvc"]

README.md

@@ -14,7 +14,6 @@
   * [For Windows](#for-windows)
   * [From binary installers (stable channel)](#from-binary-installers-stable-channel)
   * [Build from Source code](#build-from-source-code)
-- [Antivirus False Positive Detection](ANTIVIRUS.md)
 - [About HTML5-based Modern Admin Console and JSON-RPC API Suite](#about-html5-based-modern-admin-console-and-json-rpc-api-suite)
   * [Built-in SoftEther VPN Server HTML5 Ajax-based Web Administration Console](#built-in-softether-vpn-server-html5-ajax-based-web-administration-console)
   * [Built-in SoftEther Server VPN JSON-RPC API Suite](#built-in-softether-server-vpn-json-rpc-api-suite)
@@ -207,8 +206,6 @@ Also SoftEther VPN [Stable Edition](https://www.freshports.org/security/softethe
 [Nightly builds](https://github.com/SoftEtherVPN/SoftEtherVPN/actions/workflows/windows.yml)
 (choose appropriate platform, then find binaries or installers as artifacts)
 
-**⚠️ Important for Windows Users**: Some antivirus software (including Microsoft Defender) may incorrectly flag SoftEther VPN as malicious. This is a **false positive**. See [ANTIVIRUS.md](ANTIVIRUS.md) for detailed information and solutions.
-
 ## From binary installers (stable channel)
 
 Those can be found under https://www.softether-download.com/

SECURITY.md

@@ -12,15 +12,4 @@ currently being supported with security updates.
 
 ## Reporting a Vulnerability
 
-Please use [github security reporting](https://github.com/SoftEtherVPN/SoftEtherVPN/security/advisories/new)
-
-## Antivirus False Positive Detection
-
-Some antivirus software may incorrectly flag SoftEther VPN executables as malicious. This is a **false positive** and not a security vulnerability.
-
-**If you encounter antivirus warnings:**
-- See [ANTIVIRUS.md](ANTIVIRUS.md) for detailed information and solutions
-- Report false positives to your antivirus vendor
-- Verify downloads are from official sources only
-
-**SoftEther VPN is safe**: All source code is publicly available and can be reviewed at https://github.com/SoftEtherVPN/SoftEtherVPN
+Please use [github security reporting](https://github.com/SoftEtherVPN/SoftEtherVPN/security/advisories/new)

WINDOWS_README.txt

@@ -1,116 +0,0 @@
-================================================================================
-SoftEther VPN - Windows Installation Notes
-================================================================================
-
-Thank you for installing SoftEther VPN!
-
-SoftEther VPN is legitimate, open-source VPN software developed by researchers
-at the University of Tsukuba, Japan. It has been in active development since
-2013 and is used by organizations and individuals worldwide.
-
-================================================================================
-IMPORTANT: Antivirus False Positive Warning
-================================================================================
-
-Some antivirus software (including Microsoft Defender) may incorrectly flag
-SoftEther VPN executables as malicious. This is a FALSE POSITIVE detection.
-
-WHY THIS HAPPENS:
------------------
-VPN software performs operations that can appear suspicious to antivirus
-programs:
-  - Network tunneling and traffic interception
-  - Low-level network operations
-  - Service installation with elevated privileges
-  - Registry modifications for Windows integration
-
-These are NORMAL and NECESSARY operations for any VPN software.
-
-IF MICROSOFT DEFENDER QUARANTINES SOFTETHER VPN:
-------------------------------------------------
-
-1. Add Exclusions to Microsoft Defender:
-   
-   a) Open Windows Security (Windows Key + I -> Privacy & Security -> 
-      Windows Security -> Virus & threat protection)
-   
-   b) Click "Manage settings" under Virus & threat protection settings
-   
-   c) Scroll down to "Exclusions" and click "Add or remove exclusions"
-   
-   d) Click "Add an exclusion" -> "Folder" and add:
-      
-      C:\Program Files\SoftEther VPN Client
-      C:\Program Files\SoftEther VPN Client Developer Edition
-      C:\Program Files\SoftEther VPN Server
-      C:\Program Files\SoftEther VPN Server Developer Edition
-      
-      (Add only the folders that exist for your installation)
-
-2. Restore Quarantined Files:
-   
-   a) Go to "Virus & threat protection" -> "Protection history"
-   b) Find quarantined SoftEther VPN files
-   c) Click "Actions" -> "Restore"
-
-3. Reinstall if Necessary:
-   
-   If files were deleted, reinstall SoftEther VPN. The exclusions will
-   prevent future detections.
-
-REPORT FALSE POSITIVE TO MICROSOFT:
-------------------------------------
-
-Help improve Microsoft Defender by reporting the false positive:
-
-  Visit: https://www.microsoft.com/en-us/wdsi/filesubmission
-  
-  Submit the flagged file and indicate it's a false positive detection
-  of SoftEther VPN, open-source software from the University of Tsukuba.
-
-MORE INFORMATION:
------------------
-
-For detailed documentation about this issue and additional solutions, see:
-
-  https://github.com/SoftEtherVPN/SoftEtherVPN/blob/master/ANTIVIRUS.md
-
-VERIFY AUTHENTICITY:
---------------------
-
-SoftEther VPN is open source. You can verify the software by:
-
-  - Reviewing source code: https://github.com/SoftEtherVPN/SoftEtherVPN
-  - Official website: https://www.softether.org/
-  - Only download from official sources
-
-WARNING: Do not download SoftEther VPN from third-party websites.
-
-================================================================================
-Getting Started
-================================================================================
-
-After adding antivirus exclusions (if needed):
-
-1. Launch "SoftEther VPN Client Manager" from the Start Menu
-2. Configure your VPN connection settings
-3. Connect to your VPN server
-
-For detailed documentation, visit: https://www.softether.org/
-
-================================================================================
-Support
-================================================================================
-
-Official Website: https://www.softether.org/
-GitHub Repository: https://github.com/SoftEtherVPN/SoftEtherVPN
-Security Issues: https://github.com/SoftEtherVPN/SoftEtherVPN/security
-
-================================================================================
-
-SoftEther VPN is licensed under the Apache License 2.0
-Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan
-
-Thank you for using SoftEther VPN!
-
-================================================================================

src/Cedar/Hub.c

@@ -630,7 +630,6 @@ void DataToHubOptionStruct(HUB_OPTION *o, RPC_ADMIN_OPTION *ao)
 	GetHubAdminOptionDataAndSet(ao, "UseHubNameAsDhcpUserClassOption", o->UseHubNameAsDhcpUserClassOption);
 	GetHubAdminOptionDataAndSet(ao, "UseHubNameAsRadiusNasId", o->UseHubNameAsRadiusNasId);
 	GetHubAdminOptionDataAndSet(ao, "AllowEapMatchUserByCert", o->AllowEapMatchUserByCert);
-	GetHubAdminOptionDataAndSet(ao, "DhcpDiscoverTimeoutMs", o->DhcpDiscoverTimeoutMs);
 }
 
 // Convert the contents of the HUB_OPTION to data
@@ -706,7 +705,6 @@ void HubOptionStructToData(RPC_ADMIN_OPTION *ao, HUB_OPTION *o, char *hub_name)
 	Add(aol, NewAdminOption("UseHubNameAsDhcpUserClassOption", o->UseHubNameAsDhcpUserClassOption));
 	Add(aol, NewAdminOption("UseHubNameAsRadiusNasId", o->UseHubNameAsRadiusNasId));
 	Add(aol, NewAdminOption("AllowEapMatchUserByCert", o->AllowEapMatchUserByCert));
-	Add(aol, NewAdminOption("DhcpDiscoverTimeoutMs", o->DhcpDiscoverTimeoutMs));
 
 	Zero(ao, sizeof(RPC_ADMIN_OPTION));
 

src/Cedar/Hub.h

@@ -30,9 +30,6 @@
 // Default flooding queue length
 #define	DEFAULT_FLOODING_QUEUE_LENGTH				(32 * 1024 * 1024)
 
-// Default DHCP Discover Timeout
-#define	DEFAULT_DHCP_DISCOVER_TIMEOUT				(5 * 1000)
-
 // SoftEther link control packet
 struct SE_LINK
 {
@@ -186,7 +183,6 @@ struct HUB_OPTION
 	bool UseHubNameAsDhcpUserClassOption;	// Add HubName to DHCP request as User-Class option
 	bool UseHubNameAsRadiusNasId;		// Add HubName to Radius request as NAS-Identifier attrioption
 	bool AllowEapMatchUserByCert;		// Allow matching EAP Identity with user certificate CNs
-	UINT DhcpDiscoverTimeoutMs;			// Timeout to wait for DHCP server response on DISCOVER request
 };
 
 // MAC table entry

src/Cedar/IPC.c

@@ -493,14 +493,12 @@ IPC *NewIPC(CEDAR *cedar, char *client_name, char *postfix, char *hubname, char
 	{
 		UINTToIP(&ipc->DefaultGateway, hub->Option->DefaultGateway);
 		UINTToIP(&ipc->SubnetMask, hub->Option->DefaultSubnet);
-		ipc->DhcpDiscoverTimeoutMs = hub->Option->DhcpDiscoverTimeoutMs;
 		GetBroadcastAddress4(&ipc->BroadcastAddress, &ipc->DefaultGateway, &ipc->SubnetMask);
 	}
 	else
 	{
 		ZeroIP4(&ipc->DefaultGateway);
 		ZeroIP4(&ipc->SubnetMask);
-		ipc->DhcpDiscoverTimeoutMs = DEFAULT_DHCP_DISCOVER_TIMEOUT;
 		ZeroIP4(&ipc->BroadcastAddress);
 	}
 
@@ -795,8 +793,7 @@ bool IPCDhcpAllocateIP(IPC *ipc, DHCP_OPTION_LIST *opt, TUBE *discon_poll_tube)
 	StrCpy(req.Hostname, sizeof(req.Hostname), ipc->ClientHostname);
 	IPCDhcpSetConditionalUserClass(ipc, &req);
 
-	UINT discoverTimeout = ipc->DhcpDiscoverTimeoutMs > 0 ? ipc->DhcpDiscoverTimeoutMs : DEFAULT_DHCP_DISCOVER_TIMEOUT;
-	d = IPCSendDhcpRequest(ipc, NULL, tran_id, &req, DHCP_OFFER, discoverTimeout, discon_poll_tube);
+	d = IPCSendDhcpRequest(ipc, NULL, tran_id, &req, DHCP_OFFER, IPC_DHCP_TIMEOUT, discon_poll_tube);
 	if (d == NULL)
 	{
 		return false;
@@ -899,7 +896,7 @@ DHCPV4_DATA *IPCSendDhcpRequest(IPC *ipc, IP *dest_ip, UINT tran_id, DHCP_OPTION
 	}
 
 	// Retransmission interval
-	resend_interval = MIN(IPC_DHCP_MAX_RESEND_INTERVAL, MAX(1, (timeout / 3) - 100));
+	resend_interval = MAX(1, (timeout / 3) - 100);
 
 	// Time-out time
 	giveup_time = Tick64() + (UINT64)timeout;

src/Cedar/IPC.h

@@ -19,7 +19,6 @@
 #define	IPC_DHCP_TIMEOUT				(5 * 1000)
 #define	IPC_DHCP_MIN_LEASE				5
 #define	IPC_DHCP_DEFAULT_LEASE			3600
-#define	IPC_DHCP_MAX_RESEND_INTERVAL	(3 * 1000)
 
 #define	IPC_MAX_PACKET_QUEUE_LEN		10000
 
@@ -150,7 +149,6 @@ struct IPC
 	SHARED_BUFFER *IpcSessionSharedBuffer;	// A shared buffer between IPC and Session
 	IPC_SESSION_SHARED_BUFFER_DATA *IpcSessionShared;	// Shared data between IPC and Session
 	UINT Layer;
-	UINT DhcpDiscoverTimeoutMs;			// Timeut to wait for DHCP server response on DISCOVER request
 
 	// IPv6 stuff
 	QUEUE *IPv6ReceivedQueue;			// IPv6 reception queue

src/Cedar/Layer3.c

@@ -457,10 +457,10 @@ void L3KnownArp(L3IF *f, UINT ip, UCHAR *mac)
 	// Delete an ARP query entry to this IP address
 	Zero(&t, sizeof(t));
 	t.IpAddress = ip;
-	w = Search(f->ArpWaitTable, &t);
+	w = Search(f->IpWaitList, &t);
 	if (w != NULL)
 	{
-		Delete(f->ArpWaitTable, w);
+		Delete(f->IpWaitList, w);
 		Free(w);
 	}
 

src/Cedar/Protocol.c

@@ -5843,6 +5843,7 @@ bool ServerDownloadSignature(CONNECTION *c, char **error_detail_str)
 				// Target is invalid
 				HttpSendNotFound(s, h->Target);
 				Free(data);
+				FreeHttpHeader(h);
 				*error_detail_str = "POST_Target_Wrong";
 			}
 			else
@@ -5860,10 +5861,10 @@ bool ServerDownloadSignature(CONNECTION *c, char **error_detail_str)
 				{
 					// WaterMark is incorrect
 					HttpSendForbidden(s, h->Target, NULL);
+					FreeHttpHeader(h);
 					*error_detail_str = "POST_WaterMark_Error";
 				}
 			}
-			FreeHttpHeader(h);
 		}
 		else if (StrCmpi(h->Method, "OPTIONS") == 0)
 		{
@@ -5883,7 +5884,6 @@ bool ServerDownloadSignature(CONNECTION *c, char **error_detail_str)
 					continue;
 				}
 			}
-			FreeHttpHeader(h);
 		}
 		else if (StrCmpi(h->Method, "SSTP_DUPLEX_POST") == 0 && (ProtoEnabled(server->Proto, "SSTP") || s->IsReverseAcceptedSocket) && GetServerCapsBool(server, "b_support_sstp"))
 		{

src/Cedar/Server.c

@@ -2337,7 +2337,6 @@ void SiSetDefaultHubOption(HUB_OPTION *o)
 	o->AccessListIncludeFileCacheLifetime = ACCESS_LIST_INCLUDE_FILE_CACHE_LIFETIME;
 	o->RemoveDefGwOnDhcpForLocalhost = true;
 	o->FloodingSendQueueBufferQuota = DEFAULT_FLOODING_QUEUE_LENGTH;
-	o->DhcpDiscoverTimeoutMs = DEFAULT_DHCP_DISCOVER_TIMEOUT;
 }
 
 // Create a default virtual HUB
@@ -3943,11 +3942,6 @@ void SiLoadHubOptionCfg(FOLDER *f, HUB_OPTION *o)
 	o->UseHubNameAsDhcpUserClassOption = CfgGetBool(f, "UseHubNameAsDhcpUserClassOption");
 	o->UseHubNameAsRadiusNasId = CfgGetBool(f, "UseHubNameAsRadiusNasId");
 	o->AllowEapMatchUserByCert = CfgGetBool(f, "AllowEapMatchUserByCert");
-	o->DhcpDiscoverTimeoutMs = CfgGetInt(f, "DhcpDiscoverTimeoutMs");
-	if (o->DhcpDiscoverTimeoutMs == 0)
-	{
-		o->DhcpDiscoverTimeoutMs = DEFAULT_DHCP_DISCOVER_TIMEOUT;
-	}
 
 	// Enabled by default
 	if (CfgIsItem(f, "ManageOnlyPrivateIP"))
@@ -4054,7 +4048,6 @@ void SiWriteHubOptionCfg(FOLDER *f, HUB_OPTION *o)
 	CfgAddBool(f, "UseHubNameAsDhcpUserClassOption", o->UseHubNameAsDhcpUserClassOption);
 	CfgAddBool(f, "UseHubNameAsRadiusNasId", o->UseHubNameAsRadiusNasId);
 	CfgAddBool(f, "AllowEapMatchUserByCert", o->AllowEapMatchUserByCert);
-	CfgAddInt(f, "DhcpDiscoverTimeoutMs", o->DhcpDiscoverTimeoutMs);
 }
 
 // Write the user
@@ -7540,11 +7533,6 @@ void SiCalledUpdateHub(SERVER *s, PACK *p)
 	o.UseHubNameAsDhcpUserClassOption = PackGetBool(p, "UseHubNameAsDhcpUserClassOption");
 	o.UseHubNameAsRadiusNasId = PackGetBool(p, "UseHubNameAsRadiusNasId");
 	o.AllowEapMatchUserByCert = PackGetBool(p, "AllowEapMatchUserByCert");
-	o.DhcpDiscoverTimeoutMs = PackGetInt(p, "DhcpDiscoverTimeoutMs");
-	if (o.DhcpDiscoverTimeoutMs == 0)
-	{
-		o.DhcpDiscoverTimeoutMs = DEFAULT_DHCP_DISCOVER_TIMEOUT;
-	}
 
 	save_packet_log = PackGetInt(p, "SavePacketLog");
 	packet_log_switch_type = PackGetInt(p, "PacketLogSwitchType");
@@ -9380,7 +9368,6 @@ void SiPackAddCreateHub(PACK *p, HUB *h)
 	PackAddBool(p, "UseHubNameAsDhcpUserClassOption", h->Option->UseHubNameAsDhcpUserClassOption);
 	PackAddBool(p, "UseHubNameAsRadiusNasId", h->Option->UseHubNameAsRadiusNasId);
 	PackAddBool(p, "AllowEapMatchUserByCert", h->Option->AllowEapMatchUserByCert);
-	PackAddInt(p, "DhcpDiscoverTimeoutMs", h->Option->DhcpDiscoverTimeoutMs);
 
 	SiAccessListToPack(p, h->AccessList);
 

src/Mayaqua/CMakeLists.txt

@@ -18,46 +18,20 @@ set_target_properties(mayaqua
 
 find_package(OpenSSL REQUIRED)
 
-if(OPENSSL_VERSION VERSION_GREATER_EQUAL "3")
-  set(OQS_ENABLE ON CACHE BOOL "By setting this to OFF, Open Quantum Safe algorithms will not be built in")
+if(OPENSSL_VERSION VERSION_LESS "3") # Disable oqsprovider when OpenSSL version < 3
+  add_definitions(-DSKIP_OQS_PROVIDER)
 else()
-  # Disable oqsprovider when OpenSSL version < 3
-  set(OQS_ENABLE OFF)
-endif()
-
-if(OQS_ENABLE)
   set(OQS_BUILD_ONLY_LIB ON CACHE BOOL "Set liboqs to build only the library (no tests)")
   set(BUILD_TESTING OFF CACHE BOOL "By setting this to OFF, no tests or examples will be compiled.")
   set(OQS_PROVIDER_BUILD_STATIC ON CACHE BOOL "Build a static library instead of a shared library") # Build oqsprovider as a static library (defaults to shared)
   list(PREPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/Mayaqua/3rdparty/")
 
-    # Disable all other KEM families
-  set(OQS_ENABLE_KEM_FRODOKEM OFF)
-  set(OQS_ENABLE_KEM_NTRUPRIME OFF)
-  set(OQS_ENABLE_KEM_NTRU OFF)
-  set(OQS_ENABLE_KEM_CLASSIC_MCELIECE OFF)
-  set(OQS_ENABLE_KEM_HQC OFF)
-  set(OQS_ENABLE_KEM_BIKE OFF)
-
-  # Disable all SIG families
-  set(OQS_ENABLE_SIG_ML_DSA OFF)
-  set(OQS_ENABLE_SIG_FALCON OFF)
-  set(OQS_ENABLE_SIG_DILITHIUM OFF)
-  set(OQS_ENABLE_SIG_SPHINCS OFF)
-  set(OQS_ENABLE_SIG_MAYO OFF)
-  set(OQS_ENABLE_SIG_CROSS OFF)
-  set(OQS_ENABLE_SIG_UOV OFF)
-  set(OQS_ENABLE_SIG_SNOVA OFF)
-  set(OQS_ENABLE_SIG_SLH_DSA OFF)
-
   add_subdirectory(3rdparty/liboqs)
   add_subdirectory(3rdparty/oqs-provider)
 
   target_include_directories(oqsprovider PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/3rdparty/liboqs/include)
   set_property(TARGET oqsprovider PROPERTY POSITION_INDEPENDENT_CODE ON)
   target_link_libraries(mayaqua PRIVATE oqsprovider)
-else()
-  add_definitions(-DSKIP_OQS_PROVIDER)
 endif()
 
 include(CheckSymbolExists)
@@ -151,10 +125,8 @@ if(UNIX)
     message("-- Using system's cpu_features")
     target_link_libraries(mayaqua PRIVATE cpu_features)
   else()
-    message("-- Using bundled cpu_features")
-    set(BUILD_SHARED_LIBS OFF)
-    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
     add_subdirectory(3rdparty/cpu_features)
+    set_property(TARGET cpu_features PROPERTY POSITION_INDEPENDENT_CODE ON)
     target_link_libraries(mayaqua PRIVATE cpu_features)
   endif()
 

src/Mayaqua/TcpIp.c

@@ -2057,15 +2057,43 @@ bool ParsePacketL2Ex(PKT *p, UCHAR *buf, UINT size, bool no_l3, bool no_l3_l4_ex
 
 	if (type_id_16 > 1500)
 	{
-		if (type_id_16 == MAC_PROTO_TAGVLAN)
+		// Ordinary Ethernet frame
+		switch (type_id_16)
 		{
-			// Parse VLAN frame
-			return ParsePacketTAGVLAN(p, buf, size, no_l3, no_l3_l4_except_icmpv6);
-		}
-		else
-		{
-			// Parse Ordinary Ethernet frame
-			return ParsePacketL3(p, buf, size, type_id_16, no_l3, no_l3_l4_except_icmpv6);
+		case MAC_PROTO_ARPV4:	// ARPv4
+			if (no_l3 || no_l3_l4_except_icmpv6)
+			{
+				return true;
+			}
+
+			return ParsePacketARPv4(p, buf, size);
+
+		case MAC_PROTO_IPV4:	// IPv4
+			if (no_l3 || no_l3_l4_except_icmpv6)
+			{
+				return true;
+			}
+
+			return ParsePacketIPv4(p, buf, size);
+
+		case MAC_PROTO_IPV6:	// IPv6
+			if (no_l3)
+			{
+				return true;
+			}
+
+			return ParsePacketIPv6(p, buf, size, no_l3_l4_except_icmpv6);
+
+		default:				// Unknown
+			if (type_id_16 == p->VlanTypeID)
+			{
+				// VLAN
+				return ParsePacketTAGVLAN(p, buf, size);
+			}
+			else
+			{
+				return true;
+			}
 		}
 	}
 	else
@@ -2100,44 +2128,10 @@ bool ParsePacketL2Ex(PKT *p, UCHAR *buf, UINT size, bool no_l3, bool no_l3_l4_ex
 	}
 }
 
-bool ParsePacketL3(PKT *p, UCHAR *buf, UINT size, USHORT proto, bool no_l3, bool no_l3_l4_except_icmpv6)
-{
-	switch (proto)
-		{
-		case MAC_PROTO_ARPV4:	// ARPv4
-			if (no_l3 || no_l3_l4_except_icmpv6)
-			{
-				return true;
-			}
-
-			return ParsePacketARPv4(p, buf, size);
-
-		case MAC_PROTO_IPV4:	// IPv4
-			if (no_l3 || no_l3_l4_except_icmpv6)
-			{
-				return true;
-			}
-
-			return ParsePacketIPv4(p, buf, size);
-
-		case MAC_PROTO_IPV6:	// IPv6
-			if (no_l3)
-			{
-				return true;
-			}
-
-			return ParsePacketIPv6(p, buf, size, no_l3_l4_except_icmpv6);
-
-		default:				// Unknown
-			return true;
-		}
-}
-
 // TAG VLAN parsing
-bool ParsePacketTAGVLAN(PKT *p, UCHAR *buf, UINT size, bool no_l3, bool no_l3_l4_except_icmpv6)
+bool ParsePacketTAGVLAN(PKT *p, UCHAR *buf, UINT size)
 {
 	USHORT vlan_ushort;
-	USHORT proto_ushort;
 	// Validate arguments
 	if (p == NULL || buf == NULL)
 	{
@@ -2157,17 +2151,12 @@ bool ParsePacketTAGVLAN(PKT *p, UCHAR *buf, UINT size, bool no_l3, bool no_l3_l4
 	buf += sizeof(TAGVLAN_HEADER);
 	size -= sizeof(TAGVLAN_HEADER);
 
-	vlan_ushort = READ_USHORT(p->L3.TagVlanHeader->TagID);
+	vlan_ushort = READ_USHORT(p->L3.TagVlanHeader->Data);
 	vlan_ushort = vlan_ushort & 0xFFF;
 
 	p->VlanId = vlan_ushort;
 
-	proto_ushort = READ_USHORT(p->L3.TagVlanHeader->Protocol);
-	proto_ushort = proto_ushort & 0xFFFF;
-
-	
-	// Parse the L3 packet
-	return ParsePacketL3(p, buf, size, proto_ushort, no_l3, no_l3_l4_except_icmpv6);
+	return true;
 }
 
 // BPDU Parsing

src/Mayaqua/TcpIp.h

@@ -87,8 +87,7 @@ struct ARPV4_HEADER
 // Tagged VLAN header
 struct TAGVLAN_HEADER
 {
-	UCHAR TagID[2];					// TagID
-	UCHAR Protocol[2];				// Protocol
+	UCHAR Data[2];					// Data
 } GCC_PACKED;
 
 // IPv4 header
@@ -763,11 +762,10 @@ void FreePacketTCPv4(PKT *p);
 void FreePacketICMPv4(PKT *p);
 void FreePacketDHCPv4(PKT *p);
 bool ParsePacketL2Ex(PKT *p, UCHAR *buf, UINT size, bool no_l3, bool no_l3_l4_except_icmpv6);
-bool ParsePacketL3(PKT *p, UCHAR *buf, UINT size, USHORT proto, bool no_l3, bool no_l3_l4_except_icmpv6);
 bool ParsePacketARPv4(PKT *p, UCHAR *buf, UINT size);
 bool ParsePacketIPv4(PKT *p, UCHAR *buf, UINT size);
 bool ParsePacketBPDU(PKT *p, UCHAR *buf, UINT size);
-bool ParsePacketTAGVLAN(PKT *p, UCHAR *buf, UINT size, bool no_l3, bool no_l3_l4_except_icmpv6);
+bool ParsePacketTAGVLAN(PKT *p, UCHAR *buf, UINT size);
 bool ParseICMPv4(PKT *p, UCHAR *buf, UINT size);
 bool ParseICMPv6(PKT *p, UCHAR *buf, UINT size);
 bool ParseTCP(PKT *p, UCHAR *buf, UINT size);

src/bin/hamcore/strtable_cn.stb

@@ -4854,7 +4854,7 @@ CMD_ConnectionList_Help		现在，先获取与 VPN Server 连接的 TCP/IP 一
 CMD_ConnectionList_Args		ConnectionList
 
 
-# ConnectionList 命令
+# ConnectionGet 命令
 CMD_ConnectionGet			获取连接到 VPN Server 的 TCP 信息一览表
 CMD_ConnectionGet_Help		获取与 VPN Server 连接的 TCP/IP 连接的详细信息。\n可以获得 [连接名]，[连接种类]，[连接主机名]，[连接主机 IP]，[联机主机端口 TCP]，[连接时间]，[服务器品牌]，[服务器版本]，[服务器铭牌号]，[客户机品牌]，[客户机版本]，[客户机铭牌号] 等信息。 \n要运行此命令，需要管理员权限。
 CMD_ConnectionGet_Args		ConnectionGet [name]
@@ -7044,7 +7044,7 @@ CMD_RemoteDisable_Args		RemoteDisable
 
 ###################################################
 #                                                 #
-# 下面这是VPN工具用的指令             #
+# 下面这是VPN Tools用的指令             #
 #                                                 #
 ###################################################
 

src/bin/hamcore/strtable_en.stb

@@ -4839,7 +4839,7 @@ CMD_ConnectionList_Help	Use this to get a list of TCP/IP connections that are cu
 CMD_ConnectionList_Args	ConnectionList
 
 
-# ConnectionList command
+# ConnectionGet command
 CMD_ConnectionGet		Get Information of TCP Connections Connecting to the VPN Server
 CMD_ConnectionGet_Help	Use this to get detailed information of a specific TCP/IP connection that is connecting to the VPN Server. \nYou can get the following information: Connection Name, Connection Type, Source Hostname, Source IP Address, Source Port Number (TCP), Connection Start, Server Product Name, Server Version, Server Build Number, Client Product Name, Client Version, and Client Build Number. \nTo execute this command, you must have VPN Server administrator privileges.
 CMD_ConnectionGet_Args	ConnectionGet [name]

src/bin/hamcore/strtable_pt_br.stb

@@ -4558,7 +4558,7 @@ CMD_SyslogGet_COLUMN_2	syslog Server Host Name
 CMD_SyslogGet_COLUMN_3	syslog Server Port Number
 
 
-# ConnectionList command
+# ConnectionGet command
 CMD_ConnectionList	Get List of TCP Connections Connecting to the VPN Server
 CMD_ConnectionList_Help	Use this to get a list of TCP/IP connections that are currently connecting to the VPN Server. It does not display the TCP connections that have been established as VPN sessions. To get the list of TCP/IP connections that have been established as VPN sessions, you can use the SessionList command. \nYou can get the following: Connection Name, Connection Source, Connection Start and Type.\nTo execute this command, you must have VPN Server administrator privileges.
 CMD_ConnectionList_Args	ConnectionList
@@ -4851,7 +4851,7 @@ CMD_HubList_Args	ListaHub
 # Hub command
 CMD_Hub	Select Virtual Hub to Manage
 CMD_Hub_Help	Use this to select the Virtual Hub to be the target of administration. For an administration utility with the status of being connected to a VPN Server, before executing a command to set or manage a Virtual Hub, you must use the Hub command to select the Virtual Hub to manage. \nWhen in the status of being connected to a VPN Server in Virtual Hub Admin Mode, you can select a single Virtual Hub to be the target of administration but you cannot select other Virtual Hubs. When having the status of being connected to the VPN Server in Server Admin Mode, you can make all Virtual Hubs the target of administration. \nTo get a list of Virtual Hubs that currently exist on the VPN Server, use the HubList command. \nFor the VPN Bridge, you can only select the Virtual Hub that has the name "BRIDGE".
-CMD_Hub_Args	Hub [nome]
+CMD_Hub_Args	Hub [name]
 CMD_Hub_[name]	Specify the name of the Virtual Hub to manage. If this parameter is left unspecified, the Select Virtual Hub to Manage will be cancelled.
 CMD_Hub_Unselected	The Virtual Hub selection has been unselected.
 CMD_Hub_Selected	The Virtual Hub "%S" has been selected.
@@ -5619,7 +5619,7 @@ CMD_UserRadiusSet_ALIAS	When this parameter is set, it is possible to make the u
 CMD_UserRadiusSet_Prompt_ALIAS	Alias Name for Authentication (Optional): 
 
 
-# UserNTLMSet コマンド
+# UserNTLMSet command
 CMD_UserNTLMSet	Set NT Domain Authentication for User Auth Type
 CMD_UserNTLMSet_Help	Use this to set NT Domain Authentication as the auth type for a user that is registered on the security account database of the currently managed Virtual Hub. When a user connects to a Virtual Hub using a user name that is set for NT Domain authentication, the user name and the user input password is sent to the Windows NT / 2000 / Server 2003 / Server 2008 / Server 2008 R2 / Server 2012 Domain Controller or Active Directory Server where the server checks the user name and password, then if the verification is successful, that user is allowed VPN connection. \nTo use NT Domain authentication, the VPN Server must be operating on a Windows NT 4.0, Windows 2000, Windows XP, Windows Vista, Windows Server 2008, Windows Server 2008 R2 or Windows Server 2012 operating system that is connected to that domain. For details please contact the VPN Server's administrator. \nTo get the list of currently registered users, use the UserList command. \nThis command cannot be run on VPN Bridge. \nYou cannot execute this command for Virtual Hubs of VPN Servers operating as a member server on a cluster.
 CMD_UserNTLMSet_Args	UserNTLMSet [name] [/ALIAS:alias_name]
@@ -6193,7 +6193,7 @@ CMD_VpnAzureGetStatus_PRINT_CONNECTED	Connection to VPN Azure Cloud Server is Es
 CMD_VpnAzureGetStatus_PRINT_HOSTNAME	Hostname of this VPN Server on VPN Azure Service
 
 
-# VpnAzureSetStatus command
+# VpnAzureSetEnable command
 CMD_VpnAzureSetEnable	Enable / Disable VPN Azure Function
 CMD_VpnAzureSetEnable_Help	Enable or disable the VPN Azure function.\n\nVPN Azure makes it easier to establish a VPN Session from your home PC to your office PC. While a VPN connection is established, you can access to any other servers on the private network of your company.\nYou don't need a global IP address on the office PC (VPN Server). It can work behind firewalls or NATs. No network administrator's configuration required. You can use the built-in SSTP-VPN Client of Windows in your home PC.\nVPN Azure is a cloud VPN service operated by SoftEther VPN Project. VPN Azure is free of charge and available to anyone. Visit http://www.vpnazure.net/ to see details and how-to-use instructions.\n\nThe VPN Azure hostname is same to the hostname of the Dynamic DNS setting, but altering the domain suffix to "vpnazure.net". To change the hostname use the DynamicDnsSetHostname command.\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_VpnAzureSetEnable_Args	VpnAzureSetEnable [yes|no]
@@ -6702,7 +6702,7 @@ CMD_AccountOpensslCertSet_PROMPT_KEYNAME Specify the openssl engine specific key
 CMD_AccountOpensslCertSet_PROMPT_ENGINENAME Specify the openssl engine name: 
 
 
-# AccountRetrySet コマンド
+# AccountRetrySet command
 CMD_AccountRetrySet	Set Interval between Connection Retries for Connection Failures or Disconnections of VPN Connection Setting
 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]

src/bin/hamcore/strtable_ru.stb

@@ -4839,7 +4839,7 @@ CMD_ConnectionList_Help	Use this to get a list of TCP/IP connections that are cu
 CMD_ConnectionList_Args	ConnectionList
 
 
-# ConnectionList command
+# ConnectionGet command
 CMD_ConnectionGet		Get Information of TCP Connections Connecting to the VPN Server
 CMD_ConnectionGet_Help	Use this to get detailed information of a specific TCP/IP connection that is connecting to the VPN Server. \nYou can get the following information: Connection Name, Connection Type, Source Hostname, Source IP Address, Source Port Number (TCP), Connection Start, Server Product Name, Server Version, Server Build Number, Client Product Name, Client Version, and Client Build Number. \nTo execute this command, you must have VPN Server administrator privileges.
 CMD_ConnectionGet_Args	ConnectionGet [name]
@@ -7122,7 +7122,7 @@ CMD_TrafficClient_ERROR_HOSTPORT	The host name or port number is incorrectly spe
 # TrafficServer command
 CMD_TrafficServer		Запустить средство тестирования скорости сетевого трафика в режиме сервера
 CMD_TrafficServer_Help	Используется для запуска инструмента измерения пропускной способности в режиме сервера. \nДве команды, TrafficClient и TrafficServer, используются для измерения пропускной способности между двумя компьютерами, соединенными сетью IP. \nУкажите номер порта и запустите серверную часть с помощью команды TrafficServer, чтобы прослушивать подключение от TrafficClient другого компьютера. \nВы можете отобразить более подробную информацию об инструменте измерения пропускной способности, введя "TrafficClient ?". \n\nПримечание. Эту команду можно вызвать из утилиты управления командной строкой SoftEther VPN. Вы также можете выполнить эту команду при подключении к текущему VPN-серверу или VPN клиенту в режиме администрирования, но фактически осуществляет связь и измеряет пропускную способность тот компьютер, на котором выполняется команда, а не компьютер с которого выполнено подключение в режиме администрирования.
-CMD_TrafficServer_Args	TrafficServer [порт] [/NOHUP:да|нет]
+CMD_TrafficServer_Args	TrafficServer [port] [/NOHUP:yes|no]
 CMD_TrafficServer_[port]	Укажите номер порта для прослушивания соединения. Если указанный порт уже используется другой программой или порт не может быть открыт, произойдет ошибка
 CMD_TrafficServer_NOHUP	Если указано «да», серверная часть игнорирует любой ввод с консоли и никогда не останавливается. Это удобно, если вы хотите запустить TrafficServer в бесконечном режиме.
 

src/bin/hamcore/strtable_tw.stb

@@ -4855,7 +4855,7 @@ CMD_ConnectionList_Help		現在，先獲取與 VPN Server 連接的 TCP/IP 一
 CMD_ConnectionList_Args		ConnectionList
 
 
-# ConnectionList 命令
+# ConnectionGet 命令
 CMD_ConnectionGet			獲取連接到 VPN Server 的 TCP 資訊一覽表
 CMD_ConnectionGet_Help		獲取與 VPN Server 連接的 TCP/IP 連接的詳細資訊。\n可以獲得 [連接名]，[連接種類]，[連接主機名稱]，[連接主機 IP]，[連線主機埠 TCP]，[連線時間]，[伺服器品牌]，[伺服器版本]，[伺服器銘牌號]，[客戶機品牌]，[客戶機版本]，[客戶機銘牌號] 等資訊。 \n要運行此命令，需要管理員許可權。
 CMD_ConnectionGet_Args		ConnectionGet [name]
@@ -7046,7 +7046,7 @@ CMD_RemoteDisable_Args		RemoteDisable
 
 ###################################################
 #                                                 #
-# 下面這是VPN工具用的指令                         #
+# 下面這是VPN Tools用的指令                         #
 #                                                 #
 ###################################################