aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2019-07-25 10:47:45 +0200
committerGravatar Christian Hesse <mail@eworm.de>2019-07-25 10:47:45 +0200
commit46fee70a5660254b4d2ae8a172d8aca8a21e48b0 (patch)
tree0b56ce96c8cebffd9fa72bcdef6898cf27f50c95
parente7dffe0a82e4d00579f43188be5a1a3d29f3ad8c (diff)
dhcp-lease-comment: get values into array
-rw-r--r--dhcp-lease-comment.capsman9
-rw-r--r--dhcp-lease-comment.local9
-rw-r--r--dhcp-lease-comment.template9
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;
}
}