denozord/router-lists-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(NetworkConfigManager): update GRE tunnel configuration to use DNS domain for remote address if available, improving flexibility in server address handling
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 1m33s
Details

Browse Source
This commit is contained in:
denozord
2026-01-22 23:34:09 +07:00
parent 3ab4c4095a
commit 26f8a97c21
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/NetworkConfigManager.jsx
+4 -4
View File
@@ -1433,8 +1433,8 @@ function NetworkConfigManager() {
// Для GRE туннелей - создаем туннель, опционально с IPSec через ipsec-secret
if (iface.type === 'GRE') {
const remoteServerIp = iface.server2Info?.ip || iface.server2Name;
const localServerIp = server.ip || serverName;
// Используем DNS домен для remote-address, если он есть, иначе IP
const remoteAddress = iface.server2Info?.dns || iface.server2Info?.ip || iface.server2Name;
// Проверяем наличие пароля: ipsecPasswordId должен быть не пустым и пароль должен быть загружен
const hasIpsecPassword = iface.ipsecPasswordId &&
@@ -1445,12 +1445,12 @@ function NetworkConfigManager() {
if (hasIpsecPassword) {
// GRE туннель с IPSec через ipsec-secret (автоматическая настройка)
code += `# Создание GRE туннеля с IPSec (автоматическая настройка через ipsec-secret)\n`;
code += `/interface gre add name="${iface.interfaceName}" remote-address=${remoteServerIp} local-address=${localServerIp} keepalive=10s ipsec-secret="${iface.ipsecPassword}"\n`;
code += `/interface gre add name="${iface.interfaceName}" remote-address=${remoteAddress} keepalive=10s ipsec-secret="${iface.ipsecPassword}"\n`;
code += '\n';
} else {
// GRE туннель без IPSec (голый GRE)
code += `# Создание GRE туннеля (без IPSec)\n`;
code += `/interface gre add name="${iface.interfaceName}" remote-address=${remoteServerIp} local-address=${localServerIp} keepalive=10s\n`;
code += `/interface gre add name="${iface.interfaceName}" remote-address=${remoteAddress} keepalive=10s\n`;
code += '\n';
}
}