From 78ee1562540334bc8433e5afd09de7391fdd1e5a Mon Sep 17 00:00:00 2001 From: kimoi Date: Sat, 7 Nov 2026 15:03:17 +0500 Subject: [PATCH] =?UTF-8?q?fix:=20GRE=20keyfile=20mode=3D2,=20=D0=B0=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D1=81=D0=B0=20=D1=81=20=D0=BF=D1=80=D0=B5=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D1=81=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/subnets.py | 4 ++-- zadanie1/br-rtr.sh | 2 +- zadanie1/hq-rtr.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/subnets.py b/tools/subnets.py index 1c36862..b5e2155 100644 --- a/tools/subnets.py +++ b/tools/subnets.py @@ -54,8 +54,8 @@ def hq(base): ("MGMT_ADDR", iface(n999, 2)), ("MGMT_GW", plain(n999, 1)), # туннель (сеть и концы по заданию) - ("GRE_LOCAL_HQ", str(GRE_HQ.ip)), - ("GRE_LOCAL_BR", str(GRE_BR.ip)), + ("GRE_LOCAL_HQ", str(GRE_HQ)), + ("GRE_LOCAL_BR", str(GRE_BR)), # DNS-записи таблицы 3 (ISP-линки фиксированы заданием) ("HQ_RTR_IP", plain(n100, 1)), ("ISP_TO_HQ_IP", "172.16.1.1"), diff --git a/zadanie1/br-rtr.sh b/zadanie1/br-rtr.sh index 9243b83..93b187b 100644 --- a/zadanie1/br-rtr.sh +++ b/zadanie1/br-rtr.sh @@ -141,7 +141,7 @@ autoconnect=yes interface-name=$GRE_IF [ip-tunnel] -mode=gre +mode=2 remote=$GRE_REMOTE [ipv4] diff --git a/zadanie1/hq-rtr.sh b/zadanie1/hq-rtr.sh index 45c3848..a05cb91 100644 --- a/zadanie1/hq-rtr.sh +++ b/zadanie1/hq-rtr.sh @@ -175,7 +175,7 @@ autoconnect=yes interface-name=$GRE_IF [ip-tunnel] -mode=gre +mode=2 remote=$GRE_REMOTE [ipv4]