dhcp-lease-comment: get values into array

3 files changed, 12 insertions, 15 deletions

diff --git a/dhcp-lease-comment.capsman b/dhcp-lease-comment.capsman
index eda04e4..5cb71cd 100644
--- a/dhcp-lease-comment.capsman
+++ b/dhcp-lease-comment.capsman
@@ -7,15 +7,14 @@
 # !! Do not edit this file, it is generated from template!
 
 :foreach Lease in=[ / ip dhcp-server lease find where dynamic=yes ] do={
-  :local MacAddress [ / ip dhcp-server lease get $Lease mac-address ];
-  :local OldComment [ / ip dhcp-server lease get $Lease comment ];
+  :local LeaseVal [ / ip dhcp-server lease get $Lease ];
   :local NewComment;
-  :local AccessList ([ / caps-man access-list find where mac-address=$MacAddress ]->0);
+  :local AccessList ([ / caps-man access-list find where mac-address=($LeaseVal->"mac-address") ]->0);
   :if ([ :len $AccessList ] > 0) do={
     :set NewComment [ / caps-man access-list get $AccessList comment ];
   }
-  :if ([ :len $NewComment ] != 0 && $OldComment != $NewComment) do={
-    :log info ("Updating comment for DHCP lease " . $MacAddress . ": " . $NewComment);
+  :if ([ :len $NewComment ] != 0 && $LeaseVal->"comment" != $NewComment) do={
+    :log info ("Updating comment for DHCP lease " . $LeaseVal->"mac-address" . ": " . $NewComment);
     / ip dhcp-server lease set comment=$NewComment $Lease;
   }
 }
diff --git a/dhcp-lease-comment.local b/dhcp-lease-comment.local
index 9e2f9d8..a5c2ff5 100644
--- a/dhcp-lease-comment.local
+++ b/dhcp-lease-comment.local
@@ -7,15 +7,14 @@
 # !! Do not edit this file, it is generated from template!
 
 :foreach Lease in=[ / ip dhcp-server lease find where dynamic=yes ] do={
-  :local MacAddress [ / ip dhcp-server lease get $Lease mac-address ];
-  :local OldComment [ / ip dhcp-server lease get $Lease comment ];
+  :local LeaseVal [ / ip dhcp-server lease get $Lease ];
   :local NewComment;
-  :local AccessList ([ / interface wireless access-list find where mac-address=$MacAddress ]->0);
+  :local AccessList ([ / interface wireless access-list find where mac-address=($LeaseVal->"mac-address") ]->0);
   :if ([ :len $AccessList ] > 0) do={
     :set NewComment [ / interface wireless access-list get $AccessList comment ];
   }
-  :if ([ :len $NewComment ] != 0 && $OldComment != $NewComment) do={
-    :log info ("Updating comment for DHCP lease " . $MacAddress . ": " . $NewComment);
+  :if ([ :len $NewComment ] != 0 && $LeaseVal->"comment" != $NewComment) do={
+    :log info ("Updating comment for DHCP lease " . $LeaseVal->"mac-address" . ": " . $NewComment);
     / ip dhcp-server lease set comment=$NewComment $Lease;
   }
 }
diff --git a/dhcp-lease-comment.template b/dhcp-lease-comment.template
index a1541e1..fcff9d4 100644
--- a/dhcp-lease-comment.template
+++ b/dhcp-lease-comment.template
@@ -8,15 +8,14 @@
 # !! or 'interface wireless'!
 
 :foreach Lease in=[ / ip dhcp-server lease find where dynamic=yes ] do={
-  :local MacAddress [ / ip dhcp-server lease get $Lease mac-address ];
-  :local OldComment [ / ip dhcp-server lease get $Lease comment ];
+  :local LeaseVal [ / ip dhcp-server lease get $Lease ];
   :local NewComment;
-  :local AccessList ([ / %PATH% access-list find where mac-address=$MacAddress ]->0);
+  :local AccessList ([ / %PATH% access-list find where mac-address=($LeaseVal->"mac-address") ]->0);
   :if ([ :len $AccessList ] > 0) do={
     :set NewComment [ / %PATH% access-list get $AccessList comment ];
   }
-  :if ([ :len $NewComment ] != 0 && $OldComment != $NewComment) do={
-    :log info ("Updating comment for DHCP lease " . $MacAddress . ": " . $NewComment);
+  :if ([ :len $NewComment ] != 0 && $LeaseVal->"comment" != $NewComment) do={
+    :log info ("Updating comment for DHCP lease " . $LeaseVal->"mac-address" . ": " . $NewComment);
     / ip dhcp-server lease set comment=$NewComment $Lease;
   }
 }