fix: GRE keyfile mode=2, адреса с префиксом

This commit is contained in:
parent d309465fe2
commit 78ee156254
3 changed files with 4 additions and 4 deletions

View file

@ -54,8 +54,8 @@ def hq(base):
("MGMT_ADDR", iface(n999, 2)), ("MGMT_ADDR", iface(n999, 2)),
("MGMT_GW", plain(n999, 1)), ("MGMT_GW", plain(n999, 1)),
# туннель (сеть и концы по заданию) # туннель (сеть и концы по заданию)
("GRE_LOCAL_HQ", str(GRE_HQ.ip)), ("GRE_LOCAL_HQ", str(GRE_HQ)),
("GRE_LOCAL_BR", str(GRE_BR.ip)), ("GRE_LOCAL_BR", str(GRE_BR)),
# DNS-записи таблицы 3 (ISP-линки фиксированы заданием) # DNS-записи таблицы 3 (ISP-линки фиксированы заданием)
("HQ_RTR_IP", plain(n100, 1)), ("HQ_RTR_IP", plain(n100, 1)),
("ISP_TO_HQ_IP", "172.16.1.1"), ("ISP_TO_HQ_IP", "172.16.1.1"),

View file

@ -141,7 +141,7 @@ autoconnect=yes
interface-name=$GRE_IF interface-name=$GRE_IF
[ip-tunnel] [ip-tunnel]
mode=gre mode=2
remote=$GRE_REMOTE remote=$GRE_REMOTE
[ipv4] [ipv4]

View file

@ -175,7 +175,7 @@ autoconnect=yes
interface-name=$GRE_IF interface-name=$GRE_IF
[ip-tunnel] [ip-tunnel]
mode=gre mode=2
remote=$GRE_REMOTE remote=$GRE_REMOTE
[ipv4] [ipv4]