From 1272fe1cb163f97b418d60a87efd6e229f357e03 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Mon, 1 Jul 2019 10:26:24 +0200 Subject: update-gre-address: get values into arrays --- update-gre-address | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/update-gre-address b/update-gre-address index 7e70a6d..5842669 100644 --- a/update-gre-address +++ b/update-gre-address @@ -8,17 +8,14 @@ / interface gre set remote-address=0.0.0.0 disabled=yes [ find where !running !disabled ]; :foreach Peer in=[ / ip ipsec active-peers find ] do={ - :local Id [ / ip ipsec active-peers get $Peer id ]; - :local GreInt [ / interface gre find where comment=$Id ]; + :local PeerVal [ / ip ipsec active-peers get $Peer ]; + :local GreInt [ / interface gre find where comment=$PeerVal->"id" ]; :if ([ :len $GreInt ] > 0) do={ - :local GreName [ / interface gre get $GreInt name ]; - :local AddrOld [ / interface gre get $GreInt remote-address ]; - :local Disabled [ / interface gre get $GreInt disabled ]; - :local AddrNew [ / ip ipsec active-peers get $Peer dynamic-address ]; - :if ($AddrNew != $AddrOld || $Disabled = true) do={ - :log info ("Update remote address for interface " . $GreName . " to " . $AddrNew); - / interface gre set remote-address=0.0.0.0 disabled=yes [ find where remote-address=$AddrNew name!=$GreName ]; - / interface gre set $GreInt remote-address=$AddrNew disabled=no; + :local GreIntVal [ / interface gre get $GreInt ]; + :if ($PeerVal->"dynamic-address" != $GreIntVal->"remote-address" || $GreIntVal->"disabled" = true) do={ + :log info ("Update remote address for interface " . $GreIntVal->"name" . " to " . $PeerVal->"dynamic-address"); + / interface gre set remote-address=0.0.0.0 disabled=yes [ find where remote-address=$PeerVal->"dynamic-address" name!=$GreIntVal->"name" ]; + / interface gre set $GreInt remote-address=($PeerVal->"dynamic-address") disabled=no; } } } -- cgit v1.2.3-54-g00ecf